Merge pull request #56 from Darkyenus/interface-block-fix

Fix #54. Don't hang on incomplete interface blocks
Darkyenus · May 7, 2015 · 1794d49 · 1794d49
2 parents 410e550 + a7449d6
commit 1794d49
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/glslplugin/lang/parser/GLSLParsing.java b/src/glslplugin/lang/parser/GLSLParsing.java
@@ -254,11 +254,11 @@ private boolean parseExternalDeclaration() {
             if (b.getTokenType() == RIGHT_BRACE) {
                 b.error("Empty interface block is not allowed.");
             }
-
-            while (!tryMatch(RIGHT_BRACE)) {
+            
+            while (!tryMatch(RIGHT_BRACE) && !eof()) {
                 final PsiBuilder.Marker member = b.mark();
                 parseQualifierList(true);
-                if (!parseTypeSpecifier()) advanceLexer();
+                if (!parseTypeSpecifierNoArray()) advanceLexer();
                 parseDeclaratorList();
                 match(SEMICOLON, "Expected ';'");
                 member.done(STRUCT_DECLARATION);//TODO Should we call interface block members struct members?