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

KT-4914 Smart completion should work after 'as' and 'as?'

Browse Source 
#KT-4914 Fixed
This commit is contained in:
Valentin Kipyatkov
2014-07-23 18:34:52 +02:00
parent 32dbed602a
commit 7546a17539
22 changed files with 278 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java
+15
View File
@@ -32,6 +32,21 @@ import org.jetbrains.jet.completion.AbstractJvmSmartCompletionTest;
@SuppressWarnings("all")
@TestMetadata("idea/testData/completion/smart")
public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionTest {
@TestMetadata("AfterAs.kt")
public void testAfterAs() throws Exception {
doTest("idea/testData/completion/smart/AfterAs.kt");
}
@TestMetadata("AfterAs2.kt")
public void testAfterAs2() throws Exception {
doTest("idea/testData/completion/smart/AfterAs2.kt");
}
@TestMetadata("AfterAs3.kt")
public void testAfterAs3() throws Exception {
doTest("idea/testData/completion/smart/AfterAs3.kt");
}
@TestMetadata("AfterExclSign.kt")
public void testAfterExclSign() throws Exception {
doTest("idea/testData/completion/smart/AfterExclSign.kt");
idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTestBase.kt
+18 -24
View File
@@ -18,8 +18,6 @@ package org.jetbrains.jet.completion.handlers
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
import com.intellij.codeInsight.completion.CompletionType
import com.intellij.psi.codeStyle.CodeStyleSettingsManager
import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings
import com.intellij.codeInsight.lookup.LookupElement
import java.io.File
import org.jetbrains.jet.plugin.PluginTestCaseBase
@@ -31,8 +29,6 @@ import com.intellij.codeInsight.lookup.LookupElementPresentation
import org.junit.Assert
import com.intellij.openapi.application.Result
import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
import kotlin.properties.Delegates
import com.intellij.openapi.util.io.FileUtil
public abstract class CompletionHandlerTestBase() : JetLightCodeInsightFixtureTestCase() {
protected abstract val completionType : CompletionType
@@ -41,28 +37,27 @@ public abstract class CompletionHandlerTestBase() : JetLightCodeInsightFixtureTe
protected val fixture: JavaCodeInsightTestFixture
get() = myFixture
protected fun doTest() : Unit = doTest(2, null, null, null, '\n')
protected fun doTest() : Unit = doTest(2, "*", null, null, '\n')
protected fun doTest(time : Int, lookupString : String?, tailText : String?, completionChar : Char) {
protected fun doTest(time: Int, lookupString: String?, tailText: String?, completionChar: Char) {
doTest(time, lookupString, null, tailText, completionChar)
}
protected fun doTest(time : Int, lookupString : String?, itemText: String?, tailText : String?, completionChar : Char) {
protected fun doTest(time: Int, lookupString: String?, itemText: String?, tailText: String?, completionChar: Char) {
fixture.configureByFile(fileName())
doTestWithTextLoaded(time, lookupString, itemText, tailText, completionChar)
}
protected fun doTestWithTextLoaded(time : Int, lookupString : String?, itemText: String?, tailText : String?, completionChar : Char) {
protected fun doTestWithTextLoaded(time: Int, lookupString: String?, itemText: String?, tailText: String?, completionChar: Char) {
fixture.complete(completionType, time)
if (lookupString != null || itemText != null || tailText != null) {
fixture.complete(completionType, time)
val item = getExistentLookupElement(lookupString, itemText, tailText)
if (item != null) {
selectItem(item, completionChar)
}
}
else {
forceCompleteFirst(completionType, time)
}
checkResult()
}
@@ -70,13 +65,20 @@ public abstract class CompletionHandlerTestBase() : JetLightCodeInsightFixtureTe
fixture.checkResultByFile(afterFileName())
}
private fun getExistentLookupElement(lookupString : String?, itemText: String?, tailText : String?) : LookupElement? {
private fun getExistentLookupElement(lookupString: String?, itemText: String?, tailText: String?): LookupElement? {
val lookup = LookupManager.getInstance(getProject())?.getActiveLookup() as LookupImpl?
if (lookup == null) return null
val items = lookup.getItems()
if (lookupString == "*") {
assert(itemText == null)
assert(tailText == null)
return items.firstOrNull()
}
var foundElement : LookupElement? = null
val presentation = LookupElementPresentation()
for (lookupElement in lookup.getItems()) {
for (lookupElement in items) {
val lookupOk = if (lookupString != null) lookupElement.getLookupString().contains(lookupString) else true
if (lookupOk) {
@@ -116,21 +118,13 @@ public abstract class CompletionHandlerTestBase() : JetLightCodeInsightFixtureTe
protected fun afterFileName(): String = getTestName(false) + ".kt.after"
private fun forceCompleteFirst(`type` : CompletionType, time : Int) {
fixture.complete(`type`, time)
val items : Array<LookupElement>? = fixture.getLookupElements()
if (items != null && items.isNotEmpty()) {
selectItem(items[0])
}
}
protected override fun getTestDataPath() : String = File(PluginTestCaseBase.getTestDataPathBase(), testDataRelativePath).getPath() + File.separator
protected fun selectItem(item : LookupElement?) {
protected fun selectItem(item: LookupElement?) {
selectItem(item, 0.toChar())
}
protected fun selectItem(item : LookupElement?, completionChar : Char) {
protected fun selectItem(item: LookupElement?, completionChar: Char) {
val lookup = (fixture.getLookup() as LookupImpl)
lookup.setCurrentItem(item)
if (LookupEvent.isSpecialCompletionChar(completionChar)) {
idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java
+30
View File
@@ -32,6 +32,26 @@ import org.jetbrains.jet.completion.handlers.AbstractSmartCompletionHandlerTest;
@SuppressWarnings("all")
@TestMetadata("idea/testData/completion/handlers/smart")
public class SmartCompletionHandlerTestGenerated extends AbstractSmartCompletionHandlerTest {
@TestMetadata("AfterAs.kt")
public void testAfterAs() throws Exception {
doTest("idea/testData/completion/handlers/smart/AfterAs.kt");
}
@TestMetadata("AfterAs2.kt")
public void testAfterAs2() throws Exception {
doTest("idea/testData/completion/handlers/smart/AfterAs2.kt");
}
@TestMetadata("AfterAs3.kt")
public void testAfterAs3() throws Exception {
doTest("idea/testData/completion/handlers/smart/AfterAs3.kt");
}
@TestMetadata("AfterSafeAs.kt")
public void testAfterSafeAs() throws Exception {
doTest("idea/testData/completion/handlers/smart/AfterSafeAs.kt");
}
public void testAllFilesPresentInSmart() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/handlers/smart"), Pattern.compile("^(.+)\\.kt$"), true);
}
@@ -56,6 +76,16 @@ public class SmartCompletionHandlerTestGenerated extends AbstractSmartCompletion
doTest("idea/testData/completion/handlers/smart/AnonymousObjectInsertsImport.kt");
}
@TestMetadata("AutoCompleteAfterAs1.kt")
public void testAutoCompleteAfterAs1() throws Exception {
doTest("idea/testData/completion/handlers/smart/AutoCompleteAfterAs1.kt");
}
@TestMetadata("AutoCompleteAfterAs2.kt")
public void testAutoCompleteAfterAs2() throws Exception {
doTest("idea/testData/completion/handlers/smart/AutoCompleteAfterAs2.kt");
}
@TestMetadata("ClassObjectMethod1.kt")
public void testClassObjectMethod1() throws Exception {
doTest("idea/testData/completion/handlers/smart/ClassObjectMethod1.kt");