Add support for from ... import ... as

diff --git a/grammar/JinjaGrammar.g4 b/grammar/JinjaGrammar.g4
index cca5b78ab02af96b9f723ad57a94872e6e3d4ddb..8314a6bdad7090231e581dbf50ec379c1fbad43a 100644 (file)
--- a/grammar/JinjaGrammar.g4
+++ b/grammar/JinjaGrammar.g4
@@ -48,8 +48,17 @@ statement_import_file
     | variable_name
     ;
 
+statement_import_variable
+    : variable_name (SP STATEMENT_ID_IMPORT_AS SP variable_name)?
+    ;
+
+statement_import_variable_list
+    : (statement_import_variable SP? COMMA SP?)+ statement_import_variable
+    ;
+
 statement_import
     : STATEMENT_ID_IMPORT SP statement_import_file SP STATEMENT_ID_IMPORT_AS SP variable_name
+    | STATEMENT_ID_FROM SP statement_import_file SP STATEMENT_ID_IMPORT SP statement_import_variable_list
     ;
 
 block_statement_id

diff --git a/grammar/JinjaLexer.g4 b/grammar/JinjaLexer.g4
index 37bbc8f4853df78b0b03786e2115f6bfdf0440b2..ecc7e35e5b6a5aed3e173d2ddd8db0cfa7538686 100644 (file)
--- a/grammar/JinjaLexer.g4
+++ b/grammar/JinjaLexer.g4
@@ -79,6 +79,7 @@ SP              : [ \t\f]+;
 // Statement identifiers for built-in statements
 
 STATEMENT_ID_BLOCK      : 'block';
+STATEMENT_ID_FROM       : 'from';
 STATEMENT_ID_IMPORT     : 'import';
 STATEMENT_ID_INCLUDE    : 'include';
 STATEMENT_ID_RAW        : 'raw';