From 38d2923eae3b792f6c0f3407b0dbe85dfee5fc8f Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 21 May 2024 15:09:25 -0400 Subject: [PATCH] Support variable names in literals --- grammar/JinjaGrammar.g4 | 4 ++++ grammar/JinjaLexer.g4 | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/grammar/JinjaGrammar.g4 b/grammar/JinjaGrammar.g4 index c0743b3a..7ae6e1ab 100644 --- 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 4cc2d8e8..573d5a9b 100644 --- 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_]; -- 2.47.2