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

IDEA-138578 Debugger spuriously jumps to decompiled method signature

Browse Source
This commit is contained in:
Egor.Ushakov
2015-04-14 12:31:28 +03:00
parent 262d580ccc
commit 44ba5816f2
9 changed files with 146 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/org/jetbrains/java/decompiler/main/TextBuffer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -150,9 +150,12 @@ public class TextBuffer {
while ((lineEnd = myStringBuilder.indexOf(myLineSeparator, lineStart)) > 0) {
++count;
sb.append(myStringBuilder.substring(lineStart, lineEnd));
Integer integer = myLineMapping.get(count);
if (integer != null) {
sb.append("// ").append(integer);
Set<Integer> integers = myLineMapping.get(count);
if (integers != null) {
sb.append("//");
for (Integer integer : integers) {
sb.append(' ').append(integer);
}
}
sb.append(myLineSeparator);
lineStart = lineEnd + length;
@@ -302,17 +305,18 @@ public class TextBuffer {
return myStringBuilder;
}
private Map<Integer, Integer> myLineMapping = null; // new to original
private Map<Integer, Set<Integer>> myLineMapping = null; // new to original
public void dumpOriginalLineNumbers(int[] lineMapping) {
if (lineMapping.length > 0) {
myLineMapping = new HashMap<Integer, Integer>();
myLineMapping = new HashMap<Integer, Set<Integer>>();
for (int i = 0; i < lineMapping.length; i+=2) {
int key = lineMapping[i + 1];
int value = lineMapping[i];
Integer existing = myLineMapping.get(key);
if (existing == null || value < existing) {
myLineMapping.put(key, value);
Set<Integer> existing = myLineMapping.get(key);
if (existing == null) {
existing = new TreeSet<Integer>();
myLineMapping.put(key, existing);
}
existing.add(lineMapping[i]);
}
}
}