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

IDEA-184560 Java decompiler doesn't use stored parameter names - fixed param idx

Browse Source
This commit is contained in:
Egor Ushakov
2018-01-10 16:44:01 +03:00
parent 8b9687ed20
commit 6715ecf53d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/jetbrains/java/decompiler/main/ClassWriter.java
View File

@@ -716,8 +716,8 @@ public class ClassWriter {
appendParameterAnnotations(buffer, mt, paramCount); appendParameterAnnotations(buffer, mt, paramCount);
if (methodParameters != null && paramCount < methodParameters.size()) { if (methodParameters != null && i < methodParameters.size()) {
appendModifiers(buffer, methodParameters.get(paramCount).myAccessFlags, CodeConstants.ACC_FINAL, isInterface, 0); appendModifiers(buffer, methodParameters.get(i).myAccessFlags, CodeConstants.ACC_FINAL, isInterface, 0);
} }
else if (methodWrapper.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarTypeProcessor.VAR_EXPLICIT_FINAL) { else if (methodWrapper.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
buffer.append("final "); buffer.append("final ");
@@ -755,8 +755,8 @@ public class ClassWriter {
buffer.append(' '); buffer.append(' ');
String parameterName; String parameterName;
if (methodParameters != null && paramCount < methodParameters.size()) { if (methodParameters != null && i < methodParameters.size()) {
parameterName = methodParameters.get(paramCount).myName; parameterName = methodParameters.get(i).myName;
} }
else { else {
parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0)); parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));

4
testData/results/TestMethodParametersAttr.dec
View File

@@ -12,7 +12,7 @@ public class TestMethodParametersAttr {
void local() { void local() {
class Local { class Local {
Local(final int this$0) { Local(int p31) {
}// 36 }// 36
void m(int p32) { void m(int p32) {
@@ -51,7 +51,7 @@ public class TestMethodParametersAttr {
} }
class C1 { class C1 {
C1(final int this$0) { C1(int p11) {
}// 24 }// 24
void m(int p12) { void m(int p12) {