KT-7344 Completion of second type argument in class instantiation does not work

#KT-7344 Fixed

idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt

@@ -46,7 +46,6 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 
 public class KotlinCompletionContributor : CompletionContributor() {
-
     private val AFTER_NUMBER_LITERAL = psiElement().afterLeafSkipping(psiElement().withText(""), psiElement().withElementType(elementType().oneOf(JetTokens.FLOAT_LITERAL, JetTokens.INTEGER_LITERAL)))
     private val AFTER_INTEGER_LITERAL_AND_DOT = psiElement().afterLeafSkipping(psiElement().withText("."), psiElement().withElementType(elementType().oneOf(JetTokens.INTEGER_LITERAL)))
 
@@ -286,6 +285,11 @@ public class KotlinCompletionContributor : CompletionContributor() {
 
     private fun specialInTypeArgsDummyIdentifier(tokenBefore: PsiElement?): String? {
         if (tokenBefore == null) return null
+
+        if (tokenBefore.getParentOfType<JetTypeArgumentList>(true) != null) { // already parsed inside type argument list
+            return CompletionUtilCore.DUMMY_IDENTIFIER_TRIMMED // do not insert '$' to not break type argument list parsing
+        }
+
         val pair = unclosedTypeArgListNameAndBalance(tokenBefore) ?: return null
         val (nameToken, balance) = pair
         assert(balance > 0)
@@ -308,7 +312,6 @@ public class KotlinCompletionContributor : CompletionContributor() {
     }
 
     private fun unclosedTypeArgListNameAndBalance(tokenBefore: PsiElement): Pair<PsiElement, Int>? {
-        if (tokenBefore.getParentOfType<JetTypeArgumentList>(true) != null) return null // already parsed inside type argument list
         val nameToken = findCallNameTokenIfInTypeArgs(tokenBefore) ?: return null
         val pair = unclosedTypeArgListNameAndBalance(nameToken)
         if (pair == null) {

idea/testData/completion/basic/common/typeArgsOrNot/SecondTypeArg2.kt

@@ -0,0 +1,8 @@
+import java.util.HashMap
+
+fun foo() {
+    val v = HashMap<String, <caret>>
+}
+
+// EXIST: String
+// EXIST: java

idea/testData/completion/basic/common/typeArgsOrNot/SecondTypeArg3.kt

@@ -0,0 +1,7 @@
+import java.util.HashMap
+
+fun foo() {
+    val v = HashMap<String, S<caret>
+}
+
+// EXIST: String

idea/testData/completion/basic/common/typeArgsOrNot/SecondTypeArg4.kt

@@ -0,0 +1,7 @@
+import java.util.HashMap
+
+fun foo() {
+    val v = HashMap<String, S<caret>>
+}
+
+// EXIST: String

idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java

@@ -1403,6 +1403,24 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/typeArgsOrNot/SecondTypeArg.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("SecondTypeArg2.kt")
+            public void testSecondTypeArg2() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/typeArgsOrNot/SecondTypeArg2.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("SecondTypeArg3.kt")
+            public void testSecondTypeArg3() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/typeArgsOrNot/SecondTypeArg3.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("SecondTypeArg4.kt")
+            public void testSecondTypeArg4() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/typeArgsOrNot/SecondTypeArg4.kt");
+                doTest(fileName);
+            }
         }
 
         @TestMetadata("idea/testData/completion/basic/common/visibility")

idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java

@@ -1403,6 +1403,24 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/typeArgsOrNot/SecondTypeArg.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("SecondTypeArg2.kt")
+            public void testSecondTypeArg2() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/typeArgsOrNot/SecondTypeArg2.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("SecondTypeArg3.kt")
+            public void testSecondTypeArg3() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/typeArgsOrNot/SecondTypeArg3.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("SecondTypeArg4.kt")
+            public void testSecondTypeArg4() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/typeArgsOrNot/SecondTypeArg4.kt");
+                doTest(fileName);
+            }
         }
 
         @TestMetadata("idea/testData/completion/basic/common/visibility")

idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.idea.conversion.copy;
 
 import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;