diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs index 2ce50d37f4..f76d41577a 100644 --- a/crates/language/src/buffer_tests.rs +++ b/crates/language/src/buffer_tests.rs @@ -2216,6 +2216,7 @@ fn test_language_scope_at_with_javascript(cx: &mut App) { LanguageConfig { name: "JavaScript".into(), line_comments: vec!["// ".into()], + block_comment: Some(("/*".into(), "*/".into())), brackets: BracketPairConfig { pairs: vec![ BracketPair { @@ -2279,6 +2280,10 @@ fn test_language_scope_at_with_javascript(cx: &mut App) { let config = snapshot.language_scope_at(0).unwrap(); assert_eq!(config.line_comment_prefixes(), &[Arc::from("// ")]); + assert_eq!( + config.block_comment_delimiters(), + Some((&"/*".into(), &"*/".into())) + ); // Both bracket pairs are enabled assert_eq!( config.brackets().map(|e| e.1).collect::>(), @@ -2297,6 +2302,10 @@ fn test_language_scope_at_with_javascript(cx: &mut App) { .language_scope_at(text.find("b\"").unwrap()) .unwrap(); assert_eq!(string_config.line_comment_prefixes(), &[Arc::from("// ")]); + assert_eq!( + string_config.block_comment_delimiters(), + Some((&"/*".into(), &"*/".into())) + ); // Second bracket pair is disabled assert_eq!( string_config.brackets().map(|e| e.1).collect::>(), @@ -2324,6 +2333,10 @@ fn test_language_scope_at_with_javascript(cx: &mut App) { .language_scope_at(text.find(" d=").unwrap() + 1) .unwrap(); assert_eq!(tag_config.line_comment_prefixes(), &[Arc::from("// ")]); + assert_eq!( + tag_config.block_comment_delimiters(), + Some((&"/*".into(), &"*/".into())) + ); assert_eq!( tag_config.brackets().map(|e| e.1).collect::>(), &[true, true] @@ -2337,6 +2350,10 @@ fn test_language_scope_at_with_javascript(cx: &mut App) { expression_in_element_config.line_comment_prefixes(), &[Arc::from("// ")] ); + assert_eq!( + expression_in_element_config.block_comment_delimiters(), + Some((&"/*".into(), &"*/".into())) + ); assert_eq!( expression_in_element_config .brackets() diff --git a/crates/languages/src/javascript/config.toml b/crates/languages/src/javascript/config.toml index db5641e7c6..ac87a9befd 100644 --- a/crates/languages/src/javascript/config.toml +++ b/crates/languages/src/javascript/config.toml @@ -4,6 +4,7 @@ path_suffixes = ["js", "jsx", "mjs", "cjs"] # [/ ] is so we match "env node" or "/node" but not "ts-node" first_line_pattern = '^#!.*\b(?:[/ ]node|deno run.*--ext[= ]js)\b' line_comments = ["// "] +block_comment = ["/*", "*/"] autoclose_before = ";:.,=}])>" brackets = [ { start = "{", end = "}", close = true, newline = true }, diff --git a/crates/languages/src/tsx/config.toml b/crates/languages/src/tsx/config.toml index c581a9c1c8..7ceca7439e 100644 --- a/crates/languages/src/tsx/config.toml +++ b/crates/languages/src/tsx/config.toml @@ -2,6 +2,7 @@ name = "TSX" grammar = "tsx" path_suffixes = ["tsx"] line_comments = ["// "] +block_comment = ["/*", "*/"] autoclose_before = ";:.,=}])>" brackets = [ { start = "{", end = "}", close = true, newline = true }, diff --git a/crates/languages/src/typescript/config.toml b/crates/languages/src/typescript/config.toml index 6d8598c69d..10134066ab 100644 --- a/crates/languages/src/typescript/config.toml +++ b/crates/languages/src/typescript/config.toml @@ -3,6 +3,7 @@ grammar = "typescript" path_suffixes = ["ts", "cts", "d.cts", "d.mts", "mts"] first_line_pattern = '^#!.*\b(?:deno run|ts-node|bun|tsx)\b' line_comments = ["// "] +block_comment = ["/*", "*/"] autoclose_before = ";:.,=}])>" brackets = [ { start = "{", end = "}", close = true, newline = true },