ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lucwousin
2019-07-28 18:01:01 +02:00
parent fb16be575e 14255d2f89
commit 341bb8bb05
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

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

3
src/org/jetbrains/java/decompiler/main/AssertProcessor.java
View File

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

4
src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
View File

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

3
src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
View File

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