Support variable names in literals

diff --git a/grammar/JinjaGrammar.g4 b/grammar/JinjaGrammar.g4
index c0743b3ac827ebddf892a4eacee70f78cc253ac1..7ae6e1abe66537cc92858448e7142bc96d17e205 100644 (file)
--- a/grammar/JinjaGrammar.g4
+++ b/grammar/JinjaGrammar.g4
@@ -20,11 +20,15 @@ list_literal_values
     ;
 list_literal_value
     : STRING_LITERAL
+    | variable_name
     ;
 
+variable_name : IDENTIFIER;
+
 statement_include_template_list
     : STRING_LITERAL
     | list_literal
+    | variable_name
     ;
 
 statement_include_context

diff --git a/grammar/JinjaLexer.g4 b/grammar/JinjaLexer.g4
index 4cc2d8e824a7370b5ba60d829a4186931dbaa0c3..573d5a9b3c8e86d0c5bed7ffbdcf79fa08a9ba83 100644 (file)
--- a/grammar/JinjaLexer.g4
+++ b/grammar/JinjaLexer.g4
@@ -88,4 +88,8 @@ STATEMENT_INCLUDE_IGNORE_MISSING    : 'ignore missing';
 STATEMENT_INCLUDE_WITH_CONTEXT      : 'with context';
 STATEMENT_INCLUDE_WITHOUT_CONTEXT   : 'without context';
 
-END_STATEMENT_ID_PREFIX    : 'end';
\ No newline at end of file
+END_STATEMENT_ID_PREFIX    : 'end';
+
+IDENTIFIER                       : IDENTIFIER_START IDENTIFIER_CONTINUE*;
+fragment IDENTIFIER_START        : [a-zA-Z_];
+fragment IDENTIFIER_CONTINUE     : [a-zA-Z0-0_];