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 d4c892e4ef..8f5842d9e4 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 4eaf5f730e..5a203f5d7a 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 108fb8ca9f..37f48e1df8 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 60c0b8acd7..b9bc5e9bf2 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 6be4576925..0552a3d798 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 afc1e535aa..21a965fd31 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 9726c6f0d5..a78c133e8e 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 a59c5bab53..eec2fe5d39 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 <piotr@zed.dev>"]
 repository = "https://github.com/zed-industries/zed"
diff --git a/extensions/php/languages/php/runnables.scm b/extensions/php/languages/php/runnables.scm
index 157e0be5a0..96c90d2f8a 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)
 )