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

Compiler&plugin deprecations cleanup: *array -> *arrayOf, copyToArray -> toTypedArray.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-06-25 17:35:40 +03:00
parent 00a44f6d4f
commit 2c31a1a345
50 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt
+1 -1
View File
@@ -37,7 +37,7 @@ public object AndroidConst {
val ID_DECLARATION_PREFIX = "@+id/"
val ID_USAGE_PREFIX = "@id/"
val XML_ID_PREFIXES = array(ID_DECLARATION_PREFIX, ID_USAGE_PREFIX)
val XML_ID_PREFIXES = arrayOf(ID_DECLARATION_PREFIX, ID_USAGE_PREFIX)
val CLEAR_FUNCTION_NAME = "clearFindViewByIdCache"
plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt
+1 -1
View File
@@ -43,7 +43,7 @@ public abstract class AndroidResourceManager(val project: Project) {
fun VirtualFile.getAllChildren(): List<VirtualFile> {
val allChildren = arrayListOf<VirtualFile>()
val currentChildren = getChildren() ?: array()
val currentChildren = getChildren() ?: emptyArray()
for (child in currentChildren) {
if (child.isDirectory()) {
allChildren.addAll(child.getAllChildren())
plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidFindMemberUsagesHandler.kt
+2 -2
View File
@@ -60,7 +60,7 @@ class AndroidFindMemberUsagesHandler(
val psiElements = parser?.resourceManager?.propertyToXmlAttributes(property)
val valueElements = psiElements?.map { (it as? XmlAttribute)?.getValueElement() as? PsiElement }?.filterNotNull()
if (valueElements != null && valueElements.isNotEmpty()) return valueElements.copyToArray()
if (valueElements != null && valueElements.isNotEmpty()) return valueElements.toTypedArray()
return super.getPrimaryElements()
}
@@ -89,7 +89,7 @@ class AndroidFindMemberUsagesHandler(
}
}
if (res.isNotEmpty()) return res.copyToArray()
if (res.isNotEmpty()) return res.toTypedArray()
return super.getSecondaryElements()
}
plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt
+1 -1
View File
@@ -43,7 +43,7 @@ public class AndroidGotoDeclarationHandler : GotoDeclarationHandler {
val parser = ModuleServiceManager.getService(moduleInfo.module, javaClass<AndroidUIXmlProcessor>())
val psiElements = parser.resourceManager.propertyToXmlAttributes(property)
val valueElements = psiElements.map { (it as? XmlAttribute)?.getValueElement() as? PsiElement }.filterNotNull()
if (valueElements.isNotEmpty()) return valueElements.copyToArray()
if (valueElements.isNotEmpty()) return valueElements.toTypedArray()
}
return null
}