Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | runtime/queries/python/highlights.scm | 314 |
1 files changed, 194 insertions, 120 deletions
diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm index e9e81aae..0f34db96 100644 --- a/runtime/queries/python/highlights.scm +++ b/runtime/queries/python/highlights.scm @@ -1,8 +1,16 @@ +; ------- +; Punctuation +; ------- + ["," "." ":" ";" (ellipsis)] @punctuation.delimiter ["(" ")" "[" "]" "{" "}"] @punctuation.bracket (interpolation "{" @punctuation.special - "}" @punctuation.special) @embedded + "}" @punctuation.special) + +; ------- +; Operators +; ------- [ "-" @@ -43,48 +51,37 @@ "@=" ] @operator -[ - "as" - "assert" - "await" - "from" - "pass" +; ------- +; Variables +; ------- - "with" -] @keyword.control +(identifier) @variable -[ - "if" - "elif" - "else" - "match" - "case" -] @keyword.control.conditional +; - Member +(attribute attribute: (identifier) @variable.other.member) -[ - "while" - "for" - "break" - "continue" -] @keyword.control.repeat +; - Parameter +(parameters (identifier) @variable.parameter) +(parameters (typed_parameter (identifier) @variable.parameter)) +(parameters (default_parameter name: (identifier) @variable.parameter)) +(parameters (typed_default_parameter name: (identifier) @variable.parameter)) +(parameters + (list_splat_pattern ; *args + (identifier) @variable.parameter)) +(parameters + (dictionary_splat_pattern ; **kwargs + (identifier) @variable.parameter)) -[ - "return" - "yield" -] @keyword.control.return -(yield "from" @keyword.control.return) +(lambda_parameters + (identifier) @variable.parameter) -[ - "raise" - "try" - "except" - "finally" -] @keyword.control.except -(raise_statement "from" @keyword.control.except) -"import" @keyword.control.import +; - Builtin +((identifier) @variable.builtin + (#any-of? @variable.builtin "self" "cls")) -(for_statement "in" @keyword.control) -(for_in_clause "in" @keyword.control) +; ------- +; Keywords +; ------- [ "async" @@ -95,137 +92,214 @@ "print" "type" ] @keyword + +; Operators [ "and" "or" "not in" - "in" + "in" ; Has to be before loop keywords because "in" is overloaded "not" "del" "is not" "is" ] @keyword.operator -; Literals -(none) @constant.builtin +; Control [ - (true) - (false) -] @constant.builtin.boolean + "as" + "assert" + "await" + "from" + "pass" -(integer) @constant.numeric.integer -(float) @constant.numeric.float -(comment) @comment -(string) @string -(escape_sequence) @constant.character.escape + "with" +] @keyword.control -; Variables +; Conditionals +[ + "if" + "elif" + "else" + "match" + "case" +] @keyword.control.conditional -(identifier) @variable +; Exceptions +[ + "raise" + "try" + "except" + "finally" +] @keyword.control.except +(raise_statement "from" @keyword.control.except) -(attribute attribute: (identifier) @variable.other.member) +; Functions +[ + "def" + "lambda" +] @keyword.function -; Imports +; Import +"import" @keyword.control.import + +; Loops +[ + "while" + "for" + "break" + "continue" +] @keyword.control.repeat + +(for_statement "in" @keyword.control.repeat) +(for_in_clause "in" @keyword.control.repeat) + +; Return +[ + "return" + "yield" +] @keyword.control.return +(yield "from" @keyword.control.return) +; ------- +; Imports +; ------- + (dotted_name (identifier)* @namespace) (aliased_import alias: (identifier) @namespace) -; Function calls +; - Builtins +(none) @constant.builtin ; Has to be before types -[ - "def" - "lambda" -] @keyword.function - -(call - function: (attribute attribute: (identifier) @function.method)) - -(call - function: (identifier) @function) - -(call - function: (attribute attribute: (identifier) @constructor) - (#match? @constructor "^[A-Z]")) -(call - function: (identifier) @constructor - (#match? @constructor "^[A-Z]")) +; ------- +; Types +; ------- + +((identifier) @type + (#match? @type "^[A-Z]")) ; Has to be before constructor due to this being a more general match -; Builtin functions +; In type hints make everything types to catch non-conforming identifiers +; (e.g., datetime.datetime) and None +(type [(identifier) (none)] @type) +; Handle [] . and | nesting 4 levels deep +(type + (_ [(identifier) (none)]? @type + (_ [(identifier) (none)]? @type + (_ [(identifier) (none)]? @type + (_ [(identifier) (none)]? @type))))) -((call - function: (identifier) @function.builtin) - (#match? - @function.builtin - "^(abs|all|any|ascii|bin|bool|breakpoint|bytearray|bytes|callable|chr|classmethod|compile|complex|delattr|dict|dir|divmod|enumerate|eval|exec|filter|float|format|frozenset|getattr|globals|hasattr|hash|help|hex|id|input|int|isinstance|issubclass|iter|len|list|locals|map|max|memoryview|min|next|object|oct|open|ord|pow|print|property|range|repr|reversed|round|set|setattr|slice|sorted|staticmethod|str|sum|super|tuple|type|vars|zip|__import__)$")) +; Classes +(class_definition name: (identifier) @type) +(class_definition superclasses: (argument_list (identifier) @type)) -; Function definitions +; ------- +; Functions +; ------- (function_definition name: (identifier) @function) -(function_definition - name: (identifier) @constructor - (#match? @constructor "^(__new__|__init__)$")) +(call + function: (identifier) @function) ; Decorators - (decorator) @function (decorator (identifier) @function) (decorator (attribute attribute: (identifier) @function)) (decorator (call function: (attribute attribute: (identifier) @function))) -; Parameters - -(parameters (identifier) @variable.parameter) -(parameters (typed_parameter (identifier) @variable.parameter)) -(parameters (default_parameter name: (identifier) @variable.parameter)) -(parameters (typed_default_parameter name: (identifier) @variable.parameter)) - -(parameters - (list_splat_pattern ; *args - (identifier) @variable.parameter)) -(parameters - (dictionary_splat_pattern ; **kwargs - (identifier) @variable.parameter)) +; Methods +(call + function: (attribute attribute: (identifier) @function.method)) -(lambda_parameters - (identifier) @variable.parameter) +; Builtin functions +((call + function: (identifier) @function.builtin) + (#any-of? + @function.builtin + "abs" "all" "any" "ascii" "bin" "breakpoint" "bytearray" "callable" "chr" + "classmethod" "compile" "complex" "delattr" "dir" "divmod" "enumerate" + "eval" "exec" "filter" "format" "getattr" "globals" "hasattr" "hash" "help" + "hex" "id" "input" "isinstance" "issubclass" "iter" "len" "locals" "map" + "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow" "print" + "property" "range" "repr" "reversed" "round" "setattr" "slice" "sorted" + "staticmethod" "sum" "super" "type" "vars" "zip" "__import__")) + +; Constructors +(call + function: (attribute attribute: (identifier) @constructor) + (#any-of? + @constructor + "__new__" "__init__")) -; Builtins, constants, etc. +((call + function: (identifier) @constructor) + (#any-of? + @constructor + "__new__" "__init__")) -((identifier) @variable.builtin - (#match? @variable.builtin "^(self|cls)$")) +(function_definition + name: (identifier) @constructor + (#any-of? @constructor "__new__" "__init__")) -((identifier) @type.builtin - (#match? @type.builtin - "^(BaseException|Exception|ArithmeticError|BufferError|LookupError|AssertionError|AttributeError|EOFError|FloatingPointError|GeneratorExit|ImportError|ModuleNotFoundError|IndexError|KeyError|KeyboardInterrupt|MemoryError|NameError|NotImplementedError|OSError|OverflowError|RecursionError|ReferenceError|RuntimeError|StopIteration|StopAsyncIteration|SyntaxError|IndentationError|TabError|SystemError|SystemExit|TypeError|UnboundLocalError|UnicodeError|UnicodeEncodeError|UnicodeDecodeError|UnicodeTranslateError|ValueError|ZeroDivisionError|EnvironmentError|IOError|WindowsError|BlockingIOError|ChildProcessError|ConnectionError|BrokenPipeError|ConnectionAbortedError|ConnectionRefusedError|ConnectionResetError|FileExistsError|FileNotFoundError|InterruptedError|IsADirectoryError|NotADirectoryError|PermissionError|ProcessLookupError|TimeoutError|Warning|UserWarning|DeprecationWarning|PendingDeprecationWarning|SyntaxWarning|RuntimeWarning|FutureWarning|ImportWarning|UnicodeWarning|BytesWarning|ResourceWarning)$")) +(call + function: (attribute attribute: (identifier) @constructor) + (#match? @constructor "^[A-Z]")) +(call + function: (identifier) @constructor + (#match? @constructor "^[A-Z]")) -((identifier) @type - (#match? @type "^[A-Z]")) +; Builtin types +((identifier) @type.builtin ; Has to be after functions due to broad matching + (#any-of? + @type.builtin + "bool" "bytes" "dict" "float" "frozenset" "int" "list" "set" "str" "tuple")) + +; Builtin error types +((identifier) @type.builtin ; Has to be after constructors due to broad matching of constructor + (#any-of? @type.builtin + "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" + "AssertionError" "AttributeError" "EOFError" "FloatingPointError" "GeneratorExit" + "ImportError" "ModuleNotFoundError" "IndexError" "KeyError" "KeyboardInterrupt" + "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" + "RecursionError" "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" + "SyntaxError" "IndentationError" "TabError" "SystemError" "SystemExit" "TypeError" + "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError" + "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" + "IOError" "WindowsError" "BlockingIOError" "ChildProcessError" "ConnectionError" + "BrokenPipeError" "ConnectionAbortedError" "ConnectionRefusedError" + "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError" + "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" + "TimeoutError" "Warning" "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" + "SyntaxWarning" "RuntimeWarning" "FutureWarning" "ImportWarning" "UnicodeWarning" + "BytesWarning" "ResourceWarning")) + +; ------- +; Constants +; ------- ((identifier) @constant (#match? @constant "^_*[A-Z][A-Z\\d_]*$")) -; Types +(escape_sequence) @constant.character.escape -((identifier) @type.builtin - (#match? - @type.builtin - "^(bool|bytes|dict|float|frozenset|int|list|set|str|tuple)$")) +[ + (true) + (false) +] @constant.builtin.boolean -; In type hints make everything types to catch non-conforming identifiers -; (e.g., datetime.datetime) and None -(type [(identifier) (none)] @type) -; Handle [] . and | nesting 4 levels deep -(type - (_ [(identifier) (none)]? @type - (_ [(identifier) (none)]? @type - (_ [(identifier) (none)]? @type - (_ [(identifier) (none)]? @type))))) -(class_definition name: (identifier) @type) -(class_definition superclasses: (argument_list (identifier) @type)) +; - Numbers +(integer) @constant.numeric.integer +(float) @constant.numeric.float + +; ------- +; Other literals +; ------- + +(comment) @comment +(string) @string |