Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Highlight nested JSX member expression tags (#53750)

Saketh9a1b538fa01f
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 025cd4251ad..ea666367127 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -36988,6 +36988,59 @@ async fn test_custom_fallback_highlights(cx: &mut TestAppContext) {
}
}
+#[gpui::test]
+async fn test_tsx_nested_jsx_member_expression_highlights(cx: &mut TestAppContext) {
+ init_test(cx, |_| {});
+
+ let mut cx = EditorTestContext::new(cx).await;
+ cx.set_state("<A.B.C></A.B.C>ˇ;");
+
+ let language = Arc::new(
+ Language::new(
+ LanguageConfig {
+ name: "TSX".into(),
+ matcher: LanguageMatcher {
+ path_suffixes: vec!["tsx".to_string()],
+ ..LanguageMatcher::default()
+ },
+ ..LanguageConfig::default()
+ },
+ Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
+ )
+ .with_highlights_query(include_str!("../../grammars/src/tsx/highlights.scm"))
+ .unwrap(),
+ );
+
+ let component_color = Hsla::green();
+ let theme = Arc::new(SyntaxTheme::new_test(vec![
+ ("tag.component.jsx", component_color),
+ ("type", Hsla::blue()),
+ ("property", Hsla::red()),
+ ("punctuation.bracket", Hsla::default()),
+ ("punctuation.delimiter", Hsla::default()),
+ ]));
+ setup_syntax_highlighting_with_theme(language, theme.clone(), &mut cx);
+ cx.update_editor(|editor, window, cx| {
+ let snapshot = editor.snapshot(window, cx);
+ assert_eq!(
+ snapshot
+ .combined_highlights(MultiBufferOffset(0)..snapshot.buffer().len(), &theme)
+ .iter()
+ .filter(|(_, style)| *style == HighlightStyle::color(component_color))
+ .cloned()
+ .collect::<Vec<_>>(),
+ vec![
+ (1..2, HighlightStyle::color(component_color)),
+ (3..4, HighlightStyle::color(component_color)),
+ (5..6, HighlightStyle::color(component_color)),
+ (9..10, HighlightStyle::color(component_color)),
+ (11..12, HighlightStyle::color(component_color)),
+ (13..14, HighlightStyle::color(component_color)),
+ ],
+ );
+ });
+}
+
fn setup_syntax_highlighting(
language: Arc<Language>,
cx: &mut EditorTestContext,
@@ -37002,6 +37055,15 @@ fn setup_syntax_highlighting(
("punctuation.delimiter", Hsla::default()),
]));
+ setup_syntax_highlighting_with_theme(language, syntax.clone(), cx);
+ syntax
+}
+
+fn setup_syntax_highlighting_with_theme(
+ language: Arc<Language>,
+ syntax: Arc<SyntaxTheme>,
+ cx: &mut EditorTestContext,
+) {
language.set_theme(&syntax);
cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
@@ -37009,13 +37071,11 @@ fn setup_syntax_highlighting(
cx.update_editor(|editor, window, cx| {
editor.set_style(
EditorStyle {
- syntax: syntax.clone(),
+ syntax,
..EditorStyle::default()
},
window,
cx,
);
});
-
- syntax
}
diff --git a/crates/grammars/src/javascript/highlights.scm b/crates/grammars/src/javascript/highlights.scm
index f6354dd3a01..85256490987 100644
--- a/crates/grammars/src/javascript/highlights.scm
+++ b/crates/grammars/src/javascript/highlights.scm
@@ -332,6 +332,18 @@
(member_expression
object: (identifier) @type @tag.component.jsx
property: (property_identifier) @type @tag.component.jsx)
+ (member_expression
+ object: (member_expression
+ object: (identifier) @type @tag.component.jsx
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
+ (member_expression
+ object: (member_expression
+ object: (member_expression
+ object: (identifier) @type @tag.component.jsx
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
])
(jsx_closing_element
@@ -340,6 +352,18 @@
(member_expression
object: (identifier) @type @tag.component.jsx
property: (property_identifier) @type @tag.component.jsx)
+ (member_expression
+ object: (member_expression
+ object: (identifier) @type @tag.component.jsx
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
+ (member_expression
+ object: (member_expression
+ object: (member_expression
+ object: (identifier) @type @tag.component.jsx
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
])
(jsx_self_closing_element
@@ -348,6 +372,18 @@
(member_expression
object: (identifier) @type @tag.component.jsx
property: (property_identifier) @type @tag.component.jsx)
+ (member_expression
+ object: (member_expression
+ object: (identifier) @type @tag.component.jsx
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
+ (member_expression
+ object: (member_expression
+ object: (member_expression
+ object: (identifier) @type @tag.component.jsx
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
])
(jsx_opening_element
diff --git a/crates/grammars/src/tsx/highlights.scm b/crates/grammars/src/tsx/highlights.scm
index 0f203e7112c..e8cb7a11065 100644
--- a/crates/grammars/src/tsx/highlights.scm
+++ b/crates/grammars/src/tsx/highlights.scm
@@ -393,6 +393,18 @@
(member_expression
object: (identifier) @type @tag.component.jsx
property: (property_identifier) @type @tag.component.jsx)
+ (member_expression
+ object: (member_expression
+ object: (identifier) @type @tag.component.jsx
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
+ (member_expression
+ object: (member_expression
+ object: (member_expression
+ object: (identifier) @type @tag.component.jsx
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
])
(jsx_closing_element
@@ -401,6 +413,18 @@
(member_expression
object: (identifier) @type @tag.component.jsx
property: (property_identifier) @type @tag.component.jsx)
+ (member_expression
+ object: (member_expression
+ object: (identifier) @type @tag.component.jsx
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
+ (member_expression
+ object: (member_expression
+ object: (member_expression
+ object: (identifier) @type @tag.component.jsx
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
])
(jsx_self_closing_element
@@ -409,6 +433,18 @@
(member_expression
object: (identifier) @type @tag.component.jsx
property: (property_identifier) @type @tag.component.jsx)
+ (member_expression
+ object: (member_expression
+ object: (identifier) @type @tag.component.jsx
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
+ (member_expression
+ object: (member_expression
+ object: (member_expression
+ object: (identifier) @type @tag.component.jsx
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
+ property: (property_identifier) @type @tag.component.jsx)
])
(jsx_opening_element