From f95e0102e0a8aaa50e016e268e17353d2489cae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Sun, 17 Mar 2024 20:07:09 -0300 Subject: [PATCH] Add blade support (#9513) * Add php-only language config and queries php-only is required enabling php injections like in blade templates * Add blade templates support --- book/src/generated/lang-support.md | 2 + languages.toml | 23 +++++ runtime/queries/blade/folds.scm | 8 ++ runtime/queries/blade/highlights.scm | 4 + runtime/queries/blade/injections.scm | 9 ++ runtime/queries/php-only/highlights.scm | 123 ++++++++++++++++++++++++ runtime/queries/php-only/injections.scm | 10 ++ runtime/queries/php-only/tags.scm | 40 ++++++++ 8 files changed, 219 insertions(+) create mode 100644 runtime/queries/blade/folds.scm create mode 100644 runtime/queries/blade/highlights.scm create mode 100644 runtime/queries/blade/injections.scm create mode 100644 runtime/queries/php-only/highlights.scm create mode 100644 runtime/queries/php-only/injections.scm create mode 100644 runtime/queries/php-only/tags.scm diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md index 40029657f55f4..97ea8e8635185 100644 --- a/book/src/generated/lang-support.md +++ b/book/src/generated/lang-support.md @@ -8,6 +8,7 @@ | beancount | ✓ | | | | | bibtex | ✓ | | | `texlab` | | bicep | ✓ | | | `bicep-langserver` | +| blade | ✓ | | | | | blueprint | ✓ | | | `blueprint-compiler` | | c | ✓ | ✓ | ✓ | `clangd` | | c-sharp | ✓ | ✓ | | `OmniSharp` | @@ -131,6 +132,7 @@ | pem | ✓ | | | | | perl | ✓ | ✓ | ✓ | `perlnavigator` | | php | ✓ | ✓ | ✓ | `intelephense` | +| php-only | ✓ | | | | | pkl | ✓ | | ✓ | | | po | ✓ | ✓ | | | | pod | ✓ | | | | diff --git a/languages.toml b/languages.toml index 6914684198ecf..6e6c57932d108 100644 --- a/languages.toml +++ b/languages.toml @@ -940,6 +940,29 @@ indent = { tab-width = 4, unit = " " } name = "php" source = { git = "https://github.com/tree-sitter/tree-sitter-php", rev = "f860e598194f4a71747f91789bf536b393ad4a56" } +[[language]] +name = "php-only" +scope = "source.php-only" +injection-regex = "php-only" +file-types = [] +indent = { tab-width = 4, unit = " " } +roots = ["composer.json", "index.php"] + +[[grammar]] +name = "php-only" +source = { git = "https://github.com/tree-sitter/tree-sitter-php", rev = "cf1f4a0f1c01c705c1d6cf992b104028d5df0b53", subpath = "php_only" } + +[[language]] +name = "blade" +scope = "source.blade.php" +file-types = [{ glob = "*.blade.php" }, "blade"] +injection-regex = "blade" +roots = ["composer.json", "index.php"] + +[[grammar]] +name = "blade" +source = { git = "https://github.com/EmranMR/tree-sitter-blade", rev = "4c66efe1e05c639c555ee70092021b8223d2f440" } + [[language]] name = "twig" scope = "source.twig" diff --git a/runtime/queries/blade/folds.scm b/runtime/queries/blade/folds.scm new file mode 100644 index 0000000000000..c171148212b09 --- /dev/null +++ b/runtime/queries/blade/folds.scm @@ -0,0 +1,8 @@ +((directive_start) @start + (directive_end) @end.after + (#set! role block)) + + +((bracket_start) @start + (bracket_end) @end + (#set! role block)) \ No newline at end of file diff --git a/runtime/queries/blade/highlights.scm b/runtime/queries/blade/highlights.scm new file mode 100644 index 0000000000000..b3d442a05f630 --- /dev/null +++ b/runtime/queries/blade/highlights.scm @@ -0,0 +1,4 @@ +(directive) @tag +(directive_start) @tag +(directive_end) @tag +(comment) @comment diff --git a/runtime/queries/blade/injections.scm b/runtime/queries/blade/injections.scm new file mode 100644 index 0000000000000..4c6367349b552 --- /dev/null +++ b/runtime/queries/blade/injections.scm @@ -0,0 +1,9 @@ +((text) @injection.content + (#set! injection.combined) + (#set! injection.language php)) + +((php_only) @injection.content + (#set! injection.language php-only)) +((parameter) @injection.content + (#set! injection.language php-only)) + diff --git a/runtime/queries/php-only/highlights.scm b/runtime/queries/php-only/highlights.scm new file mode 100644 index 0000000000000..9fdbe02986d98 --- /dev/null +++ b/runtime/queries/php-only/highlights.scm @@ -0,0 +1,123 @@ +(php_tag) @tag +"?>" @tag + +; Types + +(primitive_type) @type.builtin +(cast_type) @type.builtin +(named_type (name) @type) @type +(named_type (qualified_name) @type) @type + +; Functions + +(array_creation_expression "array" @function.builtin) +(list_literal "list" @function.builtin) + +(method_declaration + name: (name) @function.method) + +(function_call_expression + function: [(qualified_name (name)) (name)] @function) + +(scoped_call_expression + name: (name) @function) + +(member_call_expression + name: (name) @function.method) + +(function_definition + name: (name) @function) + +; Member + +(property_element + (variable_name) @variable.other.member) + +(member_access_expression + name: (variable_name (name)) @variable.other.member) +(member_access_expression + name: (name) @variable.other.member) + +; Variables + +(relative_scope) @variable.builtin + +((name) @constant + (#match? @constant "^_?[A-Z][A-Z\\d_]+$")) +((name) @constant.builtin + (#match? @constant.builtin "^__[A-Z][A-Z\d_]+__$")) + +((name) @constructor + (#match? @constructor "^[A-Z]")) + +((name) @variable.builtin + (#eq? @variable.builtin "this")) + +(variable_name) @variable + +; Basic tokens +[ + (string) + (string_value) + (encapsed_string) + (heredoc) + (heredoc_body) + (nowdoc_body) +] @string +(boolean) @constant.builtin.boolean +(null) @constant.builtin +(integer) @constant.builtin.integer +(float) @constant.builtin.float +(comment) @comment + +"$" @operator + +; Keywords + +"abstract" @keyword +"as" @keyword +"break" @keyword +"case" @keyword +"catch" @keyword +"class" @keyword +"const" @keyword +"continue" @keyword +"declare" @keyword +"default" @keyword +"do" @keyword +"echo" @keyword +"else" @keyword +"elseif" @keyword +"enddeclare" @keyword +"endforeach" @keyword +"endif" @keyword +"endswitch" @keyword +"endwhile" @keyword +"extends" @keyword +"final" @keyword +"finally" @keyword +"for" @keyword +"foreach" @keyword +"function" @keyword +"global" @keyword +"if" @keyword +"implements" @keyword +"include_once" @keyword +"include" @keyword +"insteadof" @keyword +"interface" @keyword +"namespace" @keyword +"new" @keyword +"private" @keyword +"protected" @keyword +"public" @keyword +"require_once" @keyword +"require" @keyword +"return" @keyword +"static" @keyword +"switch" @keyword +"throw" @keyword +"trait" @keyword +"try" @keyword +"use" @keyword +"while" @keyword diff --git a/runtime/queries/php-only/injections.scm b/runtime/queries/php-only/injections.scm new file mode 100644 index 0000000000000..75150f716e31b --- /dev/null +++ b/runtime/queries/php-only/injections.scm @@ -0,0 +1,10 @@ +((comment) @injection.content + (#set! injection.language "comment")) + +(heredoc + (heredoc_body) @injection.content + (heredoc_end) @injection.language) + +(nowdoc + (nowdoc_body) @injection.content + (heredoc_end) @injection.language) diff --git a/runtime/queries/php-only/tags.scm b/runtime/queries/php-only/tags.scm new file mode 100644 index 0000000000000..66d594c254748 --- /dev/null +++ b/runtime/queries/php-only/tags.scm @@ -0,0 +1,40 @@ +(namespace_definition + name: (namespace_name) @name) @module + +(interface_declaration + name: (name) @name) @definition.interface + +(trait_declaration + name: (name) @name) @definition.interface + +(class_declaration + name: (name) @name) @definition.class + +(class_interface_clause [(name) (qualified_name)] @name) @impl + +(property_declaration + (property_element (variable_name (name) @name))) @definition.field + +(function_definition + name: (name) @name) @definition.function + +(method_declaration + name: (name) @name) @definition.function + +(object_creation_expression + [ + (qualified_name (name) @name) + (variable_name (name) @name) + ]) @reference.class + +(function_call_expression + function: [ + (qualified_name (name) @name) + (variable_name (name)) @name + ]) @reference.call + +(scoped_call_expression + name: (name) @name) @reference.call + +(member_call_expression + name: (name) @name) @reference.call