From 9dfe4a30bb1c2c57c92482097126f14433611e0f Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Wed, 23 Oct 2024 18:54:08 +0200 Subject: [PATCH] languages: Do not expose unnecessary captures from tasks (#19625) This tackles an issue with us exposing unnecessary env variables in environment which are not actually needed for tasks themselves (and may have little utility), yet come into the way of ssh remoting. /cc @ConradIrwin Release Notes: - N/A --- Cargo.lock | 2 +- crates/languages/src/c/runnables.scm | 2 +- crates/languages/src/javascript/runnables.scm | 2 +- crates/languages/src/python/runnables.scm | 4 ++-- crates/languages/src/rust/runnables.scm | 6 +++--- crates/languages/src/typescript/runnables.scm | 2 +- extensions/php/Cargo.toml | 2 +- extensions/php/extension.toml | 2 +- extensions/php/languages/php/runnables.scm | 10 +++++----- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d4c892e4ef5b42e1c0eb5dbb59e54ea04f06f03a..8f5842d9e4d9943d24ebcde90533c90f13cc3a79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14841,7 +14841,7 @@ dependencies = [ [[package]] name = "zed_php" -version = "0.2.1" +version = "0.2.2" dependencies = [ "zed_extension_api 0.1.0", ] diff --git a/crates/languages/src/c/runnables.scm b/crates/languages/src/c/runnables.scm index 4eaf5f730e10594e97ad7819efb5d3ff1013bc7e..5a203f5d7a6eea3ab831a1b4281a74d3795ca74f 100644 --- a/crates/languages/src/c/runnables.scm +++ b/crates/languages/src/c/runnables.scm @@ -4,7 +4,7 @@ declarator: (function_declarator declarator: (identifier) @run ) - ) @c-main + ) @_c-main (#eq? @run "main") (#set! tag c-main) ) diff --git a/crates/languages/src/javascript/runnables.scm b/crates/languages/src/javascript/runnables.scm index 108fb8ca9f2ca90aa7ee1d6c34f19c720b28e0e9..37f48e1df8f2ea3694f5e8675df6c84b3033f1f4 100644 --- a/crates/languages/src/javascript/runnables.scm +++ b/crates/languages/src/javascript/runnables.scm @@ -9,6 +9,6 @@ (string_fragment) @run ) ) - ) @js-test + ) @_js-test (#set! tag js-test) ) diff --git a/crates/languages/src/python/runnables.scm b/crates/languages/src/python/runnables.scm index 60c0b8acd7729d8e8309938056d86e70086f9cd7..b9bc5e9bf25c74d213354817fc8be126ab6c5117 100644 --- a/crates/languages/src/python/runnables.scm +++ b/crates/languages/src/python/runnables.scm @@ -7,7 +7,7 @@ (attribute (identifier) @_superclass)] ) (#eq? @_superclass "TestCase") - ) @python-unittest-class + ) @_python-unittest-class (#set! tag python-unittest-class) ) @@ -24,7 +24,7 @@ (function_definition name: (identifier) @run @_unittest_method_name (#match? @_unittest_method_name "^test.*") - ) @python-unittest-method + ) @_python-unittest-method (#set! tag python-unittest-method) ) ) diff --git a/crates/languages/src/rust/runnables.scm b/crates/languages/src/rust/runnables.scm index 6be4576925f95e619dae9711ce2a60c98f970f04..0552a3d79831d2ebc27bd28b47bb58af15e02f51 100644 --- a/crates/languages/src/rust/runnables.scm +++ b/crates/languages/src/rust/runnables.scm @@ -3,7 +3,7 @@ (mod_item name: (_) @run (#eq? @run "tests") - ) @rust-mod-test + ) (#set! tag rust-mod-test) ) @@ -14,14 +14,14 @@ (scoped_identifier (identifier) @_attribute) ]) (#match? @_attribute "test") - ) @start + ) @_start . (attribute_item) * . (function_item name: (_) @run body: _ - ) @end + ) @_end ) (#set! tag rust-test) ) diff --git a/crates/languages/src/typescript/runnables.scm b/crates/languages/src/typescript/runnables.scm index afc1e535aa40464b589bcd53e44b492c5117a56a..21a965fd31cbb5f7c11c15fbf655294e2581ab13 100644 --- a/crates/languages/src/typescript/runnables.scm +++ b/crates/languages/src/typescript/runnables.scm @@ -9,6 +9,6 @@ (string_fragment) @run ) ) - ) @ts-test + ) @_ts-test (#set! tag ts-test) ) diff --git a/extensions/php/Cargo.toml b/extensions/php/Cargo.toml index 9726c6f0d59e9069652fb69bbe18c23af1b35fcb..a78c133e8e4fba76fd09e5505ca752f09b98c8e2 100644 --- a/extensions/php/Cargo.toml +++ b/extensions/php/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zed_php" -version = "0.2.1" +version = "0.2.2" edition = "2021" publish = false license = "Apache-2.0" diff --git a/extensions/php/extension.toml b/extensions/php/extension.toml index a59c5bab53784c618851ac869e6c1a6e6d4de60d..eec2fe5d39d03a23a551371c20f3d05d616382e9 100644 --- a/extensions/php/extension.toml +++ b/extensions/php/extension.toml @@ -1,7 +1,7 @@ id = "php" name = "PHP" description = "PHP support." -version = "0.2.1" +version = "0.2.2" schema_version = 1 authors = ["Piotr Osiewicz "] repository = "https://github.com/zed-industries/zed" diff --git a/extensions/php/languages/php/runnables.scm b/extensions/php/languages/php/runnables.scm index 157e0be5a059f2af9c520d25de901e844c6b1a62..96c90d2f8ad2757285f1f5ffd2b82d838f9efa38 100644 --- a/extensions/php/languages/php/runnables.scm +++ b/extensions/php/languages/php/runnables.scm @@ -16,7 +16,7 @@ (#match? @run "^test.*") ) ) - ) @phpunit-test + ) @_phpunit-test (#set! tag phpunit-test) ) @@ -41,7 +41,7 @@ (#not-match? @run "^test.*") )) ) - ) @phpunit-test + ) @_phpunit-test (#set! tag phpunit-test) ) @@ -69,7 +69,7 @@ (#not-match? @run "^test.*") ) ) - ) @phpunit-test + ) @_phpunit-test (#set! tag phpunit-test) ) @@ -81,7 +81,7 @@ (#not-eq? @_modifier "abstract") name: (_) @run (#match? @run ".*Test$") - ) @phpunit-test + ) @_phpunit-test (#set! tag phpunit-test) ) @@ -100,6 +100,6 @@ ] ) ) - ) @pest-test + ) @_pest-test (#set! tag pest-test) )