From fd7180134661e772bf33487820115f7b9c6ac524 Mon Sep 17 00:00:00 2001 From: Remco Smits Date: Sat, 30 Nov 2024 13:55:14 +0100 Subject: [PATCH] Improve JavaScript runnable detection followup (#21363) Followup: https://github.com/zed-industries/zed/pull/21246 **Before** Screenshot 2024-11-30 at 13 27 15 **After** Screenshot 2024-11-30 at 13 27 36 We did not need to add the `*` as it was already matching one of them, we actually need at least one of them, so making it optional was a mistake. Don't think we need to add release notes, as the change is only on main the branch now. Release Notes: - N/A --- crates/languages/src/javascript/outline.scm | 4 ++-- crates/languages/src/javascript/runnables.scm | 2 +- crates/languages/src/tsx/outline.scm | 4 ++-- crates/languages/src/tsx/runnables.scm | 2 +- crates/languages/src/typescript/outline.scm | 4 ++-- crates/languages/src/typescript/runnables.scm | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/languages/src/javascript/outline.scm b/crates/languages/src/javascript/outline.scm index da6a1e0d3178b56531d1e020a05c8aca3e383c2c..0159d452cc8fd70bff37f10b52c12d67f752ef9e 100644 --- a/crates/languages/src/javascript/outline.scm +++ b/crates/languages/src/javascript/outline.scm @@ -70,9 +70,9 @@ object: [ (identifier) @_name (member_expression object: (identifier) @_name) - ]* + ] ) - ]* @context + ] @context (#any-of? @_name "it" "test" "describe") arguments: ( arguments . (string (string_fragment) @name) diff --git a/crates/languages/src/javascript/runnables.scm b/crates/languages/src/javascript/runnables.scm index 615bd2f51ab58ce2dc101df2e1ce71a172afc19c..af619dacb7f19e4d83ca3ab937bbd7b680c30325 100644 --- a/crates/languages/src/javascript/runnables.scm +++ b/crates/languages/src/javascript/runnables.scm @@ -8,7 +8,7 @@ object: [ (identifier) @_name (member_expression object: (identifier) @_name) - ]* + ] ) ] (#any-of? @_name "it" "test" "describe") diff --git a/crates/languages/src/tsx/outline.scm b/crates/languages/src/tsx/outline.scm index 14dbf1cc0ab3b7bdc85d5f4b42fdef7ab5ed3fa6..34b80b733bb00b40712289c8360780db3d3b78ff 100644 --- a/crates/languages/src/tsx/outline.scm +++ b/crates/languages/src/tsx/outline.scm @@ -78,9 +78,9 @@ object: [ (identifier) @_name (member_expression object: (identifier) @_name) - ]* + ] ) - ]* @context + ] @context (#any-of? @_name "it" "test" "describe") arguments: ( arguments . (string (string_fragment) @name) diff --git a/crates/languages/src/tsx/runnables.scm b/crates/languages/src/tsx/runnables.scm index 615bd2f51ab58ce2dc101df2e1ce71a172afc19c..af619dacb7f19e4d83ca3ab937bbd7b680c30325 100644 --- a/crates/languages/src/tsx/runnables.scm +++ b/crates/languages/src/tsx/runnables.scm @@ -8,7 +8,7 @@ object: [ (identifier) @_name (member_expression object: (identifier) @_name) - ]* + ] ) ] (#any-of? @_name "it" "test" "describe") diff --git a/crates/languages/src/typescript/outline.scm b/crates/languages/src/typescript/outline.scm index 14dbf1cc0ab3b7bdc85d5f4b42fdef7ab5ed3fa6..34b80b733bb00b40712289c8360780db3d3b78ff 100644 --- a/crates/languages/src/typescript/outline.scm +++ b/crates/languages/src/typescript/outline.scm @@ -78,9 +78,9 @@ object: [ (identifier) @_name (member_expression object: (identifier) @_name) - ]* + ] ) - ]* @context + ] @context (#any-of? @_name "it" "test" "describe") arguments: ( arguments . (string (string_fragment) @name) diff --git a/crates/languages/src/typescript/runnables.scm b/crates/languages/src/typescript/runnables.scm index 615bd2f51ab58ce2dc101df2e1ce71a172afc19c..af619dacb7f19e4d83ca3ab937bbd7b680c30325 100644 --- a/crates/languages/src/typescript/runnables.scm +++ b/crates/languages/src/typescript/runnables.scm @@ -8,7 +8,7 @@ object: [ (identifier) @_name (member_expression object: (identifier) @_name) - ]* + ] ) ] (#any-of? @_name "it" "test" "describe")