azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed tests for variable/function extraction

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-03 17:43:09 +04:00
parent 377df47e29
commit f4b0f0e661
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
+16 -9
View File
@@ -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>()
)
}
}
}
}