Change priority for interface, prefer interface to extern class/inter…

…face
HaxeFoundation · Apr 8, 2015 · 03fbf32 · 03fbf32
1 parent 28693be
commit 03fbf32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gen/com/intellij/plugins/haxe/lang/parser/HaxeParser.java b/gen/com/intellij/plugins/haxe/lang/parser/HaxeParser.java
@@ -5295,19 +5295,19 @@ static boolean topLevel(PsiBuilder b, int l) {
 
   /* ********************************************************** */
   // classDeclaration
+  //                               | interfaceDeclaration
   //                               | externClassDeclaration
   //                               | abstractClassDeclaration
-  //                               | interfaceDeclaration
   //                               | enumDeclaration
   //                               | typedefDeclaration
   static boolean topLevelDeclaration(PsiBuilder b, int l) {
     if (!recursion_guard_(b, l, "topLevelDeclaration")) return false;
     boolean r;
     Marker m = enter_section_(b);
     r = classDeclaration(b, l + 1);
+    if (!r) r = interfaceDeclaration(b, l + 1);
     if (!r) r = externClassDeclaration(b, l + 1);
     if (!r) r = abstractClassDeclaration(b, l + 1);
-    if (!r) r = interfaceDeclaration(b, l + 1);
     if (!r) r = enumDeclaration(b, l + 1);
     if (!r) r = typedefDeclaration(b, l + 1);
     exit_section_(b, m, null, r);

diff --git a/grammar/haxe.bnf b/grammar/haxe.bnf
@@ -246,9 +246,9 @@ private importStatementAll ::= importStatementWithWildcard | importStatementWith
 usingStatement ::= 'using' simpleQualifiedReferenceExpression ';' {pin=1}
 
 private topLevelDeclaration ::= classDeclaration
+                              | interfaceDeclaration
                               | externClassDeclaration
                               | abstractClassDeclaration
-                              | interfaceDeclaration
                               | enumDeclaration
                               | typedefDeclaration