From 5d2002c7421c414d1ddb0e0f456ec1a945c43459 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Thu, 27 Dec 2018 14:27:53 +0300 Subject: [PATCH] Fixes to be compatible with IDEA 191 --- .../org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt | 3 +-- .../org/jetbrains/kotlin/idea/slicer/AbstractSlicerTest.kt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt index c3b94d2176e..b2b2815dc65 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.findUsages -import com.intellij.codeInsight.JavaTargetElementEvaluator import com.intellij.codeInsight.TargetElementUtil import com.intellij.find.FindManager import com.intellij.find.findUsages.FindUsagesHandler @@ -122,7 +121,7 @@ abstract class AbstractFindUsagesTest : KotlinLightCodeInsightFixtureTestCase() val caretElement = when { InTextDirectivesUtils.isDirectiveDefined(mainFileText, "// FIND_BY_REF") -> TargetElementUtil.findTargetElement( myFixture.editor, - TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED or JavaTargetElementEvaluator.NEW_AS_CONSTRUCTOR + TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED or TargetElementUtil.getInstance().referenceSearchFlags )!! isFindFileUsages -> myFixture.file diff --git a/idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerTest.kt index 4e0e427f297..41ac0e6e409 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerTest.kt @@ -134,7 +134,7 @@ abstract class AbstractSlicerTest : KotlinLightCodeInsightFixtureTestCase() { extraFiles.forEach { myFixture.configureByFile(it.name) } val file = myFixture.configureByFile(mainFile.name) as KtFile - val elementAtCaret = file.findElementAt(editor.caretModel.offset) + val elementAtCaret = file.findElementAt(editor.caretModel.offset)!! val sliceProvider = KotlinSliceProvider() val expression = sliceProvider.getExpressionAtCaret(elementAtCaret, analysisParams.dataFlowToThis)!! val rootUsage = sliceProvider.createRootUsage(expression, analysisParams)