Fixed EA-61504.

idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java

@@ -52,10 +52,9 @@ public class RemoveValVarFromParameterFix extends JetIntentionAction<JetParamete
         ASTNode valOrVarNode = element.getValOrVarNode();
         if (valOrVarNode == null) return;
 
-        ASTNode whitespace = valOrVarNode.getTreeNext();
-        assert whitespace.getElementType() == TokenType.WHITE_SPACE;
-
-        element.getNode().removeRange(valOrVarNode, whitespace.getTreeNext());
+        ASTNode next = valOrVarNode.getTreeNext();
+        ASTNode firstNodeToKeep = next.getElementType() == TokenType.WHITE_SPACE ? next.getTreeNext() : next;
+        element.getNode().removeRange(valOrVarNode, firstNodeToKeep);
     }
 
 

idea/testData/quickfix/variables/removeValVarFromParameter/afterParameterWithComment.kt

@@ -0,0 +1,3 @@
+// "Remove 'val' from parameter" "true"
+fun f(<caret>/* comment */ x: String) {
+}

idea/testData/quickfix/variables/removeValVarFromParameter/beforeParameterWithComment.kt

@@ -0,0 +1,3 @@
+// "Remove 'val' from parameter" "true"
+fun f(<caret>val/* comment */ x: String) {
+}

idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java

@@ -3909,6 +3909,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 doTest(fileName);
             }
             
+            @TestMetadata("beforeParameterWithComment.kt")
+            public void testParameterWithComment() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/beforeParameterWithComment.kt");
+                doTest(fileName);
+            }
+            
         }
         
     }