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

Fixes to be compatible with IDEA 191

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-12-27 14:27:53 +03:00
parent cfb446df9e
commit 5d2002c742
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt
+1 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.findUsages package org.jetbrains.kotlin.findUsages
import com.intellij.codeInsight.JavaTargetElementEvaluator
import com.intellij.codeInsight.TargetElementUtil import com.intellij.codeInsight.TargetElementUtil
import com.intellij.find.FindManager import com.intellij.find.FindManager
import com.intellij.find.findUsages.FindUsagesHandler import com.intellij.find.findUsages.FindUsagesHandler
@@ -122,7 +121,7 @@ abstract class AbstractFindUsagesTest : KotlinLightCodeInsightFixtureTestCase()
val caretElement = when { val caretElement = when {
InTextDirectivesUtils.isDirectiveDefined(mainFileText, "// FIND_BY_REF") -> TargetElementUtil.findTargetElement( InTextDirectivesUtils.isDirectiveDefined(mainFileText, "// FIND_BY_REF") -> TargetElementUtil.findTargetElement(
myFixture.editor, myFixture.editor,
TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED or JavaTargetElementEvaluator.NEW_AS_CONSTRUCTOR TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED or TargetElementUtil.getInstance().referenceSearchFlags
)!! )!!
isFindFileUsages -> myFixture.file isFindFileUsages -> myFixture.file
idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerTest.kt
+1 -1
View File
@@ -134,7 +134,7 @@ abstract class AbstractSlicerTest : KotlinLightCodeInsightFixtureTestCase() {
extraFiles.forEach { myFixture.configureByFile(it.name) } extraFiles.forEach { myFixture.configureByFile(it.name) }
val file = myFixture.configureByFile(mainFile.name) as KtFile 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 sliceProvider = KotlinSliceProvider()
val expression = sliceProvider.getExpressionAtCaret(elementAtCaret, analysisParams.dataFlowToThis)!! val expression = sliceProvider.getExpressionAtCaret(elementAtCaret, analysisParams.dataFlowToThis)!!
val rootUsage = sliceProvider.createRootUsage(expression, analysisParams) val rootUsage = sliceProvider.createRootUsage(expression, analysisParams)