From f92b648970a7322b3f44d772463ffb928c45e02e Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Thu, 26 May 2016 17:37:53 +0200
Subject: [PATCH] regex: minor parser cleanup

---
 .../intellij/lang/regexp/RegExpParser.java    | 24 ++++++-------------
 RegExpSupport/testData/RETest.xml             |  8 +++++++
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java
index da64cd0a22be..b6e4144ac898 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java
@@ -25,7 +25,6 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.EnumSet;
 
-@SuppressWarnings({"RedundantIfStatement"})
 public class RegExpParser implements PsiParser {
   private final EnumSet<RegExpCapability> myCapabilities;
 
@@ -37,9 +36,9 @@ public class RegExpParser implements PsiParser {
     myCapabilities = capabilities;
   }
 
+  @Override
   @NotNull
-  public ASTNode parse(IElementType root, PsiBuilder builder) {
-//        builder.setDebugMode(true);
+  public ASTNode parse(@NotNull IElementType root, @NotNull PsiBuilder builder) {
     final PsiBuilder.Marker rootMarker = builder.mark();
 
     parsePattern(builder);
@@ -68,7 +67,6 @@ public class RegExpParser implements PsiParser {
     while (builder.getTokenType() == RegExpTT.UNION) {
       builder.advanceLexer();
       if (!parseBranch(builder)) {
-        // TODO: no test coverage
         patternExpected(builder);
         break;
       }
@@ -84,7 +82,7 @@ public class RegExpParser implements PsiParser {
    */
   @SuppressWarnings({"StatementWithEmptyBody"})
   private boolean parseBranch(PsiBuilder builder) {
-    PsiBuilder.Marker marker = builder.mark();
+    final PsiBuilder.Marker marker = builder.mark();
 
     if (!parseAtom(builder)) {
       final IElementType token = builder.getTokenType();
@@ -97,7 +95,7 @@ public class RegExpParser implements PsiParser {
       return false;
     }
 
-    for (; parseAtom(builder);) ;
+    while (parseAtom(builder)) ;
 
     marker.done(RegExpElementTypes.BRANCH);
     return true;
@@ -189,10 +187,7 @@ public class RegExpParser implements PsiParser {
   }
 
   private static void parseQuantifierType(PsiBuilder builder) {
-    if (builder.getTokenType() == RegExpTT.PLUS) {
-      builder.advanceLexer();
-    }
-    else if (builder.getTokenType() == RegExpTT.QUEST) {
+    if (builder.getTokenType() == RegExpTT.PLUS || builder.getTokenType() == RegExpTT.QUEST) {
       builder.advanceLexer();
     }
     else {
@@ -265,12 +260,8 @@ public class RegExpParser implements PsiParser {
     else if (token == RegExpTT.PROPERTY) {
       parseProperty(builder);
     }
-    else if (mayBeEmpty) {
-      // TODO: no test coverage
-      return true;
-    }
     else {
-      return false;
+      return mayBeEmpty;
     }
     return true;
   }
@@ -322,7 +313,7 @@ public class RegExpParser implements PsiParser {
 
   private static void makeChar(PsiBuilder builder) {
     final IElementType t = builder.getTokenType();
-    PsiBuilder.Marker m = builder.mark();
+    final PsiBuilder.Marker m = builder.mark();
     builder.advanceLexer();
     m.done(t == RegExpTT.CHAR_CLASS ? RegExpElementTypes.SIMPLE_CLASS : RegExpElementTypes.CHAR);
   }
@@ -362,7 +353,6 @@ public class RegExpParser implements PsiParser {
       if (builder.getTokenType() == RegExpTT.COLON) {
         builder.advanceLexer();
         if (!parsePattern(builder)) {
-          // TODO: no test coverage
           patternExpected(builder);
         }
         else {
diff --git a/RegExpSupport/testData/RETest.xml b/RegExpSupport/testData/RETest.xml
index ee4fa31b8324..3e81b2ec2e89 100644
--- a/RegExpSupport/testData/RETest.xml
+++ b/RegExpSupport/testData/RETest.xml
@@ -232,6 +232,10 @@
       <pattern>a[b&amp;&amp;c&amp;&amp;d-e&amp;&amp;f]</pattern>
       <expected>OK</expected>
     </test>
+    <test>
+      <pattern>[a&amp;&amp;]</pattern>
+      <expected>OK</expected>
+    </test>
     <test>
       <pattern>a[a[b][c]]</pattern>
       <expected>OK</expected>
@@ -887,6 +891,10 @@
       <pattern>\E</pattern>
       <expected>ERR</expected>
     </test>
+    <test>
+      <pattern>a|*</pattern>
+      <expected>ERR</expected>
+    </test>
   </incomplete>
 
   <regressions>