Handle variable expension inside shell

tree-sitter-grammars · Feb 1, 2024 · 3816ad2 · 3816ad2
1 parent 10bacac
commit 3816ad2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/grammar.js b/grammar.js
@@ -250,6 +250,7 @@ module.exports = grammar({
       '{',
       repeat(choice(
         $.shell_content,
+        $.variable_expansion,
         $.inline_python,
       )),
       '}',

diff --git a/src/scanner.c b/src/scanner.c
@@ -461,9 +461,9 @@ bool tree_sitter_bitbake_external_scanner_scan(void *payload, TSLexer *lexer, co
                         brace_depth++;
                         if (lexer->lookahead == '@') {
                             advance(lexer);
-                            lexer->result_symbol = SHELL_CONTENT;
-                            return advance_once;
                         }
+                        lexer->result_symbol = SHELL_CONTENT;
+                        return advance_once;
                     }
                     advance_once = true;
                     break;