From b653598df250e7b463545352a2982057194c3929 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 10 Oct 2014 21:52:50 +0400
Subject: [PATCH] Fixed EA-61504.

---
 .../jet/plugin/quickfix/RemoveValVarFromParameterFix.java  | 7 +++----
 .../removeValVarFromParameter/afterParameterWithComment.kt | 3 +++
 .../beforeParameterWithComment.kt                          | 3 +++
 .../jet/plugin/quickfix/QuickFixTestGenerated.java         | 6 ++++++
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 idea/testData/quickfix/variables/removeValVarFromParameter/afterParameterWithComment.kt
 create mode 100644 idea/testData/quickfix/variables/removeValVarFromParameter/beforeParameterWithComment.kt

diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java
index d2d09a6799f..909be3510ee 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java
+++ b/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);
     }
 
 
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/afterParameterWithComment.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/afterParameterWithComment.kt
new file mode 100644
index 00000000000..862b0dc26c5
--- /dev/null
+++ b/idea/testData/quickfix/variables/removeValVarFromParameter/afterParameterWithComment.kt
@@ -0,0 +1,3 @@
+// "Remove 'val' from parameter" "true"
+fun f(<caret>/* comment */ x: String) {
+}
\ No newline at end of file
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/beforeParameterWithComment.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/beforeParameterWithComment.kt
new file mode 100644
index 00000000000..76f32d37c46
--- /dev/null
+++ b/idea/testData/quickfix/variables/removeValVarFromParameter/beforeParameterWithComment.kt
@@ -0,0 +1,3 @@
+// "Remove 'val' from parameter" "true"
+fun f(<caret>val/* comment */ x: String) {
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
index d12086b3ac9..d976a1237f8 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
+++ b/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);
+            }
+            
         }
         
     }