Provide line number map for all decompilers

src/main/java/com/heliosdecompiler/transformerapi/common/AbstractResultSaver.java

@@ -35,10 +35,6 @@ protected AbstractResultSaver(DecompilationResult result) {
         this.result = result;
     }
 
-    protected AbstractResultSaver() {
-        this(new DecompilationResult());
-    }
-
     public Map<String, String> getResults() {
         return this.results;
     }
@@ -60,10 +56,17 @@ public void copyFile(String source, String path, String entryName) {
     public void saveClassFile(String qualifiedName, String content, int[] mapping) {
         if (mapping != null) {
             lineNumbers = true;
+            int maxLineNumber = 0;
             for (int i = 0; i < mapping.length; i += 2) {
                 int line = mapping[i + 1];
                 int actualLine = mapping[i];
                 result.putLineNumber(line, actualLine);
+                if (actualLine > maxLineNumber) {
+                    maxLineNumber = actualLine;
+                }
+            }
+            if (maxLineNumber > 0) {
+                result.setMaxLineNumber(maxLineNumber);
             }
         }
         results.put(qualifiedName, content);

src/main/java/com/heliosdecompiler/transformerapi/common/BytecodeSourceLinker.java

@@ -94,7 +94,7 @@ private BytecodeSourceLinker() {
      * Populate declarations and references after a decompiler has produced source text.
      */
     public static void link(DecompilationResult result, String source, String rootInternalName, Map<String, byte[]> importantData) {
-        if (source == null || source.isEmpty() || importantData.isEmpty()) {
+        if (StringUtils.isEmpty(source) || importantData.isEmpty()) {
             return;
         }
         BytecodeIndex index = BytecodeIndex.of(rootInternalName, importantData);

src/main/java/com/heliosdecompiler/transformerapi/decompilers/Decompiler.java

@@ -42,6 +42,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
@@ -212,5 +213,34 @@ protected AbstractDecompiler(String name) {
         public String getName() {
             return name;
         }
+
+        protected static void putLineNumbers(DecompilationResult result, Map<Integer, Integer> lineNumbers) {
+            Objects.requireNonNull(lineNumbers, "lineNumbers");
+            int maxLineNumber = 0;
+            for (Map.Entry<Integer, Integer> entry : lineNumbers.entrySet()) {
+                Integer lineNumber = entry.getKey();
+                Integer sourceLineNumber = entry.getValue();
+                if (lineNumber == null || sourceLineNumber == null) {
+                    continue;
+                }
+                result.putLineNumber(lineNumber, sourceLineNumber);
+                if (sourceLineNumber > maxLineNumber) {
+                    maxLineNumber = sourceLineNumber;
+                }
+            }
+            if (maxLineNumber > 0) {
+                result.setMaxLineNumber(maxLineNumber);
+            }
+        }
+
+        protected static void putIdentityLineNumbers(DecompilationResult result, String source) {
+            if (StringUtils.isNotBlank(source)) {
+                int lineCount = source.split("\\R", -1).length;
+                result.setMaxLineNumber(lineCount);
+                for (int i = 1; i <= lineCount; i++) {
+                    result.putLineNumber(i, i);
+                }
+            }
+        }
     }
 }

src/main/java/com/heliosdecompiler/transformerapi/decompilers/cfr/CFRDecompiler.java

@@ -61,6 +61,11 @@ public DecompilationResult decompile(Loader loader, String internalName, CFRSett
         }
         DecompilationResult decompilationResult = new DecompilationResult();
         decompilationResult.setDecompiledOutput(resultCode);
+        if (!lineMapping.isEmpty()) {
+            putLineNumbers(decompilationResult, lineMapping);
+        } else {
+            putIdentityLineNumbers(decompilationResult, resultCode);
+        }
         // CFR emits text only, so link metadata is reconstructed from the source after decompilation.
         BytecodeSourceLinker.link(decompilationResult, resultCode, classStruct.fullClassName(), classStruct.importantData());
         time = stopWatch.getTime();

src/main/java/com/heliosdecompiler/transformerapi/decompilers/fernflower/FernflowerDecompiler.java

@@ -50,7 +50,7 @@ public DecompilationResult decompile(Loader loader, String internalName, Fernflo
         ClassStruct classStruct = readClassAndInnerClasses(loader, internalName);
         if (!classStruct.importantData().isEmpty()) {
             IBytecodeProvider provider = new FernflowerBytecodeProvider(classStruct.importantData());
-            FernflowerResultSaver saver = new FernflowerResultSaver();
+            FernflowerResultSaver saver = new FernflowerResultSaver(decompilationResult);
             Fernflower baseDecompiler = new Fernflower(provider, saver, settings.getSettings(), new PrintStreamLogger(System.out));
             StructContext context;
             try {
@@ -67,6 +67,9 @@ public DecompilationResult decompile(Loader loader, String internalName, Fernflo
             String key = classStruct.fullClassName();
             String source = saver.getResults().get(key);
             decompilationResult.setDecompiledOutput(source);
+            if (!saver.hasLineRemapping()) {
+                putIdentityLineNumbers(decompilationResult, source);
+            }
             // Fernflower does not expose token callbacks, so links are synthesized from source and bytecode.
             BytecodeSourceLinker.link(decompilationResult, source, key, classStruct.importantData());
         }

src/main/java/com/heliosdecompiler/transformerapi/decompilers/fernflower/FernflowerResultSaver.java

@@ -22,6 +22,10 @@
 
 public class FernflowerResultSaver extends AbstractResultSaver implements IResultSaver {
 
+    public FernflowerResultSaver(jd.core.DecompilationResult result) {
+        super(result);
+    }
+
     @Override
     public void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping) {
         saveClassFile(qualifiedName, content, mapping);

src/main/java/com/heliosdecompiler/transformerapi/decompilers/jadx/JADXDecompiler.java

@@ -79,7 +79,12 @@ public DecompilationResult decompile(Loader loader, String internalName, JadxArg
                         addLinks(decompilationResult, jadx, codeInfo);
                         // Supplement JADX's native annotations with bytecode-driven links for missed constructor cases.
                         BytecodeSourceLinker.link(decompilationResult, codeInfo.getCodeStr(), internalName, importantData);
-                        codeInfo.getCodeMetadata().getLineMapping().forEach(decompilationResult::putLineNumber);
+                        Map<Integer, Integer> lineMapping = codeInfo.getCodeMetadata().getLineMapping();
+                        if (lineMapping != null && !lineMapping.isEmpty()) {
+                            putLineNumbers(decompilationResult, lineMapping);
+                        } else {
+                            putIdentityLineNumbers(decompilationResult, codeInfo.getCodeStr());
+                        }
                         break;
                     }
                 }

src/main/java/com/heliosdecompiler/transformerapi/decompilers/procyon/ProcyonDecompiler.java

@@ -31,6 +31,8 @@
 import com.strobel.decompiler.languages.LineNumberPosition;
 import com.strobel.decompiler.languages.TypeDecompilationResults;
 
+import jadx.core.utils.Utils;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.lang.reflect.InvocationTargetException;
@@ -68,9 +70,25 @@ private static BytecodeOutputOptions createBytecodeFormattingOptions(final Comma
     public DecompilationResult decompile(Loader loader, String internalName, CommandLineOptions options) throws IOException {
         StopWatch stopWatch = StopWatch.createStarted();
         Map<String, byte[]> importantClasses = new HashMap<>();
+        DecompilerSettings settings = createSettings(options, importantClasses, loader);
+        StringWriter stringwriter = new StringWriter();
+        DecompilationResult result = new DecompilationResult();
+        Map<String, ReferenceData> referencesCache = new HashMap<>();
 
-        final DecompilerSettings settings = new DecompilerSettings();
+        PlainTextOutput plainTextOutput = new ProcyonLinkProvider(stringwriter, stringwriter, result, internalName, referencesCache);
+        TypeDecompilationResults typeDecompilationResults = com.strobel.decompiler.Decompiler.decompile(internalName, plainTextOutput, settings);
+        List<LineNumberPosition> lineNumberPositions = typeDecompilationResults.getLineNumberPositions();
+        putLineNumberPositions(result, lineNumberPositions);
+        result.setDecompiledOutput(formatOutput(options, stringwriter.toString(), lineNumberPositions));
+        if (Utils.isEmpty(lineNumberPositions)) {
+            putIdentityLineNumbers(result, result.getDecompiledOutput());
+        }
+        time = stopWatch.getTime();
+        return result;
+    }
 
+    private static DecompilerSettings createSettings(CommandLineOptions options, Map<String, byte[]> importantClasses, Loader loader) {
+        DecompilerSettings settings = new DecompilerSettings();
         settings.setFlattenSwitchBlocks(options.getFlattenSwitchBlocks());
         settings.setForceExplicitImports(!options.getCollapseImports());
         settings.setForceExplicitTypeArguments(options.getForceExplicitTypeArguments());
@@ -89,44 +107,63 @@ public DecompilationResult decompile(Loader loader, String internalName, Command
         settings.setForcedCompilerTarget(options.getCompilerTargetOverride());
         settings.setTextBlockLineMinimum(options.getTextBlockLineMinimum());
         settings.setTypeLoader(new ProcyonFastTypeLoader(importantClasses, loader));
+        configureOutputMode(settings, options);
+        return settings;
+    }
 
+    private static void configureOutputMode(DecompilerSettings settings, CommandLineOptions options) {
         if (!options.getSuppressBanner()) {
             settings.setOutputFileHeaderText("\nDecompiled by Procyon v" + Procyon.version() + "\n");
         }
-
         if (options.isRawBytecode()) {
             settings.setLanguage(Languages.bytecode());
             settings.setBytecodeOutputOptions(createBytecodeFormattingOptions(options));
-        } else if (options.isBytecodeAst()) {
+            return;
+        }
+        if (options.isBytecodeAst()) {
             settings.setLanguage(options.isUnoptimized() ? Languages.bytecodeAstUnoptimized() : Languages.bytecodeAst());
         }
+    }
 
-        StringWriter stringwriter = new StringWriter();
-        DecompilationResult result = new DecompilationResult();
-        Map<String, ReferenceData> referencesCache = new HashMap<>();
-
-        PlainTextOutput plainTextOutput = new ProcyonLinkProvider(stringwriter, stringwriter, result, internalName, referencesCache);
-        TypeDecompilationResults typeDecompilationResults = com.strobel.decompiler.Decompiler.decompile(internalName, plainTextOutput, settings);
-        if (options.getIncludeLineNumbers() || options.getStretchLines()) {
-            List<LineNumberPosition> lineNumberPositions = typeDecompilationResults.getLineNumberPositions();
-            EnumSet<LineNumberOption> lineNumberOptions = EnumSet.noneOf(LineNumberOption.class);
-
-            if (options.getIncludeLineNumbers()) {
-                lineNumberOptions.add(LineNumberOption.LEADING_COMMENTS);
+    private static void putLineNumberPositions(DecompilationResult result, List<LineNumberPosition> lineNumberPositions) {
+        if (Utils.isEmpty(lineNumberPositions)) {
+            return;
+        }
+        int maxLineNumber = 0;
+        for (LineNumberPosition lineNumberPosition : lineNumberPositions) {
+            int emittedLine = lineNumberPosition.getEmittedLine();
+            int originalLine = lineNumberPosition.getOriginalLine();
+            result.putLineNumber(emittedLine, originalLine);
+            if (originalLine > maxLineNumber) {
+                maxLineNumber = originalLine;
             }
+        }
+        if (maxLineNumber > 0) {
+            result.setMaxLineNumber(maxLineNumber);
+        }
+    }
 
-            if (options.getStretchLines()) {
-                lineNumberOptions.add(LineNumberOption.STRETCHED);
-            }
+    private static String formatOutput(CommandLineOptions options, String source, List<LineNumberPosition> lineNumberPositions) throws IOException {
+        if (!shouldFormatWithLineNumbers(options)) {
+            return source;
+        }
+        InMemoryLineNumberFormatter lineFormatter = new InMemoryLineNumberFormatter(source, lineNumberPositions, createLineNumberOptions(options));
+        return lineFormatter.reformatFile();
+    }
+
+    private static boolean shouldFormatWithLineNumbers(CommandLineOptions options) {
+        return options.getIncludeLineNumbers() || options.getStretchLines();
+    }
 
-            InMemoryLineNumberFormatter lineFormatter = new InMemoryLineNumberFormatter(stringwriter.toString(), lineNumberPositions, lineNumberOptions);
-            String sourceWithLineNumbers = lineFormatter.reformatFile();
-            result.setDecompiledOutput(sourceWithLineNumbers);
-        } else {
-            result.setDecompiledOutput(stringwriter.toString());
+    private static EnumSet<LineNumberOption> createLineNumberOptions(CommandLineOptions options) {
+        EnumSet<LineNumberOption> lineNumberOptions = EnumSet.noneOf(LineNumberOption.class);
+        if (options.getIncludeLineNumbers()) {
+            lineNumberOptions.add(LineNumberOption.LEADING_COMMENTS);
         }
-        time = stopWatch.getTime();
-        return result;
+        if (options.getStretchLines()) {
+            lineNumberOptions.add(LineNumberOption.STRETCHED);
+        }
+        return lineNumberOptions;
     }
 
 

src/main/java/com/heliosdecompiler/transformerapi/decompilers/vineflower/VineflowerDecompiler.java

@@ -63,11 +63,7 @@ public DecompilationResult decompile(Loader loader, String internalName, Vineflo
             String decompiledOutput = saver.getResults().get(key);
             decompilationResult.setDecompiledOutput(decompiledOutput);
             if (!saver.hasLineRemapping()) {
-                int lineCount = decompiledOutput.split("\n").length;
-                decompilationResult.setMaxLineNumber(lineCount);
-                for (int i = 1; i <= lineCount; i++) {
-                    decompilationResult.putLineNumber(i, i);
-                }
+                putIdentityLineNumbers(decompilationResult, decompiledOutput);
             }
         }
         time = stopWatch.getTime();

src/main/java/com/heliosdecompiler/transformerapi/decompilers/vineflower/VineflowerSettings.java

@@ -16,11 +16,14 @@
 
 package com.heliosdecompiler.transformerapi.decompilers.vineflower;
 
-import org.vineflower.java.decompiler.main.extern.IFernflowerPreferences;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.vineflower.java.decompiler.main.extern.IFernflowerPreferences.BYTECODE_SOURCE_MAPPING;
+import static org.vineflower.java.decompiler.main.extern.IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES;
+import static org.vineflower.java.decompiler.main.extern.IFernflowerPreferences.DUMP_ORIGINAL_LINES;
+import static org.vineflower.java.decompiler.main.extern.IFernflowerPreferences.REMOVE_SYNTHETIC;
+
 /**
  * Represents settings which can be used to configure the particular decompiling session.
  * <p>
@@ -60,7 +63,11 @@ public Map<String, Object> getSettings() {
         return this.internalSettings;
     }
 
+    public static Map<String, String> defaults() {
+        return Map.of(REMOVE_SYNTHETIC, "1", DECOMPILE_GENERIC_SIGNATURES, "1");
+    }
+
     public static Map<String, String> lineNumbers() {
-        return Map.of(IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1", IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1");
+        return Map.of(REMOVE_SYNTHETIC, "1", DECOMPILE_GENERIC_SIGNATURES, "1", DUMP_ORIGINAL_LINES, "1", BYTECODE_SOURCE_MAPPING, "1");
     }
 }