fix import.meta parsing/fix assertions on string literals

Author: VISTALL

lang-version-impl/typescript-impl/src/main/grammar/consulo/typescript/language/grammar/TypeScript.bnf

@@ -215,6 +215,7 @@
     // Literals
     NUMERIC_LITERAL
     STRING_LITERAL
+    SINGLE_QUOTE_STRING_LITERAL
     REGEXP_LITERAL
     NO_SUBSTITUTION_TEMPLATE
     TEMPLATE_HEAD
@@ -332,7 +333,7 @@ private statement_recover_ ::= !(
     SWITCH_KEYWORD | TRY_KEYWORD | RETURN_KEYWORD |
     THROW_KEYWORD | BREAK_KEYWORD | CONTINUE_KEYWORD |
     IMPORT_KEYWORD | EXPORT_KEYWORD | ENUM_KEYWORD | AT |
-    NUMERIC_LITERAL | STRING_LITERAL |
+    NUMERIC_LITERAL | STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL |
     LPAR | LBRACKET | PLUS | MINUS | EXCL | TILDE |
     PLUSPLUS | MINUSMINUS | THIS_KEYWORD | NEW_KEYWORD |
     DELETE_KEYWORD | TYPEOF_KEYWORD | VOID_KEYWORD |
@@ -479,10 +480,10 @@ namespace_declaration ::= (NAMESPACE_KEYWORD | MODULE_KEYWORD) qualified_name bl
 ambient_declaration ::= DECLARE_KEYWORD (var_statement | function_declaration | class_declaration | enum_declaration | namespace_declaration | interface_declaration | type_alias_declaration | GLOBAL_KEYWORD block_statement) {pin=1}
 
 // --- Import ---
-import_declaration ::= 'import' TYPE_KEYWORD? import_clause from_clause import_attributes? semicolon
-  | 'import' TYPE_KEYWORD? module_specifier semicolon
-  | 'import' IDENTIFIER '=' (IDENTIFIER '(' module_specifier ')' | qualified_name) semicolon
-  {pin=1}
+import_declaration ::= 'import' !('.' | '(') (TYPE_KEYWORD? import_clause from_clause import_attributes? semicolon
+  | TYPE_KEYWORD? module_specifier semicolon
+  | IDENTIFIER '=' (IDENTIFIER '(' module_specifier ')' | qualified_name) semicolon)
+  {pin=2}
 
 private import_clause ::= IDENTIFIER (',' (namespace_import | named_imports))?
   | namespace_import
@@ -496,16 +497,17 @@ import_specifier ::= TYPE_KEYWORD? IDENTIFIER (AS_KEYWORD IDENTIFIER)?
 
 private from_clause ::= FROM_KEYWORD module_specifier
 
-private module_specifier ::= STRING_LITERAL
+private module_specifier ::= STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL
 
 import_attributes ::= (IDENTIFIER | AS_KEYWORD) '{' (import_attribute (',' import_attribute)* ','?)? '}'
 
-import_attribute ::= (IDENTIFIER | STRING_LITERAL) ':' (STRING_LITERAL | IDENTIFIER)
+import_attribute ::= (IDENTIFIER | STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL) ':' (STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL | IDENTIFIER)
 
 // --- Export ---
 export_declaration ::= 'export' (
     'default'? (function_declaration | class_declaration | interface_declaration | enum_declaration | type_alias_declaration)
   | 'default' expression semicolon
+  | ambient_declaration
   | var_statement
   | named_exports from_clause? semicolon
   | '*' (AS_KEYWORD IDENTIFIER)? from_clause semicolon
@@ -601,15 +603,17 @@ private primary_expression ::=
   | new_expression
   | template_literal_expression
   | parenthesized_expression
+  | import_meta_expression
   | reference_expression
   | type_assertion_expression
   | yield_expression
   | await_expression
 
 this_expression ::= 'this'
 super_expression ::= 'super'
+import_meta_expression ::= 'import' '.' IDENTIFIER
 reference_expression ::= IDENTIFIER
-literal_expression ::= NUMERIC_LITERAL | STRING_LITERAL | TRUE_KEYWORD | FALSE_KEYWORD | NULL_KEYWORD | REGEXP_LITERAL
+literal_expression ::= NUMERIC_LITERAL | STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL | TRUE_KEYWORD | FALSE_KEYWORD | NULL_KEYWORD | REGEXP_LITERAL
 
 yield_expression ::= 'yield' '*'? expression?
 
@@ -719,7 +723,7 @@ mapped_type ::= '{' ('+' | '-')? READONLY_KEYWORD? '[' IDENTIFIER 'in' type_expr
 
 indexed_access_type ::= primary_type '[' type_expression ']'
 
-literal_type ::= NUMERIC_LITERAL | STRING_LITERAL | TRUE_KEYWORD | FALSE_KEYWORD | NULL_KEYWORD
+literal_type ::= NUMERIC_LITERAL | STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL | TRUE_KEYWORD | FALSE_KEYWORD | NULL_KEYWORD
 
 typeof_type ::= 'typeof' reference_expression
 
@@ -729,7 +733,7 @@ infer_type ::= INFER_KEYWORD IDENTIFIER ('extends' type_expression)?
 
 template_literal_type ::= NO_SUBSTITUTION_TEMPLATE | TEMPLATE_HEAD type_expression (TEMPLATE_MIDDLE type_expression)* TEMPLATE_TAIL
 
-predefined_type ::= IDENTIFIER
+predefined_type ::= IDENTIFIER | VOID_KEYWORD
 
 type_parameter_list ::= '<' type_parameter (',' type_parameter)* '>' {pin=1}
 
@@ -749,7 +753,7 @@ private access_modifier ::= PUBLIC_KEYWORD | PRIVATE_KEYWORD | PROTECTED_KEYWORD
 
 // ==================== Utility Rules ====================
 
-private property_name ::= IDENTIFIER | STRING_LITERAL | NUMERIC_LITERAL | computed_property_name
+private property_name ::= IDENTIFIER | STRING_LITERAL | SINGLE_QUOTE_STRING_LITERAL | NUMERIC_LITERAL | computed_property_name
 
 qualified_name ::= IDENTIFIER ('.' IDENTIFIER)*
 

lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/TypeScriptTokenTypeFactory.java

@@ -31,6 +31,7 @@ public final class TypeScriptTokenTypeFactory {
         TOKEN_MAP.put("IDENTIFIER", JSTokenTypes.IDENTIFIER);
         TOKEN_MAP.put("NUMERIC_LITERAL", JSTokenTypes.NUMERIC_LITERAL);
         TOKEN_MAP.put("STRING_LITERAL", JSTokenTypes.STRING_LITERAL);
+        TOKEN_MAP.put("SINGLE_QUOTE_STRING_LITERAL", JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL);
         TOKEN_MAP.put("REGEXP_LITERAL", JSTokenTypes.REGEXP_LITERAL);
 
         // Template literals (TypeScript-specific tokens)

lang-version-impl/typescript-impl/src/main/java/consulo/typescript/language/impl/syntax/_TypeScriptLexer.flex

@@ -71,7 +71,7 @@ REGEXP_LITERAL="/"([^\*\\/\r\n]|{ESCAPE_SEQUENCE}|{GROUP})([^\\/\r\n]|{ESCAPE_SE
 <YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {FLOAT_LITERAL}     { yybegin(DIV_OR_GT); return JSTokenTypes.NUMERIC_LITERAL; }
 
 // === String literals ===
-<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {QUOTED_LITERAL}        { yybegin(DIV_OR_GT); return JSTokenTypes.STRING_LITERAL; }
+<YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {QUOTED_LITERAL}        { yybegin(DIV_OR_GT); return JSTokenTypes.SINGLE_QUOTE_STRING_LITERAL; }
 <YYINITIAL,DIV_OR_GT,TEMPLATE_STRING_EXPRESSION> {DOUBLE_QUOTED_LITERAL} { yybegin(DIV_OR_GT); return JSTokenTypes.STRING_LITERAL; }
 
 // === Template literals ===