Implement the Dart parser change "generic-metadata" in the dart.bnf file

https://github.com/dart-lang/language/blob/master/accepted/future-releases/small-features-21Q1/implementation-plan.md dart-lang/sdk#44918
jwren · Feb 22, 2021 · c7534ec · c7534ec
1 parent ddd9215
commit c7534ec
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 4 deletions.
diff --git a/Dart/gen/com/jetbrains/lang/dart/DartParser.java b/Dart/gen/com/jetbrains/lang/dart/DartParser.java
diff --git a/Dart/gen/com/jetbrains/lang/dart/psi/DartMetadata.java b/Dart/gen/com/jetbrains/lang/dart/psi/DartMetadata.java
diff --git a/Dart/gen/com/jetbrains/lang/dart/psi/impl/DartMetadataImpl.java b/Dart/gen/com/jetbrains/lang/dart/psi/impl/DartMetadataImpl.java
diff --git a/Dart/src/com/jetbrains/lang/dart/Dart.bnf b/Dart/src/com/jetbrains/lang/dart/Dart.bnf
@@ -222,7 +222,7 @@ partStatement ::= metadata* 'part' uriElement ';' {
   methods = [ getUriString ]
 }
 
-metadata ::= '@' simpleQualifiedReferenceExpression <<argumentsWrapper>>?
+metadata ::= '@' simpleQualifiedReferenceExpression typeArguments? <<argumentsWrapper>>?
 
 uriElement ::= stringLiteralExpression {mixin="com.jetbrains.lang.dart.psi.impl.DartUriElementBase"   methods = [ getUriStringAndItsRange ]}
 

diff --git a/Dart/testData/parsing/Class1.dart b/Dart/testData/parsing/Class1.dart
@@ -1,7 +1,7 @@
 mixin mixin(){}
 mixin mixin;
 mixin M {}
-@a @b() mixin M1<T, Y extends Comparable<Y>> on I<T>, J implements J,I<T> {}
+@a @b() @c<String>() @d<List<String>> mixin M1<T, Y extends Comparable<Y>> on I<T>, J implements J,I<T> {}
 
 class A<A>= Object with M;
 class A<A extends B<E>>= Object with M;

diff --git a/Dart/testData/parsing/Class1.txt b/Dart/testData/parsing/Class1.txt
@@ -53,6 +53,46 @@ Dart File
       ARGUMENTS
         PsiElement(()('(')
         PsiElement())(')')
+    METADATA
+      PsiElement(@)('@')
+      REFERENCE_EXPRESSION
+        ID
+          PsiElement(IDENTIFIER)('c')
+      TYPE_ARGUMENTS
+        PsiElement(<)('<')
+        TYPE_LIST
+          TYPE
+            SIMPLE_TYPE
+              REFERENCE_EXPRESSION
+                ID
+                  PsiElement(IDENTIFIER)('String')
+        PsiElement(>)('>')
+      ARGUMENTS
+        PsiElement(()('(')
+        PsiElement())(')')
+    METADATA
+      PsiElement(@)('@')
+      REFERENCE_EXPRESSION
+        ID
+          PsiElement(IDENTIFIER)('d')
+      TYPE_ARGUMENTS
+        PsiElement(<)('<')
+        TYPE_LIST
+          TYPE
+            SIMPLE_TYPE
+              REFERENCE_EXPRESSION
+                ID
+                  PsiElement(IDENTIFIER)('List')
+              TYPE_ARGUMENTS
+                PsiElement(<)('<')
+                TYPE_LIST
+                  TYPE
+                    SIMPLE_TYPE
+                      REFERENCE_EXPRESSION
+                        ID
+                          PsiElement(IDENTIFIER)('String')
+                PsiElement(>)('>')
+        PsiElement(>)('>')
     PsiElement(mixin)('mixin')
     COMPONENT_NAME
       ID