Merge remote-tracking branch 'upstream/master' into runelite

build.gradle

@@ -1,3 +1,4 @@
+// Copyright 2000-2019 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.
 apply plugin: 'java'
 
 compileJava {
@@ -12,8 +13,8 @@ sourceSets {
 
 repositories { jcenter() }
 dependencies {
-  testCompile 'junit:junit:4.+'
-  testCompile 'org.assertj:assertj-core:3.+'
+  testCompile 'junit:junit:4.12'
+  testCompile 'org.assertj:assertj-core:3.12.2'
 }
 
 jar {

src/org/jetbrains/java/decompiler/main/AssertProcessor.java

@@ -320,7 +320,6 @@ public class AssertProcessor {
                  key.equals(InterpreterUtil.makeUniqueKey(fdparam.getName(), fdparam.getDescriptor().descriptorString));
         }
       }
-      return false;
     }
     else {
       if (exprent.type == Exprent.EXPRENT_FIELD) {
@@ -328,7 +327,7 @@ public class AssertProcessor {
         return classname.equals(fdparam.getClassname()) &&
                key.equals(InterpreterUtil.makeUniqueKey(fdparam.getName(), fdparam.getDescriptor().descriptorString));
       }
+    }
     return false;
   }
-  }
 }

src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java

@@ -17,10 +17,10 @@ public class AnnotationExprent extends Exprent {
   public static final int ANNOTATION_SINGLE_ELEMENT = 3;
 
   private final String className;
-  private final List<? extends String> parNames;
+  private final List<String> parNames;
   private final List<? extends Exprent> parValues;
 
-  public AnnotationExprent(String className, List<? extends String> parNames, List<? extends Exprent> parValues) {
+  public AnnotationExprent(String className, List<String> parNames, List<? extends Exprent> parValues) {
     super(EXPRENT_ANNOTATION);
     this.className = className;
     this.parNames = parNames;

src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java

@@ -122,7 +122,6 @@ public class SwitchStatement extends Statement {
       for (int j = 0; j < edges.size(); j++) {
         if (edges.get(j) == default_edge) {
           buf.appendIndent(indent).append("default:").appendLineSeparator();
-          tracer.incrementCurrentSourceLine();
         }
         else {
           buf.appendIndent(indent).append("case ");
@@ -139,8 +138,8 @@ public class SwitchStatement extends Statement {
           }
 
           buf.append(":").appendLineSeparator();
-          tracer.incrementCurrentSourceLine();
         }
+        tracer.incrementCurrentSourceLine();
       }
 
       buf.append(ExprProcessor.jmpWrapper(stat, indent + 1, false, tracer));