Detailed changes
@@ -42,11 +42,6 @@ pub fn build_language_registry(login_shell_env_loaded: Task<()>) -> LanguageRegi
tree_sitter_typescript::language_tsx(),
Some(Arc::new(typescript::TypeScriptLspAdapter)),
),
- (
- "jsx",
- tree_sitter_typescript::language_tsx(),
- Some(Arc::new(typescript::TypeScriptLspAdapter)),
- ),
(
"typescript",
tree_sitter_typescript::language_typescript(),
@@ -1,5 +1,5 @@
name = "JavaScript"
-path_suffixes = ["js"]
+path_suffixes = ["js", "jsx"]
line_comment = "// "
autoclose_before = ";:.,=}])>"
brackets = [
@@ -1,5 +0,0 @@
-("(" @open ")" @close)
-("[" @open "]" @close)
-("{" @open "}" @close)
-("<" @open ">" @close)
-("\"" @open "\"" @close)
@@ -1,12 +0,0 @@
-name = "JSX"
-path_suffixes = ["jsx"]
-line_comment = "// "
-autoclose_before = ";:.,=}])>"
-brackets = [
- { start = "{", end = "}", close = true, newline = true },
- { start = "[", end = "]", close = true, newline = true },
- { start = "(", end = ")", close = true, newline = true },
- { start = "<", end = ">", close = false, newline = true },
- { start = "\"", end = "\"", close = true, newline = false },
- { start = "/*", end = " */", close = true, newline = false },
-]
@@ -1,219 +0,0 @@
-; Variables
-
-(identifier) @variable
-
-; Properties
-
-(property_identifier) @property
-
-; Function and method calls
-
-(call_expression
- function: (identifier) @function)
-
-(call_expression
- function: (member_expression
- property: (property_identifier) @function.method))
-
-; Function and method definitions
-
-(function
- name: (identifier) @function)
-(function_declaration
- name: (identifier) @function)
-(method_definition
- name: (property_identifier) @function.method)
-
-(pair
- key: (property_identifier) @function.method
- value: [(function) (arrow_function)])
-
-(assignment_expression
- left: (member_expression
- property: (property_identifier) @function.method)
- right: [(function) (arrow_function)])
-
-(variable_declarator
- name: (identifier) @function
- value: [(function) (arrow_function)])
-
-(assignment_expression
- left: (identifier) @function
- right: [(function) (arrow_function)])
-
-; Special identifiers
-
-((identifier) @constructor
- (#match? @constructor "^[A-Z]"))
-
-([
- (identifier)
- (shorthand_property_identifier)
- (shorthand_property_identifier_pattern)
- ] @constant
- (#match? @constant "^[A-Z_][A-Z\\d_]+$"))
-
-; Literals
-
-(this) @variable.builtin
-(super) @variable.builtin
-
-[
- (true)
- (false)
- (null)
- (undefined)
-] @constant.builtin
-
-(comment) @comment
-
-[
- (string)
- (template_string)
-] @string
-
-(regex) @string.special
-(number) @number
-
-; Tokens
-
-(template_substitution
- "${" @punctuation.special
- "}" @punctuation.special) @embedded
-
-[
- ";"
- "?."
- "."
- ","
-] @punctuation.delimiter
-
-[
- "-"
- "--"
- "-="
- "+"
- "++"
- "+="
- "*"
- "*="
- "**"
- "**="
- "/"
- "/="
- "%"
- "%="
- "<"
- "<="
- "<<"
- "<<="
- "="
- "=="
- "==="
- "!"
- "!="
- "!=="
- "=>"
- ">"
- ">="
- ">>"
- ">>="
- ">>>"
- ">>>="
- "~"
- "^"
- "&"
- "|"
- "^="
- "&="
- "|="
- "&&"
- "||"
- "??"
- "&&="
- "||="
- "??="
-] @operator
-
-[
- "("
- ")"
- "["
- "]"
- "{"
- "}"
-] @punctuation.bracket
-
-[
- "as"
- "async"
- "await"
- "break"
- "case"
- "catch"
- "class"
- "const"
- "continue"
- "debugger"
- "default"
- "delete"
- "do"
- "else"
- "export"
- "extends"
- "finally"
- "for"
- "from"
- "function"
- "get"
- "if"
- "import"
- "in"
- "instanceof"
- "let"
- "new"
- "of"
- "return"
- "set"
- "static"
- "switch"
- "target"
- "throw"
- "try"
- "typeof"
- "var"
- "void"
- "while"
- "with"
- "yield"
-] @keyword
-
-; Types
-
-(type_identifier) @type
-(predefined_type) @type.builtin
-
-((identifier) @type
- (#match? @type "^[A-Z]"))
-
-(type_arguments
- "<" @punctuation.bracket
- ">" @punctuation.bracket)
-
-; Keywords
-
-[ "abstract"
- "declare"
- "enum"
- "export"
- "implements"
- "interface"
- "keyof"
- "namespace"
- "private"
- "protected"
- "public"
- "type"
- "readonly"
- "override"
-] @keyword
@@ -1,15 +0,0 @@
-[
- (call_expression)
- (assignment_expression)
- (member_expression)
- (lexical_declaration)
- (variable_declaration)
- (assignment_expression)
- (if_statement)
- (for_statement)
-] @indent
-
-(_ "[" "]" @end) @indent
-(_ "<" ">" @end) @indent
-(_ "{" "}" @end) @indent
-(_ "(" ")" @end) @indent
@@ -1,55 +0,0 @@
-(internal_module
- "namespace" @context
- name: (_) @name) @item
-
-(enum_declaration
- "enum" @context
- name: (_) @name) @item
-
-(function_declaration
- "async"? @context
- "function" @context
- name: (_) @name
- parameters: (formal_parameters
- "(" @context
- ")" @context)) @item
-
-(interface_declaration
- "interface" @context
- name: (_) @name) @item
-
-(program
- (lexical_declaration
- ["let" "const"] @context
- (variable_declarator
- name: (_) @name) @item))
-
-(class_declaration
- "class" @context
- name: (_) @name) @item
-
-(method_definition
- [
- "get"
- "set"
- "async"
- "*"
- "readonly"
- "static"
- (override_modifier)
- (accessibility_modifier)
- ]* @context
- name: (_) @name
- parameters: (formal_parameters
- "(" @context
- ")" @context)) @item
-
-(public_field_definition
- [
- "declare"
- "readonly"
- "abstract"
- "static"
- (accessibility_modifier)
- ]* @context
- name: (_) @name) @item
@@ -62,13 +62,6 @@ fn main() {
..Default::default()
},
)
- .with_overrides(
- "JSX",
- settings::LanguageOverride {
- tab_size: Some(2),
- ..Default::default()
- },
- )
.with_overrides(
"TypeScript",
settings::LanguageOverride {