From f4b0f0e661b8649c9429f5b9a91043614c143247 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 3 Oct 2014 17:43:09 +0400
Subject: [PATCH] Fixed tests for variable/function extraction

---
 .../AbstractJetExtractionTest.kt              | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
index 22254c078e1..93025e4ca53 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
@@ -28,9 +28,6 @@ import com.intellij.psi.PsiComment
 import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException
 import org.jetbrains.jet.JetTestUtils
 import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
-import com.intellij.psi.util.PsiTreeUtil
-import com.intellij.psi.PsiWhiteSpace
-import org.jetbrains.jet.lang.psi.JetPackageDirective
 import org.jetbrains.jet.InTextDirectivesUtils
 import org.jetbrains.jet.renderer.DescriptorRenderer
 import kotlin.test.assertEquals
@@ -43,6 +40,10 @@ import org.jetbrains.jet.testing.ConfigLibraryUtil
 import org.jetbrains.jet.plugin.PluginTestCaseBase
 import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionData
 import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionOptions
+import org.jetbrains.jet.lang.psi.JetDeclaration
+import com.intellij.psi.util.PsiTreeUtil
+import com.intellij.psi.PsiWhiteSpace
+import org.jetbrains.jet.lang.psi.JetPackageDirective
 import org.jetbrains.jet.utils.emptyOrSingletonList
 
 public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTestCase() {
@@ -68,12 +69,18 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe
                     object: JetTreeVisitorVoid() {
                         override fun visitComment(comment: PsiComment) {
                             if (comment.getText() == "// SIBLING:") {
-                                explicitPreviousSibling = PsiTreeUtil.skipSiblingsForward(
-                                        comment,
-                                        javaClass<PsiWhiteSpace>(),
-                                        javaClass<PsiComment>(),
-                                        javaClass<JetPackageDirective>()
-                                )
+                                val parent = comment.getParent()
+                                if (parent is JetDeclaration) {
+                                    explicitPreviousSibling = parent
+                                }
+                                else {
+                                    explicitPreviousSibling = PsiTreeUtil.skipSiblingsForward(
+                                            comment,
+                                            javaClass<PsiWhiteSpace>(),
+                                            javaClass<PsiComment>(),
+                                            javaClass<JetPackageDirective>()
+                                    )
+                                }
                             }
                         }
                     }