KT-34582 Exclude kotlin.coroutines.experimental package from completion and auto-import
- Exclusion happens only when `ReleaseCoroutines` feature is supported - Add `LANGUAGE_VERSION` to few tests to make sure that previous exclusions still work when `experimental` package is not excluded entirely - ^KT-34582 Fixed
This commit is contained in:
committed by
Roman Golyshev
parent
8399614de8
commit
42deb7db48
@@ -2,5 +2,7 @@ suspend fun foo() {
|
|||||||
corou<caret>
|
corou<caret>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// LANGUAGE_VERSION: 1.2
|
||||||
// EXIST: {"lookupString":"coroutineContext","tailText":" (kotlin.coroutines.experimental)","typeText":"CoroutineContext","attributes":"","allLookupStrings":"coroutineContext, getCoroutineContext","itemText":"coroutineContext"}
|
// EXIST: {"lookupString":"coroutineContext","tailText":" (kotlin.coroutines.experimental)","typeText":"CoroutineContext","attributes":"","allLookupStrings":"coroutineContext, getCoroutineContext","itemText":"coroutineContext"}
|
||||||
|
// ABSENT: {"lookupString":"coroutineContext","tailText":" (kotlin.coroutines)","typeText":"CoroutineContext","attributes":"","allLookupStrings":"coroutineContext, getCoroutineContext","itemText":"coroutineContext"}
|
||||||
// ABSENT: {"lookupString":"coroutineContext","tailText":" (kotlin.coroutines.experimental.intrinsics)","typeText":"CoroutineContext","attributes":"","allLookupStrings":"coroutineContext, getCoroutineContext","itemText":"coroutineContext"}
|
// ABSENT: {"lookupString":"coroutineContext","tailText":" (kotlin.coroutines.experimental.intrinsics)","typeText":"CoroutineContext","attributes":"","allLookupStrings":"coroutineContext, getCoroutineContext","itemText":"coroutineContext"}
|
||||||
|
|||||||
+7
@@ -0,0 +1,7 @@
|
|||||||
|
suspend fun foo() {
|
||||||
|
corou<caret>
|
||||||
|
}
|
||||||
|
|
||||||
|
// ABSENT: {"lookupString":"coroutineContext","tailText":" (kotlin.coroutines.experimental)","typeText":"CoroutineContext","attributes":"","allLookupStrings":"coroutineContext, getCoroutineContext","itemText":"coroutineContext"}
|
||||||
|
// EXIST: {"lookupString":"coroutineContext","tailText":" (kotlin.coroutines)","typeText":"CoroutineContext","attributes":"","allLookupStrings":"coroutineContext, getCoroutineContext","itemText":"coroutineContext"}
|
||||||
|
// ABSENT: {"lookupString":"coroutineContext","tailText":" (kotlin.coroutines.experimental.intrinsics)","typeText":"CoroutineContext","attributes":"","allLookupStrings":"coroutineContext, getCoroutineContext","itemText":"coroutineContext"}
|
||||||
+5
@@ -90,6 +90,11 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
|
|||||||
runTest("idea/idea-completion/testData/basic/common/CoroutineContext.kt");
|
runTest("idea/idea-completion/testData/basic/common/CoroutineContext.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("CoroutineContextReleaseCoroutines.kt")
|
||||||
|
public void testCoroutineContextReleaseCoroutines() throws Exception {
|
||||||
|
runTest("idea/idea-completion/testData/basic/common/CoroutineContextReleaseCoroutines.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("DataClassMembers.kt")
|
@TestMetadata("DataClassMembers.kt")
|
||||||
public void testDataClassMembers() throws Exception {
|
public void testDataClassMembers() throws Exception {
|
||||||
runTest("idea/idea-completion/testData/basic/common/DataClassMembers.kt");
|
runTest("idea/idea-completion/testData/basic/common/DataClassMembers.kt");
|
||||||
|
|||||||
+5
@@ -90,6 +90,11 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
|
|||||||
runTest("idea/idea-completion/testData/basic/common/CoroutineContext.kt");
|
runTest("idea/idea-completion/testData/basic/common/CoroutineContext.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("CoroutineContextReleaseCoroutines.kt")
|
||||||
|
public void testCoroutineContextReleaseCoroutines() throws Exception {
|
||||||
|
runTest("idea/idea-completion/testData/basic/common/CoroutineContextReleaseCoroutines.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("DataClassMembers.kt")
|
@TestMetadata("DataClassMembers.kt")
|
||||||
public void testDataClassMembers() throws Exception {
|
public void testDataClassMembers() throws Exception {
|
||||||
runTest("idea/idea-completion/testData/basic/common/DataClassMembers.kt");
|
runTest("idea/idea-completion/testData/basic/common/DataClassMembers.kt");
|
||||||
|
|||||||
@@ -7,8 +7,10 @@ package org.jetbrains.kotlin.idea.core
|
|||||||
|
|
||||||
import com.intellij.codeInsight.JavaProjectCodeInsightSettings
|
import com.intellij.codeInsight.JavaProjectCodeInsightSettings
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
|
import org.jetbrains.kotlin.config.LanguageFeature
|
||||||
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
||||||
import org.jetbrains.kotlin.idea.imports.importableFqName
|
import org.jetbrains.kotlin.idea.imports.importableFqName
|
||||||
|
import org.jetbrains.kotlin.idea.project.languageVersionSettings
|
||||||
import org.jetbrains.kotlin.psi.KtFile
|
import org.jetbrains.kotlin.psi.KtFile
|
||||||
|
|
||||||
|
|
||||||
@@ -25,8 +27,19 @@ private val exclusions =
|
|||||||
private fun shouldBeHiddenAsInternalImplementationDetail(fqName: String, locationFqName: String) =
|
private fun shouldBeHiddenAsInternalImplementationDetail(fqName: String, locationFqName: String) =
|
||||||
exclusions.any { fqName.startsWith(it) } && (locationFqName.isBlank() || !fqName.startsWith(locationFqName))
|
exclusions.any { fqName.startsWith(it) } && (locationFqName.isBlank() || !fqName.startsWith(locationFqName))
|
||||||
|
|
||||||
|
/**
|
||||||
|
* We do not want to show nothing from "kotlin.coroutines.experimental" when release coroutines are available,
|
||||||
|
* since in 1.3 this package is obsolete.
|
||||||
|
*
|
||||||
|
* However, we still want to show this package when release coroutines are not available.
|
||||||
|
*/
|
||||||
|
private fun usesOutdatedCoroutinesPackage(fqName: String, inFile: KtFile): Boolean =
|
||||||
|
fqName.startsWith("kotlin.coroutines.experimental.") &&
|
||||||
|
inFile.languageVersionSettings.supportsFeature(LanguageFeature.ReleaseCoroutines)
|
||||||
|
|
||||||
fun DeclarationDescriptor.isExcludedFromAutoImport(project: Project, inFile: KtFile?): Boolean {
|
fun DeclarationDescriptor.isExcludedFromAutoImport(project: Project, inFile: KtFile?): Boolean {
|
||||||
val fqName = importableFqName?.asString() ?: return false
|
val fqName = importableFqName?.asString() ?: return false
|
||||||
return JavaProjectCodeInsightSettings.getSettings(project).isExcluded(fqName) ||
|
return JavaProjectCodeInsightSettings.getSettings(project).isExcluded(fqName) ||
|
||||||
|
(inFile != null && usesOutdatedCoroutinesPackage(fqName, inFile)) ||
|
||||||
shouldBeHiddenAsInternalImplementationDetail(fqName, inFile?.packageFqName?.asString() ?: "")
|
shouldBeHiddenAsInternalImplementationDetail(fqName, inFile?.packageFqName?.asString() ?: "")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
// "Import" "false"
|
// "Import" "false"
|
||||||
// WITH_RUNTIME
|
// WITH_RUNTIME
|
||||||
|
// LANGUAGE_VERSION: 1.2
|
||||||
// ACTION: Create local variable 'CoroutineImpl'
|
// ACTION: Create local variable 'CoroutineImpl'
|
||||||
// ACTION: Create object 'CoroutineImpl'
|
// ACTION: Create object 'CoroutineImpl'
|
||||||
// ACTION: Create parameter 'CoroutineImpl'
|
// ACTION: Create parameter 'CoroutineImpl'
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
// "Import" "false"
|
// "Import" "false"
|
||||||
// WITH_RUNTIME
|
// WITH_RUNTIME
|
||||||
|
// LANGUAGE_VERSION: 1.2
|
||||||
// ACTION: Create function 'suspendCoroutineOrReturn'
|
// ACTION: Create function 'suspendCoroutineOrReturn'
|
||||||
// ACTION: Rename reference
|
// ACTION: Rename reference
|
||||||
// ERROR: Unresolved reference: suspendCoroutineOrReturn
|
// ERROR: Unresolved reference: suspendCoroutineOrReturn
|
||||||
|
|||||||
Reference in New Issue
Block a user