Fix line filtering: cannot remove line, if it was previously used

instrumentation/src/com/intellij/rt/coverage/instrumentation/filters/compose/ComposeSkipGroupLineFilter.java

@@ -72,7 +72,8 @@ private void tryRemoveLine() {
   @Override
   public void visitLineNumber(int line, Label start) {
     tryRemoveLine();
-    myState = -1;
+    // do not remove lines that are previously used
+    myState = myContext.getLineData(line) == null ? -1 : 0;
     myCurrentLine = line;
     super.visitLineNumber(line, start);
   }

instrumentation/src/com/intellij/rt/coverage/instrumentation/filters/compose/ComposeTraceEventStartLineFilter.java

@@ -61,7 +61,8 @@ private void tryRemoveLine() {
   @Override
   public void visitLineNumber(int line, Label start) {
     tryRemoveLine();
-    myState = -1;
+    // do not remove lines that are previously used
+    myState = myContext.getLineData(line) == null ? -1 : 0;
     myCurrentLine = line;
     super.visitLineNumber(line, start);
   }

instrumentation/src/com/intellij/rt/coverage/instrumentation/filters/lines/KotlinTryFinallyLineFilter.java

@@ -84,9 +84,13 @@ public void visitInsn(int opcode) {
   @Override
   public void visitLineNumber(int line, Label start) {
     tryRemoveLine();
+    boolean lineExists = myContext.getLineData(line) != null;
     super.visitLineNumber(line, start);
     myCurrentLine = line;
-    if (myState == State.USER_CODE) {
+    if (lineExists) {
+      // do not remove lines that are previously used
+      myState = State.USER_CODE;
+    } else if (myState == State.USER_CODE) {
       myState = State.INITIAL;
     } else if (myState == State.TRY_START_USER) {
       myState = State.TRY_START;

instrumentation/src/com/intellij/rt/coverage/instrumentation/filters/lines/TryFinallyLineFilter.java

@@ -114,9 +114,10 @@ public void visitInsn(int opcode) {
   @Override
   public void visitLineNumber(int line, Label start) {
     tryRemoveLine();
+    // do not remove lines that are previously used
+    myState = myContext.getLineData(line) == null ? State.INITIAL : State.USER_CODE;
     super.visitLineNumber(line, start);
     myCurrentLine = line;
-    myState = State.INITIAL;
   }
 
   @Override

instrumentation/src/com/intellij/rt/coverage/instrumentation/filters/lines/TryWithResourcesJava8LineFilter.java

@@ -52,12 +52,13 @@ private void tryRemoveLine() {
   public void visitLineNumber(int line, Label start) {
     myCandidates.put(myCurrentLine, myHasInstructions ? -1 : myState);
     tryRemoveLine();
+    // do not remove lines that are previously used
+    myHasInstructions = myContext.getLineData(line) != null;
     super.visitLineNumber(line, start);
     myCurrentLine = line;
 
     int previousState = myCandidates.get(myCurrentLine);
     myState = previousState == 0 ? 1 : previousState;
-    myHasInstructions = false;
   }
 
   @Override

instrumentation/src/com/intellij/rt/coverage/instrumentation/filters/lines/TryWithResourcesLineFilter.java

@@ -87,10 +87,11 @@ private void tryRemoveLine() {
   @Override
   public void visitLineNumber(int line, Label start) {
     tryRemoveLine();
+    // do not remove lines that are previously used
+    myHasInstructions = myContext.getLineData(line) != null;
     super.visitLineNumber(line, start);
     myCurrentLine = line;
     myState = State.INITIAL;
-    myHasInstructions = false;
     myJumpsToRemove = 0;
   }
 

test-kotlin/test-sources11/src/testData/basicJava/tryWithResources/java/Test.java

@@ -32,8 +32,8 @@ public static void main(String[] args) throws IOException {
 
   private static void test1() {
     var y = new AutoCloseableImpl(); // coverage: FULL
-    try (y) {
-      System.out.println("action"); // coverage: FULL
+    try (y) {                        // coverage: FULL
+      System.out.println("action");  // coverage: FULL
     }
     System.out.println(); // coverage: FULL
   }

test-kotlin/test-sources11/src/testData/compose/inline/test.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2000-2024 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.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package testData.compose.inline
+
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.runDesktopComposeUiTest
+
+@Composable
+inline fun Greeting(name: String) {
+    Text(                     // coverage: FULL
+        text = "Hello $name!" // coverage: FULL
+    )
+}
+
+@OptIn(ExperimentalTestApi::class)
+fun main() {
+    runDesktopComposeUiTest { // coverage: FULL
+        setContent {          // coverage: FULL
+            Greeting("xx")    // coverage: FULL
+        }
+    }
+}

test-kotlin/test-sources11/test/com/intellij/rt/coverage/Jdk11CoverageRunTest.kt

@@ -44,6 +44,9 @@ internal class Jdk11CoverageRunTest(override val coverage: Coverage, override va
     @Test
     fun testComposeDefaultArgs() = test("compose.defaultArgs")
 
+    @Test
+    fun testComposeInline() = test("compose.inline")
+
     @Test
     fun testComposeSynthetic() = test("compose.synthetic")