decompiler: fixed line mapping for try-catch and nested classes

src/org/jetbrains/java/decompiler/main/ClassWriter.java

@@ -254,8 +254,11 @@ public class ClassWriter {
 
           if (hasContent) {
             buffer.appendLineSeparator();
+            startLine++;
           }
-          classToJava(inner, buffer, indent + 1, tracer);
+          BytecodeMappingTracer class_tracer = new BytecodeMappingTracer(startLine);
+          classToJava(inner, buffer, indent + 1, class_tracer);
+          startLine = buffer.countLines();
 
           hasContent = true;
         }
@@ -840,7 +843,7 @@ public class ClassWriter {
 
     // save total lines
     // TODO: optimize
-    tracer.setCurrentSourceLine(buffer.countLines(start_index_method));
+    //tracer.setCurrentSourceLine(buffer.countLines(start_index_method));
 
     return !hideMethod;
   }

src/org/jetbrains/java/decompiler/main/ClassesProcessor.java

@@ -280,6 +280,7 @@ public class ClassesProcessor {
       }
       //buffer.append(lineSeparator);
 
+      total_offset_lines = buffer.countLines();
       buffer.append(classBuffer);
 
       if (DecompilerContext.getOption(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING)) {

src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java

@@ -187,7 +187,6 @@ public class CatchStatement extends Statement {
       tracer.incrementCurrentSourceLine();
       buf.append(ExprProcessor.jmpWrapper(stats.get(i), indent + 1, true, tracer)).append(indstr)
         .append("}");
-      tracer.incrementCurrentSourceLine();
     }
     buf.append(new_line_separator);