diff --git a/idea/testData/joinLines/removeTrailingComma/functionArguments.kt b/idea/testData/joinLines/removeTrailingComma/functionArguments.kt
new file mode 100644
index 00000000000..6e4d50c9916
--- /dev/null
+++ b/idea/testData/joinLines/removeTrailingComma/functionArguments.kt
@@ -0,0 +1,4 @@
+fun a() {
+    b(1, 3,<caret> 2424,
+    awdawd,)
+}
\ No newline at end of file
diff --git a/idea/testData/joinLines/removeTrailingComma/functionArguments.kt.after b/idea/testData/joinLines/removeTrailingComma/functionArguments.kt.after
new file mode 100644
index 00000000000..9473dccf097
--- /dev/null
+++ b/idea/testData/joinLines/removeTrailingComma/functionArguments.kt.after
@@ -0,0 +1,3 @@
+fun a() {
+    b(1, 3, 2424,<caret> awdawd,)
+}
\ No newline at end of file
diff --git a/idea/testData/joinLines/removeTrailingComma/indices.kt b/idea/testData/joinLines/removeTrailingComma/indices.kt
new file mode 100644
index 00000000000..bf1853276ec
--- /dev/null
+++ b/idea/testData/joinLines/removeTrailingComma/indices.kt
@@ -0,0 +1,4 @@
+fun a() {
+    <caret>g[1, 2, 3,/**/
+    ]
+}
\ No newline at end of file
diff --git a/idea/testData/joinLines/removeTrailingComma/indices.kt.after b/idea/testData/joinLines/removeTrailingComma/indices.kt.after
new file mode 100644
index 00000000000..bae67c95743
--- /dev/null
+++ b/idea/testData/joinLines/removeTrailingComma/indices.kt.after
@@ -0,0 +1,3 @@
+fun a() {
+    g[1, 2, 3,/**/<caret>]
+}
\ No newline at end of file
diff --git a/idea/testData/joinLines/removeTrailingComma/literal.kt b/idea/testData/joinLines/removeTrailingComma/literal.kt
new file mode 100644
index 00000000000..a5bbfd52f48
--- /dev/null
+++ b/idea/testData/joinLines/removeTrailingComma/literal.kt
@@ -0,0 +1,3 @@
+<caret>@Anno([1, 2, 3,
+      ])
+class A
diff --git a/idea/testData/joinLines/removeTrailingComma/literal.kt.after b/idea/testData/joinLines/removeTrailingComma/literal.kt.after
new file mode 100644
index 00000000000..d6967a8c1e2
--- /dev/null
+++ b/idea/testData/joinLines/removeTrailingComma/literal.kt.after
@@ -0,0 +1,2 @@
+@Anno([1, 2, 3,<caret> ])
+class A
diff --git a/idea/testData/joinLines/removeTrailingComma/typeArguments.kt b/idea/testData/joinLines/removeTrailingComma/typeArguments.kt
new file mode 100644
index 00000000000..4a6e96b1c78
--- /dev/null
+++ b/idea/testData/joinLines/removeTrailingComma/typeArguments.kt
@@ -0,0 +1,4 @@
+fun a() {
+    b<<caret>Int,
+    >()
+}
\ No newline at end of file
diff --git a/idea/testData/joinLines/removeTrailingComma/typeArguments.kt.after b/idea/testData/joinLines/removeTrailingComma/typeArguments.kt.after
new file mode 100644
index 00000000000..7fbbf9dd3bf
--- /dev/null
+++ b/idea/testData/joinLines/removeTrailingComma/typeArguments.kt.after
@@ -0,0 +1,3 @@
+fun a() {
+    b<Int,<caret> >()
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java
index cdb339aecca..131cdaf651a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java
@@ -415,6 +415,16 @@ public class JoinLinesTestGenerated extends AbstractJoinLinesTest {
             runTest("idea/testData/joinLines/removeTrailingComma/destructionDeclarationInLambda.kt");
         }
 
+        @TestMetadata("functionArguments.kt")
+        public void testFunctionArguments() throws Exception {
+            runTest("idea/testData/joinLines/removeTrailingComma/functionArguments.kt");
+        }
+
+        @TestMetadata("indices.kt")
+        public void testIndices() throws Exception {
+            runTest("idea/testData/joinLines/removeTrailingComma/indices.kt");
+        }
+
         @TestMetadata("inner.kt")
         public void testInner() throws Exception {
             runTest("idea/testData/joinLines/removeTrailingComma/inner.kt");
@@ -425,11 +435,21 @@ public class JoinLinesTestGenerated extends AbstractJoinLinesTest {
             runTest("idea/testData/joinLines/removeTrailingComma/lambda.kt");
         }
 
+        @TestMetadata("literal.kt")
+        public void testLiteral() throws Exception {
+            runTest("idea/testData/joinLines/removeTrailingComma/literal.kt");
+        }
+
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
             runTest("idea/testData/joinLines/removeTrailingComma/simple.kt");
         }
 
+        @TestMetadata("typeArguments.kt")
+        public void testTypeArguments() throws Exception {
+            runTest("idea/testData/joinLines/removeTrailingComma/typeArguments.kt");
+        }
+
         @TestMetadata("typeParameters.kt")
         public void testTypeParameters() throws Exception {
             runTest("idea/testData/joinLines/removeTrailingComma/typeParameters.kt");