diff options
| author | ObserverOfTime <chronobserver@disroot.org> | 2023-08-19 19:48:32 +0300 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2025-05-12 18:43:40 +0200 |
| commit | 310f0925ec64c7e54f3ee952679d285b13e5a735 (patch) | |
| tree | a40c37ea28177c74e1198a0d05041ecbddba702d | |
| parent | injections(nix): add nixosTest.testScript + home-manager nvim config (diff) | |
| download | nvim-treesitter-310f0925ec64c7e54f3ee952679d285b13e5a735.tar nvim-treesitter-310f0925ec64c7e54f3ee952679d285b13e5a735.tar.gz nvim-treesitter-310f0925ec64c7e54f3ee952679d285b13e5a735.tar.bz2 nvim-treesitter-310f0925ec64c7e54f3ee952679d285b13e5a735.tar.lz nvim-treesitter-310f0925ec64c7e54f3ee952679d285b13e5a735.tar.xz nvim-treesitter-310f0925ec64c7e54f3ee952679d285b13e5a735.tar.zst nvim-treesitter-310f0925ec64c7e54f3ee952679d285b13e5a735.zip | |
feat(c-family): inherit injections
| -rw-r--r-- | queries/arduino/injections.scm | 6 | ||||
| -rw-r--r-- | queries/c/injections.scm | 2 | ||||
| -rw-r--r-- | queries/cpp/injections.scm | 4 | ||||
| -rw-r--r-- | queries/cuda/injections.scm | 6 | ||||
| -rw-r--r-- | queries/glsl/injections.scm | 6 | ||||
| -rw-r--r-- | queries/hlsl/injections.scm | 6 | ||||
| -rw-r--r-- | queries/rust/indents.scm | 15 |
7 files changed, 21 insertions, 24 deletions
diff --git a/queries/arduino/injections.scm b/queries/arduino/injections.scm index b637d9b2b..b617fdc56 100644 --- a/queries/arduino/injections.scm +++ b/queries/arduino/injections.scm @@ -1,5 +1 @@ -((preproc_arg) @injection.content - (#set! injection.language "arduino")) - -((comment) @injection.content - (#set! injection.language "comment")) +; inherits: cpp diff --git a/queries/c/injections.scm b/queries/c/injections.scm index 77b4d7a86..24634864e 100644 --- a/queries/c/injections.scm +++ b/queries/c/injections.scm @@ -1,5 +1,5 @@ ((preproc_arg) @injection.content - (#set! injection.language "c")) + (#set! injection.self)) ((comment) @injection.content (#set! injection.language "comment")) diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm index 6e1657229..07f21dd14 100644 --- a/queries/cpp/injections.scm +++ b/queries/cpp/injections.scm @@ -1,6 +1,4 @@ -((preproc_arg) @injection.content - (#set! injection.language "cpp")) - +; inherits: c ((comment) @injection.content (#set! injection.language "comment")) diff --git a/queries/cuda/injections.scm b/queries/cuda/injections.scm index 0259958c5..b617fdc56 100644 --- a/queries/cuda/injections.scm +++ b/queries/cuda/injections.scm @@ -1,5 +1 @@ -((preproc_arg) @injection.content - (#set! injection.language "cuda")) - -((comment) @injection.content - (#set! injection.language "comment")) +; inherits: cpp diff --git a/queries/glsl/injections.scm b/queries/glsl/injections.scm index 90ca7b5d4..a5a5208ca 100644 --- a/queries/glsl/injections.scm +++ b/queries/glsl/injections.scm @@ -1,5 +1 @@ -((preproc_arg) @injection.content - (#set! injection.language "glsl")) - -((comment) @injection.content - (#set! injection.language "comment")) +; inherits: c diff --git a/queries/hlsl/injections.scm b/queries/hlsl/injections.scm index c2fca7121..b617fdc56 100644 --- a/queries/hlsl/injections.scm +++ b/queries/hlsl/injections.scm @@ -1,5 +1 @@ -((preproc_arg) @injection.content - (#set! injection.language "hlsl")) - -((comment) @injection.content - (#set! injection.language "comment")) +; inherits: cpp diff --git a/queries/rust/indents.scm b/queries/rust/indents.scm index dfe0a3805..9fe337d5c 100644 --- a/queries/rust/indents.scm +++ b/queries/rust/indents.scm @@ -26,6 +26,12 @@ (macro_definition) ] @indent.begin +(trait_item + body: (_) @indent.begin) + +(string_literal + (escape_sequence)) @indent.begin + ; Typing in "(" inside macro definitions breaks the tree entirely ; Making macro_definition becoming errors ; Offset this by adding back one indent for start of macro rules @@ -85,6 +91,15 @@ (tuple_struct_pattern ")" @indent.end) +; Typing in "(" inside macro definitions breaks the tree entirely +; Making macro_definition becoming errors +; Offset this by adding back one indent for start of macro rules +(ERROR + . + "macro_rules!" + "(" @indent.begin + (#set! indent.immediate) + (#set! indent.start_at_same_line)) (tuple_type ")" @indent.end) |