From 6b456ede49d8d95acc4d257bdaaf5ca6190b50db Mon Sep 17 00:00:00 2001 From: Smit Barmase Date: Mon, 7 Jul 2025 11:45:54 +0530 Subject: [PATCH] languages: Fix string override to match just `string_fragment` part of `template_string` (#33997) Closes #33703 `template_string` consists of `template_substitution` and `string_fragment` chunks. `template_substitution` should not be considered a string. ```ts const variable = `this is a string_fragment but ${this.is.template_substitution}`; ``` Release Notes: - Fixed auto-complete not showing on typing `.` character in template literal string in JavaScript and TypeScript files. --- crates/languages/src/javascript/overrides.scm | 7 +++---- crates/languages/src/tsx/overrides.scm | 7 +++---- crates/languages/src/typescript/overrides.scm | 3 +++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/crates/languages/src/javascript/overrides.scm b/crates/languages/src/javascript/overrides.scm index d93c8b5aea27b1fced6d021c68403348a97bb9e9..6dbbc88ef924c2cac65aaf9ff7e7dba87b99a359 100644 --- a/crates/languages/src/javascript/overrides.scm +++ b/crates/languages/src/javascript/overrides.scm @@ -1,9 +1,8 @@ (comment) @comment.inclusive -[ - (string) - (template_string) -] @string +(string) @string + +(template_string (string_fragment) @string) (jsx_element) @element diff --git a/crates/languages/src/tsx/overrides.scm b/crates/languages/src/tsx/overrides.scm index b26d010ce34b58cac34e516075c8c010525ed5fe..f5a51af33fee340762d6b689e78d2e94e9c84901 100644 --- a/crates/languages/src/tsx/overrides.scm +++ b/crates/languages/src/tsx/overrides.scm @@ -1,9 +1,8 @@ (comment) @comment.inclusive -[ - (string) - (template_string) -] @string +(string) @string + +(template_string (string_fragment) @string) (jsx_element) @element diff --git a/crates/languages/src/typescript/overrides.scm b/crates/languages/src/typescript/overrides.scm index 17ad7be339ccb2e670ebcf225b1ab9d2b9af40ae..8f437a1424af06aa4855aac67511926181977936 100644 --- a/crates/languages/src/typescript/overrides.scm +++ b/crates/languages/src/typescript/overrides.scm @@ -1,6 +1,9 @@ (comment) @comment.inclusive + (string) @string +(template_string (string_fragment) @string) + (_ value: (call_expression function: (identifier) @function_name_before_type_arguments type_arguments: (type_arguments)))