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

Minor: reformat and clean-up KotlinFixtureCompletionBaseTestCase

Browse Source
This commit is contained in:
Dmitry Savvinov
2018-07-26 13:00:21 +03:00
parent 099fc0ad51
commit 2a57807c85
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinFixtureCompletionBaseTestCase.kt
+11 -6
View File
@@ -28,8 +28,8 @@ import java.io.File
abstract class KotlinFixtureCompletionBaseTestCase : KotlinLightCodeInsightFixtureTestCase() { abstract class KotlinFixtureCompletionBaseTestCase : KotlinLightCodeInsightFixtureTestCase() {
abstract fun getPlatform(): TargetPlatform abstract fun getPlatform(): TargetPlatform
protected open fun complete(completionType: CompletionType, invocationCount: Int): Array<LookupElement>? protected open fun complete(completionType: CompletionType, invocationCount: Int): Array<LookupElement>? =
= myFixture.complete(completionType, invocationCount) myFixture.complete(completionType, invocationCount)
protected abstract fun defaultCompletionType(): CompletionType protected abstract fun defaultCompletionType(): CompletionType
protected open fun defaultInvocationCount(): Int = 0 protected open fun defaultInvocationCount(): Int = 0
@@ -41,15 +41,20 @@ abstract class KotlinFixtureCompletionBaseTestCase : KotlinLightCodeInsightFixtu
val fileText = FileUtil.loadFile(File(testPath), true) val fileText = FileUtil.loadFile(File(testPath), true)
configureCompilerOptions(fileText, project, module) configureCompilerOptions(fileText, project, module)
assertTrue("\"<caret>\" is missing in file \"$testPath\"", fileText.contains("<caret>")); assertTrue("\"<caret>\" is missing in file \"$testPath\"", fileText.contains("<caret>"))
if (ExpectedCompletionUtils.shouldRunHighlightingBeforeCompletion(fileText)) { if (ExpectedCompletionUtils.shouldRunHighlightingBeforeCompletion(fileText)) {
myFixture.doHighlighting() myFixture.doHighlighting()
} }
testCompletion(fileText, getPlatform(), { completionType, count -> complete(completionType, count) }, defaultCompletionType(), defaultInvocationCount()) testCompletion(
} fileText,
finally { getPlatform(),
{ completionType, count -> complete(completionType, count) },
defaultCompletionType(),
defaultInvocationCount()
)
} finally {
tearDownFixture() tearDownFixture()
} }
} }