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

Minor: fix deprecations in Kotlin Android Extensions code

Browse Source
This commit is contained in:
Yan Zhulanow
2015-06-23 18:38:40 +03:00
parent 700d495d7f
commit cf08390e04
13 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
+1
View File
@@ -34,6 +34,7 @@ public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() {
codeCompletionOldValue = settings.AUTOCOMPLETE_ON_CODE_COMPLETION
smartTypeCompletionOldValue = settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION
@suppress("NON_EXHAUSTIVE_WHEN")
when (completionType()) {
CompletionType.SMART -> settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = false
CompletionType.BASIC -> settings.AUTOCOMPLETE_ON_CODE_COMPLETION = false
plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidRenameTest.kt
+2 -2
View File
@@ -37,8 +37,8 @@ public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() {
val editor = f.getEditor()
val file = f.getFile()
val completionEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, file)
val element = TargetElementUtilBase.findTargetElement(completionEditor,
TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED or TargetElementUtilBase.ELEMENT_NAME_ACCEPTED)
val element = TargetElementUtilBase.findTargetElement(
completionEditor, TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED or TargetElementUtilBase.ELEMENT_NAME_ACCEPTED)
assert(element != null)
assertTrue(element is JetProperty)