From 52789df8120bd9a4b2f105f6c3221dfe76937d21 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 16 Mar 2017 18:36:45 +0300
Subject: [PATCH] Minor: fix warnings in AbstractKotlinParsing.java

---
 .../kotlin/parsing/AbstractKotlinParsing.java | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java
index 35c49ad8092..af0575f230c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java
@@ -92,22 +92,21 @@ import static org.jetbrains.kotlin.lexer.KtTokens.*;
         return false;
     }
 
-    protected boolean expectNoAdvance(KtToken expectation, String message) {
+    protected void expectNoAdvance(KtToken expectation, String message) {
         if (at(expectation)) {
             advance(); // expectation
-            return true;
+            return;
         }
 
         error(message);
-
-        return false;
     }
 
     protected void errorWithRecovery(String message, TokenSet recoverySet) {
         IElementType tt = tt();
-        if (recoverySet == null || recoverySet.contains(tt) || tt == LBRACE || tt == RBRACE
-                || (recoverySet.contains(EOL_OR_SEMICOLON)
-                        && (eof() || tt == SEMICOLON || myBuilder.newlineBeforeCurrentToken()))) {
+        if (recoverySet == null ||
+            recoverySet.contains(tt) ||
+            tt == LBRACE || tt == RBRACE ||
+            (recoverySet.contains(EOL_OR_SEMICOLON) && (eof() || tt == SEMICOLON || myBuilder.newlineBeforeCurrentToken()))) {
             error(message);
         }
         else {
@@ -115,15 +114,14 @@ import static org.jetbrains.kotlin.lexer.KtTokens.*;
         }
     }
 
-    protected boolean errorAndAdvance(String message) {
-        return errorAndAdvance(message, 1);
+    protected void errorAndAdvance(String message) {
+        errorAndAdvance(message, 1);
     }
 
-    protected boolean errorAndAdvance(String message, int advanceTokenCount) {
+    protected void errorAndAdvance(String message, int advanceTokenCount) {
         PsiBuilder.Marker err = mark();
         advance(advanceTokenCount);
         err.error(message);
-        return false;
     }
 
     protected boolean eof() {
@@ -198,7 +196,7 @@ import static org.jetbrains.kotlin.lexer.KtTokens.*;
     /**
      * Side-effect-free version of atSet()
      */
-    protected boolean _atSet(TokenSet set) {
+    private boolean _atSet(TokenSet set) {
         IElementType token = tt();
         if (set.contains(token)) return true;
         if (set.contains(EOL_OR_SEMICOLON)) {