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

Revert completion settings back on Android completion test finish

Browse Source
This commit is contained in:
Yan Zhulanow
2014-12-19 14:41:56 +03:00
parent 755c16d6d2
commit 781c565ec9
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt
+16 -12
View File
@@ -37,23 +37,20 @@ import com.intellij.codeInsight.CodeInsightSettings
public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() { public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() {
private var kotlinInternalModeOriginalValue: Boolean = false private var kotlinInternalModeOriginalValue: Boolean = false
private var codeCompletionOldValue: Boolean = false
private var smartTypeCompletionOldValue: Boolean = false
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
setAutoCompleteSetting(false)
}
private fun setAutoCompleteSetting(value: Boolean): Boolean {
val settings = CodeInsightSettings.getInstance() val settings = CodeInsightSettings.getInstance()
val oldValue: Boolean codeCompletionOldValue = settings.AUTOCOMPLETE_ON_CODE_COMPLETION
if (completionType() == CompletionType.SMART) { smartTypeCompletionOldValue = settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION
oldValue = settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION
settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = value when (completionType()) {
CompletionType.SMART -> settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = false
CompletionType.BASIC -> settings.AUTOCOMPLETE_ON_CODE_COMPLETION = false
} }
else {
oldValue = settings.AUTOCOMPLETE_COMMON_PREFIX
settings.AUTOCOMPLETE_ON_CODE_COMPLETION = value
}
return oldValue
} }
private fun completionType() = CompletionType.BASIC private fun completionType() = CompletionType.BASIC
@@ -72,4 +69,11 @@ public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() {
return KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/completion/" + getTestName(true) + "/" return KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/completion/" + getTestName(true) + "/"
} }
override fun tearDown() {
val settings = CodeInsightSettings.getInstance()
settings.AUTOCOMPLETE_ON_CODE_COMPLETION = codeCompletionOldValue
settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = smartTypeCompletionOldValue
super<KotlinAndroidTestCase>.tearDown()
}
} }