Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inherit javascript/typescript from common 'ecma' queries #3301

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
221 changes: 221 additions & 0 deletions runtime/queries/ecma/highlights.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
; Special identifiers
;--------------------

([
(identifier)
(shorthand_property_identifier)
(shorthand_property_identifier_pattern)
] @constant
(#match? @constant "^[A-Z_][A-Z\\d_]+$"))


((identifier) @constructor
(#match? @constructor "^[A-Z]"))

((identifier) @variable.builtin
(#match? @variable.builtin "^(arguments|module|console|window|document)$")
(#is-not? local))

((identifier) @function.builtin
(#eq? @function.builtin "require")
(#is-not? local))

; 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)])


; Function and method calls
;--------------------------

(call_expression
function: (identifier) @function)

(call_expression
function: (member_expression
property: (property_identifier) @function.method))

; Variables
;----------

(identifier) @variable

; Properties
;-----------

(property_identifier) @variable.other.member
(shorthand_property_identifier) @variable.other.member
(shorthand_property_identifier_pattern) @variable.other.member

; Literals
;---------

(this) @variable.builtin
(super) @variable.builtin

[
(true)
(false)
(null)
(undefined)
] @constant.builtin

(comment) @comment

[
(string)
(template_string)
] @string

(regex) @string.regexp
(number) @constant.numeric.integer

; Tokens
;-------

(template_substitution
"${" @punctuation.special
"}" @punctuation.special) @embedded

[
";"
"?."
"."
","
] @punctuation.delimiter

[
"-"
"--"
"-="
"+"
"++"
"+="
"*"
"*="
"**"
"**="
"/"
"/="
"%"
"%="
"<"
"<="
"<<"
"<<="
"="
"=="
"==="
"!"
"!="
"!=="
"=>"
">"
">="
">>"
">>="
">>>"
">>>="
"~"
"^"
"&"
"|"
"^="
"&="
"|="
"&&"
"||"
"??"
"&&="
"||="
"??="
"..."
] @operator

(ternary_expression ["?" ":"] @operator)

[
"("
")"
"["
"]"
"{"
"}"
] @punctuation.bracket

[
"as"
"async"
"debugger"
"delete"
"extends"
"from"
"function"
"get"
"in"
"instanceof"
"new"
"of"
"set"
"static"
"target"
"try"
"typeof"
"void"
"with"
] @keyword

[
"class"
"let"
"const"
"var"
] @keyword.storage.type

[
"switch"
"case"
"default"
"if"
"else"
"yield"
"throw"
"finally"
"return"
"catch"
"continue"
"while"
"break"
"for"
"do"
"await"
] @keyword.control

[
"import"
"export"
] @keyword.control.import

22 changes: 22 additions & 0 deletions runtime/queries/ecma/indents.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
(array)
(object)
(arguments)
(formal_parameters)

(statement_block)
(object_pattern)
(class_body)
(named_imports)

(binary_expression)
(return_statement)
(template_substitution)
(export_clause)
] @indent

[
"}"
"]"
")"
] @outdent
36 changes: 36 additions & 0 deletions runtime/queries/ecma/injections.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
; Parse the contents of tagged template literals using
; a language inferred from the tag.

(call_expression
function: [
(identifier) @injection.language
(member_expression
property: (property_identifier) @injection.language)
]
arguments: (template_string) @injection.content)

; Parse the contents of gql template literals

((call_expression
function: (identifier) @_template_function_name
arguments: (template_string) @injection.content)
(#eq? @_template_function_name "gql")
(#set! injection.language "graphql"))

; Parse regex syntax within regex literals

((regex_pattern) @injection.content
(#set! injection.language "regex"))

; Parse JSDoc annotations in multiline comments

((comment) @injection.content
(#set! injection.language "jsdoc")
(#match? @injection.content "^/\\*+"))

; Parse general tags in single line comments

((comment) @injection.content
(#set! injection.language "comment")
(#match? @injection.content "^//"))

29 changes: 29 additions & 0 deletions runtime/queries/ecma/locals.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
; Scopes
;-------

[
(statement_block)
(function)
(arrow_function)
(function_declaration)
(method_definition)
] @local.scope

; Definitions
;------------

(pattern/identifier) @local.definition

(pattern/rest_pattern
(identifier) @local.definition)

(arrow_function
parameter: (identifier) @local.definition)

(variable_declarator
name: (identifier) @local.definition)

; References
;------------

(identifier) @local.reference
36 changes: 36 additions & 0 deletions runtime/queries/ecma/textobjects.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
(function_declaration
body: (_) @function.inside) @function.around

(function
body: (_) @function.inside) @function.around

(arrow_function
body: (_) @function.inside) @function.around

(method_definition
body: (_) @function.inside) @function.around

(generator_function_declaration
body: (_) @function.inside) @function.around

(class_declaration
body: (class_body) @class.inside) @class.around

(class
(class_body) @class.inside) @class.around

(export_statement
declaration: [
(function_declaration) @function.around
(class_declaration) @class.around
])

(formal_parameters
((_) @parameter.inside . ","? @parameter.around) @parameter.around)

(arguments
((_) @parameter.inside . ","? @parameter.around) @parameter.around)

(comment) @comment.inside

(comment)+ @comment.around
Loading