Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Procyon line number realignment #111

Closed
wants to merge 1 commit into from
Closed

Fix Procyon line number realignment #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions ...ecompiler.procyon/src/org/sf/feeling/decompiler/procyon/decompiler/ProcyonDecompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,7 @@ public void decompile(String root, String packege, String className) {

final String classPathStr = new File(workingDir, className).getAbsolutePath();

boolean includeLineNumbers = false;
boolean stretchLines = false;
if (ClassUtil.isDebug()) {
includeLineNumbers = true;
stretchLines = true;
}
final boolean includeLineNumbers = ClassUtil.isDebug();

DecompilationOptions decompilationOptions = new DecompilationOptions();

Expand Down Expand Up @@ -110,16 +105,10 @@ public void decompile(String root, String packege, String className) {

List<LineNumberPosition> lineNumberPositions = results.getLineNumberPositions();

if (includeLineNumbers || stretchLines) {
if (includeLineNumbers) {
EnumSet<LineNumberOption> lineNumberOptions = EnumSet.noneOf(LineNumberOption.class);

if (includeLineNumbers) {
lineNumberOptions.add(LineNumberFormatter.LineNumberOption.LEADING_COMMENTS);
}

if (stretchLines) {
lineNumberOptions.add(LineNumberFormatter.LineNumberOption.STRETCHED);
}
lineNumberOptions.add(LineNumberFormatter.LineNumberOption.LEADING_COMMENTS);

LineNumberFormatter lineFormatter = new LineNumberFormatter(classFile, lineNumberPositions,
lineNumberOptions);
Expand Down