From 15f6773208153f28fee5d29259ca58f16b81dd3f Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 8 Mar 2018 16:28:04 +0100
Subject: [PATCH] Cleanup (warnings)

---
 .../lang/java/parser/DeclarationParser.java   | 37 +++++++------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
index 7f68def35e12..0b1dcb4b6504 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
@@ -1,6 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o.
-// Use of this source code is governed by the Apache 2.0 license that can be
-// found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.lang.java.parser;
 
 import com.intellij.codeInsight.daemon.JavaErrorMessages;
@@ -188,6 +186,7 @@ public class DeclarationParser {
       final IElementType tokenType = builder.getTokenType();
       if (tokenType == null || tokenType == JavaTokenType.RBRACE) break;
 
+      //noinspection Duplicates
       if (tokenType == JavaTokenType.SEMICOLON) {
         if (invalidElements != null) {
           invalidElements.error(JavaErrorMessages.message("unexpected.token"));
@@ -449,25 +448,21 @@ public class DeclarationParser {
     return declaration;
   }
 
-  @NotNull
-  public PsiBuilder.Marker parseParameterList(PsiBuilder builder) {
-    return parseElementList(builder, ListType.METHOD);
+  public void parseParameterList(PsiBuilder builder) {
+    parseElementList(builder, ListType.METHOD);
   }
 
-  @NotNull
-  public PsiBuilder.Marker parseResourceList(PsiBuilder builder) {
-    return parseElementList(builder, ListType.RESOURCE);
+  public void parseResourceList(PsiBuilder builder) {
+    parseElementList(builder, ListType.RESOURCE);
   }
 
-  @NotNull
-  public PsiBuilder.Marker parseLambdaParameterList(PsiBuilder builder, boolean typed) {
-    return parseElementList(builder, typed ? ListType.LAMBDA_TYPED : ListType.LAMBDA_UNTYPED);
+  public void parseLambdaParameterList(PsiBuilder builder, boolean typed) {
+    parseElementList(builder, typed ? ListType.LAMBDA_TYPED : ListType.LAMBDA_UNTYPED);
   }
 
   private enum ListType {METHOD, RESOURCE, LAMBDA_TYPED, LAMBDA_UNTYPED}
 
-  @NotNull
-  private PsiBuilder.Marker parseElementList(PsiBuilder builder, ListType type) {
+  private void parseElementList(PsiBuilder builder, ListType type) {
     final boolean lambda = (type == ListType.LAMBDA_TYPED || type == ListType.LAMBDA_UNTYPED);
     final boolean resources = (type == ListType.RESOURCE);
     final PsiBuilder.Marker elementList = builder.mark();
@@ -564,7 +559,6 @@ public class DeclarationParser {
     }
 
     done(elementList, resources ? JavaElementType.RESOURCE_LIST : JavaElementType.PARAMETER_LIST);
-    return elementList;
   }
 
   @Nullable
@@ -814,18 +808,17 @@ public class DeclarationParser {
     return anno;
   }
 
-  @NotNull
-  private PsiBuilder.Marker parseAnnotationParameterList(final PsiBuilder builder) {
+  private void parseAnnotationParameterList(final PsiBuilder builder) {
     PsiBuilder.Marker list = builder.mark();
 
     if (!expect(builder, JavaTokenType.LPARENTH)) {
       done(list, JavaElementType.ANNOTATION_PARAMETER_LIST);
-      return list;
+      return;
     }
 
     if (expect(builder, JavaTokenType.RPARENTH)) {
       done(list, JavaElementType.ANNOTATION_PARAMETER_LIST);
-      return list;
+      return;
     }
 
     final boolean isFirstParamNamed = parseAnnotationParameter(builder, true);
@@ -867,7 +860,6 @@ public class DeclarationParser {
     }
 
     done(list, JavaElementType.ANNOTATION_PARAMETER_LIST);
-    return list;
   }
 
   private boolean parseAnnotationParameter(final PsiBuilder builder, final boolean mayBeSimple) {
@@ -895,16 +887,13 @@ public class DeclarationParser {
     return hasName;
   }
 
-  @NotNull
-  public PsiBuilder.Marker parseAnnotationValue(PsiBuilder builder) {
+  public void parseAnnotationValue(PsiBuilder builder) {
     PsiBuilder.Marker result = doParseAnnotationValue(builder);
 
     if (result == null) {
       result = builder.mark();
       result.error(JavaErrorMessages.message("expected.value"));
     }
-
-    return result;
   }
 
   @Nullable