Fix line mapping toString

Author: zuevmaxim

instrumentation/src/com/intellij/rt/coverage/instrumentation/BranchesEnumerator.java

@@ -83,10 +83,9 @@ public void visitJumpInsn(final int opcode, final Label label) {
     if (opcode != Opcodes.GOTO && opcode != Opcodes.JSR && !InstrumentationUtils.CLASS_INIT.equals(myMethodName)) {
       final LineData lineData = myInstrumenter.getLineData(myCurrentLine);
       if (lineData != null) {
-        int currentJump = lineData.jumpsCount();
         Label trueLabel = new Label();
         Label falseLabel = new Label();
-        myBranchData.addJump(lineData, currentJump, trueLabel, falseLabel);
+        myBranchData.addJump(lineData, trueLabel, falseLabel);
         onNewJump(label, trueLabel, falseLabel);
 
         jumpInstrumented = true;
@@ -117,7 +116,7 @@ private SwitchLabels replaceLabels(SwitchLabels original, LineData lineData, int
     super.visitJumpInsn(Opcodes.GOTO, beforeSwitchLabel);
 
     final SwitchLabels replacement = new SwitchLabels(newDefaultLabel, newLabels);
-    myBranchData.addSwitch(lineData, lineData.switchesCount(), newDefaultLabel, keys, newLabels);
+    myBranchData.addSwitch(lineData, keys, newDefaultLabel, newLabels);
     onNewSwitch(original, replacement);
 
     for (int i = 0; i < newLabels.length; i++) {

instrumentation/src/com/intellij/rt/coverage/instrumentation/data/BranchDataContainer.java

@@ -79,7 +79,8 @@ public void addLine(LineData lineData) {
     }
   }
 
-  public void addJump(LineData lineData, int index, Label trueLabel, Label falseLabel) {
+  public void addJump(LineData lineData, Label trueLabel, Label falseLabel) {
+    int index = lineData.jumpsCount();
     int line = lineData.getLineNumber();
     // jump type is inverted as jump occurs if value is true
     Jump trueJump = new Jump(incrementId(), index, line, false);
@@ -96,7 +97,8 @@ public void addJump(LineData lineData, int index, Label trueLabel, Label falseLa
     jumpData.setId(falseJump.getId(), falseJump.getType());
   }
 
-  public void addSwitch(LineData lineData, int index, Label dflt, int[] keys, Label[] labels) {
+  public void addSwitch(LineData lineData, int[] keys, Label dflt, Label[] labels) {
+    final int index = lineData.switchesCount();
     List<Switch> switches = rememberSwitchLabels(lineData.getLineNumber(), dflt, labels, index);
     SwitchData switchData = lineData.addSwitch(index, keys);
     setSwitchIds(switchData, switches);

util/src/com/intellij/rt/coverage/data/LineMapData.java

@@ -60,7 +60,7 @@ public int getMappingEnd(int index) {
   }
 
   public String toString() {
-    return "map [" + myMappedStart + "; " + myMappedStart + myCount * myIncrement + ") to [" + mySourceStart + "; " + mySourceStart + myCount + ")";
+    return "map [" + myMappedStart + "; " + (myMappedStart + myCount * myIncrement) + ") to [" + mySourceStart + "; " + (mySourceStart + myCount) + ")";
   }
 
   private void checkIndex(int index) {