diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt index ae46a076ef4..d893928fe01 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.load.java.descriptors.SamAdapterDescriptor import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.diagnostics.DiagnosticSink -private val EXTERNAL_SOURCES_KINDS = array( +private val EXTERNAL_SOURCES_KINDS = arrayOf( JvmDeclarationOriginKind.DELEGATION_TO_TRAIT_IMPL, JvmDeclarationOriginKind.DELEGATION, JvmDeclarationOriginKind.BRIDGE) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt index 24907a54379..a18d2e1bebf 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt @@ -40,8 +40,8 @@ public object PluginCliParser { val classLoader = PluginURLClassLoader( arguments.pluginClasspaths ?.map { File(it).toURI().toURL() } - ?.copyToArray() - ?: array(), + ?.toTypedArray() + ?: arrayOf(), javaClass.getClassLoader() ) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt index 73add7426ef..ade9e49fdcc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt @@ -76,7 +76,7 @@ class QualifierReceiver ( val classObjectTypeScope = (classifier as? ClassDescriptor)?.classObjectType?.getMemberScope()?.let { FilteringScope(it) { it !is ClassDescriptor } } - val scopes = listOf(classObjectTypeScope, getNestedClassesAndPackageMembersScope()).filterNotNull().copyToArray() + val scopes = listOf(classObjectTypeScope, getNestedClassesAndPackageMembersScope()).filterNotNull().toTypedArray() return ChainedScope(descriptor, "Member scope for " + name + " as package or class or object", *scopes) } @@ -97,7 +97,7 @@ class QualifierReceiver ( } } - return ChainedScope(descriptor, "Static scope for " + name + " as package or class or object", *scopes.copyToArray()) + return ChainedScope(descriptor, "Static scope for " + name + " as package or class or object", *scopes.toTypedArray()) } override fun getType(): JetType = throw IllegalStateException("No type corresponds to QualifierReceiver '$this'") diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index 80af6e1d8e4..77f2c3c8c95 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -79,7 +79,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi compileFile(file, text, jdkKind) - val classLoader = URLClassLoader(array(tmpdir.toURI().toURL()), ForTestCompileRuntime.runtimeJarClassLoader()) + val classLoader = URLClassLoader(arrayOf(tmpdir.toURI().toURL()), ForTestCompileRuntime.runtimeJarClassLoader()) val actual = createReflectedPackageView(classLoader) diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt index 7bebb0a6663..9482d53b9da 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt @@ -40,7 +40,7 @@ public abstract class AbstractLocalClassProtoTest : TestCaseWithTmpdir() { val classNameSuffix = InTextDirectivesUtils.findStringWithPrefixes(source.readText(), "// CLASS_NAME_SUFFIX: ") ?: error("CLASS_NAME_SUFFIX directive not found in test data") - val classLoader = URLClassLoader(array(tmpdir.toURI().toURL()), ForTestCompileRuntime.runtimeJarClassLoader()) + val classLoader = URLClassLoader(arrayOf(tmpdir.toURI().toURL()), ForTestCompileRuntime.runtimeJarClassLoader()) val classFile = tmpdir.listFiles().singleOrNull { it.getPath().endsWith("$classNameSuffix.class") } ?: error("Local class with suffix `$classNameSuffix` is not found in: ${tmpdir.listFiles().toList()}") diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaClass.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaClass.kt index dfa68e49b79..b1580c2109b 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaClass.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaClass.kt @@ -72,7 +72,7 @@ public class ReflectJavaClass( private fun isEnumValuesOrValueOf(method: Method): Boolean { return when (method.getName()) { "values" -> method.getParameterTypes().isEmpty() - "valueOf" -> Arrays.equals(method.getParameterTypes(), array(javaClass())) + "valueOf" -> Arrays.equals(method.getParameterTypes(), arrayOf(javaClass())) else -> false } } diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableContainerImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableContainerImpl.kt index 754ef2d21c4..3c0ebd4b6e8 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableContainerImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableContainerImpl.kt @@ -70,7 +70,7 @@ abstract class KCallableContainerImpl { val classLoader = jClass.classLoader val parameterTypes = signature.getParameterTypeList().map { jvmType -> loadJvmType(jvmType, nameResolver, classLoader) - }.copyToArray() + }.toTypedArray() return try { if (declared) jClass.getDeclaredMethod(name, *parameterTypes) diff --git a/eval4j/test/org/jetbrains/eval4j/test/main.kt b/eval4j/test/org/jetbrains/eval4j/test/main.kt index b9e3da33d98..4cd1e7ab8b9 100644 --- a/eval4j/test/org/jetbrains/eval4j/test/main.kt +++ b/eval4j/test/org/jetbrains/eval4j/test/main.kt @@ -138,7 +138,7 @@ object REFLECTION_EVAL : Eval { } override fun newMultiDimensionalArray(arrayType: Type, dimensionSizes: List): Value { - return ObjectValue(ArrayHelper.newMultiArray(findClass(arrayType.getElementType()), *dimensionSizes.copyToArray()), arrayType) + return ObjectValue(ArrayHelper.newMultiArray(findClass(arrayType.getElementType()), *dimensionSizes.toTypedArray()), arrayType) } override fun getArrayLength(array: Value): Value { @@ -236,7 +236,7 @@ object REFLECTION_EVAL : Eval { assertTrue(methodDesc.isStatic) val method = findClass(methodDesc).findMethod(methodDesc) assertNotNull("Method not found: $methodDesc", method) - val args = mapArguments(arguments, methodDesc.parameterTypes).copyToArray() + val args = mapArguments(arguments, methodDesc.parameterTypes).toTypedArray() val result = mayThrow {method!!.invoke(null, *args)} return objectToValue(result, methodDesc.returnType) } @@ -279,7 +279,7 @@ object REFLECTION_EVAL : Eval { val _class = findClass((instance as NewObjectValue).asmType) val ctor = _class.findConstructor(methodDesc) assertNotNull("Constructor not found: $methodDesc", ctor) - val args = mapArguments(arguments, methodDesc.parameterTypes).copyToArray() + val args = mapArguments(arguments, methodDesc.parameterTypes).toTypedArray() val result = mayThrow {ctor!!.newInstance(*args)} instance.value = result return objectToValue(result, instance.asmType) @@ -292,7 +292,7 @@ object REFLECTION_EVAL : Eval { val obj = instance.obj().checkNull() val method = obj.javaClass.findMethod(methodDesc) assertNotNull("Method not found: $methodDesc", method) - val args = mapArguments(arguments, methodDesc.parameterTypes).copyToArray() + val args = mapArguments(arguments, methodDesc.parameterTypes).toTypedArray() val result = mayThrow {method!!.invoke(obj, *args)} return objectToValue(result, methodDesc.returnType) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt index 813df25e105..d960eac27e5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt @@ -68,7 +68,7 @@ public class JetShortNamesCache(private val project: com.intellij.openapi.projec // Quick check for classes from getAllClassNames() val classOrObjects = org.jetbrains.kotlin.idea.stubindex.JetClassShortNameIndex.getInstance().get(name, project, scope) if (classOrObjects.isEmpty()) { - return result.copyToArray() + return result.toTypedArray() } for (classOrObject in classOrObjects) { @@ -82,7 +82,7 @@ public class JetShortNamesCache(private val project: com.intellij.openapi.projec } } - return result.copyToArray() + return result.toTypedArray() } override fun getAllClassNames(dest: HashSet) { @@ -90,29 +90,29 @@ public class JetShortNamesCache(private val project: com.intellij.openapi.projec } override fun getMethodsByName(org.jetbrains.annotations.NonNls name: String, scope: com.intellij.psi.search.GlobalSearchScope): Array - = array() + = emptyArray() override fun getMethodsByNameIfNotMoreThan(org.jetbrains.annotations.NonNls name: String, scope: com.intellij.psi.search.GlobalSearchScope, maxCount: Int): Array - = array() + = emptyArray() override fun getFieldsByNameIfNotMoreThan(org.jetbrains.annotations.NonNls s: String, scope: com.intellij.psi.search.GlobalSearchScope, i: Int): Array - = array() + = emptyArray() override fun processMethodsWithName(org.jetbrains.annotations.NonNls name: String, scope: com.intellij.psi.search.GlobalSearchScope, processor: com.intellij.util.Processor): Boolean = com.intellij.util.containers.ContainerUtil.process(getMethodsByName(name, scope), processor) override fun getAllMethodNames(): Array - = JetFunctionShortNameIndex.getInstance().getAllKeys(project).copyToArray() + = JetFunctionShortNameIndex.getInstance().getAllKeys(project).toTypedArray() override fun getAllMethodNames(set: HashSet) { set.addAll(JetFunctionShortNameIndex.getInstance().getAllKeys(project)) } override fun getFieldsByName(org.jetbrains.annotations.NonNls name: String, scope: com.intellij.psi.search.GlobalSearchScope): Array - = array() + = emptyArray() override fun getAllFieldNames(): Array - = array() + = emptyArray() override fun getAllFieldNames(set: HashSet) { } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt index c25d7d1cffb..55270e442a8 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt @@ -194,11 +194,11 @@ private object NotUnderContentRootModuleInfo : IdeaModuleInfo() { } private data class LibraryWithoutSourceScope(project: Project, private val library: Library) : - LibraryScopeBase(project, library.getFiles(OrderRootType.CLASSES), array()) { + LibraryScopeBase(project, library.getFiles(OrderRootType.CLASSES), arrayOf()) { } //TODO: (module refactoring) android sdk has modified scope private data class SdkScope(project: Project, private val sdk: Sdk) : - LibraryScopeBase(project, sdk.getRootProvider().getFiles(OrderRootType.CLASSES), array()) + LibraryScopeBase(project, sdk.getRootProvider().getFiles(OrderRootType.CLASSES), arrayOf()) private fun IdeaModuleInfo.isLibraryClasses() = this is SdkInfo || this is LibraryInfo diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt index 5a00a8a2f0f..52373909fe1 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt @@ -179,7 +179,7 @@ private class PerFileAnalysisCache(val file: JetFile, val resolveSession: Resolv } private object KotlinResolveDataProvider { - private val topmostElementTypes = array?>( + private val topmostElementTypes = arrayOf?>( javaClass(), javaClass(), javaClass(), diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt index 978f52ce48d..4f1b91e0d70 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt @@ -238,13 +238,13 @@ public open class JetPsiChecker : Annotator, HighlightRangeExtension { } } - private fun getBeforeAnalysisVisitors(holder: AnnotationHolder) = array( + private fun getBeforeAnalysisVisitors(holder: AnnotationHolder) = arrayOf( SoftKeywordsHighlightingVisitor(holder), LabelsHighlightingVisitor(holder), KDocHighlightingVisitor(holder) ) - private fun getAfterAnalysisVisitor(holder: AnnotationHolder, bindingContext: BindingContext) = array( + private fun getAfterAnalysisVisitor(holder: AnnotationHolder, bindingContext: BindingContext) = arrayOf( PropertiesHighlightingVisitor(holder, bindingContext), FunctionsHighlightingVisitor(holder, bindingContext), VariablesHighlightingVisitor(holder, bindingContext), diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt index e2b0b0b8ad2..15961a47845 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt @@ -41,7 +41,7 @@ class KotlinSuppressableWarningProblemGroup( if (element == null) return SuppressIntentionAction.EMPTY_ARRAY - return createSuppressWarningActions(element, diagnosticFactory).copyToArray() + return createSuppressWarningActions(element, diagnosticFactory).toTypedArray() } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt index 3ce34c8af44..8050c113b41 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt @@ -42,7 +42,7 @@ public class JetForLoopInReference(element: JetForExpression) : JetMultiReferenc } companion object { - private val LOOP_RANGE_KEYS = array( + private val LOOP_RANGE_KEYS = arrayOf( BindingContext.LOOP_RANGE_ITERATOR_RESOLVED_CALL, BindingContext.LOOP_RANGE_NEXT_RESOLVED_CALL, BindingContext.LOOP_RANGE_HAS_NEXT_RESOLVED_CALL diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReferenceContributor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReferenceContributor.kt index 49c8b1e0d65..ba9e1b958c8 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReferenceContributor.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReferenceContributor.kt @@ -60,7 +60,7 @@ public class JetReferenceContributor() : PsiReferenceContributor() { registerReferenceProvider(PlatformPatterns.psiElement(elementClass), object: PsiReferenceProvider() { override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array { @suppress("UNCHECKED_CAST") - return array(factory(element as E)) + return arrayOf(factory(element as E)) } }) } diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt index fbbd28670b7..25e7e6f6c77 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt @@ -96,10 +96,10 @@ public class FindImplicitNothingAction : AnAction() { SwingUtilities.invokeLater { if (found.isNotEmpty()) { - val usages = found.map { UsageInfo2UsageAdapter(UsageInfo(it)) }.copyToArray() + val usages = found.map { UsageInfo2UsageAdapter(UsageInfo(it)) }.toTypedArray() val presentation = UsageViewPresentation() presentation.setTabName("Implicit Nothing's") - UsageViewManager.getInstance(project).showUsages(array(), usages, presentation) + UsageViewManager.getInstance(project).showUsages(arrayOf(), usages, presentation) } else { Messages.showInfoMessage(project, "Not found in ${files.size()} file(s)", "Not Found") diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 6aa87ce92b8..3780b3a5574 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -66,7 +66,7 @@ import java.util.ArrayList public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor() { private val LOG = Logger.getInstance(javaClass()) - private val IGNORE_REFERENCES_INSIDE: Array> = array( + private val IGNORE_REFERENCES_INSIDE: Array> = arrayOf( javaClass(), javaClass() ) @@ -112,7 +112,7 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor("kotlin_debugger"), Getter { public var DEBUG_RENDER_DELEGATED_PROPERTIES: Boolean = true public var DEBUG_DISABLE_KOTLIN_INTERNAL_CLASSES: Boolean = true diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt index eabb64c2f98..1b068957e3e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt @@ -25,7 +25,7 @@ private val KOTLIN_STDLIB_FILTER = "kotlin.*" public fun addKotlinStdlibDebugFilterIfNeeded() { if (!KotlinDebuggerSettings.getInstance().DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED) { val settings = DebuggerSettings.getInstance()!! - val newFilters = (settings.getSteppingFilters() + ClassFilter(KOTLIN_STDLIB_FILTER)).copyToArray() + val newFilters = (settings.getSteppingFilters() + ClassFilter(KOTLIN_STDLIB_FILTER)).toTypedArray() settings.setSteppingFilters(newFilters) diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt index cabf7ccef53..54dea8f5d87 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt @@ -44,7 +44,7 @@ class DelegatingFindMemberUsagesHandler( KotlinFindMemberUsagesHandler.getInstance(element, elementsToSearch, factory) is PsiMethod -> - JavaFindUsagesHandler(element, elementsToSearch.copyToArray(), factory.javaHandlerFactory) + JavaFindUsagesHandler(element, elementsToSearch.toTypedArray(), factory.javaHandlerFactory) else -> null } diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt index 60e8fe3d463..e417457cf5d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt @@ -27,11 +27,11 @@ public class KotlinTemplatesFactory : ProjectTemplatesFactory() { public val KOTLIN_GROUP_NAME: String = "Kotlin" } - override fun getGroups() = array(KOTLIN_GROUP_NAME) + override fun getGroups() = arrayOf(KOTLIN_GROUP_NAME) override fun getGroupIcon(group: String) = JetIcons.SMALL_LOGO override fun createTemplates(group: String, context: WizardContext?) = - array( + arrayOf( BuilderBasedTemplate(KotlinModuleBuilder(TargetPlatform.JVM, "Kotlin - JVM", "Kotlin module for JVM target")), BuilderBasedTemplate(KotlinModuleBuilder(TargetPlatform.JS, "Kotlin - JavaScript", "Kotlin module for JavaScript target")) ) diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideTreeStructure.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideTreeStructure.kt index 1f4a84ffbf7..7d58e360203 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideTreeStructure.kt +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideTreeStructure.kt @@ -41,6 +41,6 @@ class KotlinOverrideTreeStructure(project: Project, val element: PsiElement) : H return javaTreeStructures .stream() .map (::buildChildrenByTreeStructure) - .reduce { a, b -> ContainerUtil.union(a.toSet(), b.toSet()).copyToArray() } + .reduce { a, b -> ContainerUtil.union(a.toSet(), b.toSet()).toTypedArray() } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt index 58642de6301..5b53500984e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt @@ -106,7 +106,7 @@ public fun navigateToOverriddenMethod(e: MouseEvent?, method: PsiMethod) { var overridingJavaMethods = processor.getCollection().filter { it !is KotlinLightMethodForTraitFakeOverride } if (overridingJavaMethods.isEmpty()) return - val showMethodNames = !PsiUtil.allMethodsHaveSameSignature(overridingJavaMethods.copyToArray()) + val showMethodNames = !PsiUtil.allMethodsHaveSameSignature(overridingJavaMethods.toTypedArray()) val renderer = MethodCellRenderer(showMethodNames) overridingJavaMethods = overridingJavaMethods.sortBy(renderer.getComparator()) @@ -114,7 +114,7 @@ public fun navigateToOverriddenMethod(e: MouseEvent?, method: PsiMethod) { val methodsUpdater = OverridingMethodsUpdater(method, renderer) PsiElementListNavigator.openTargets( e, - overridingJavaMethods.copyToArray(), + overridingJavaMethods.toTypedArray(), methodsUpdater.getCaption(overridingJavaMethods.size()), "Overriding declarations of " + method.getName(), renderer, diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt index 9ae4c4a1353..04d5f2a1957 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt @@ -109,7 +109,7 @@ fun navigateToPropertyOverriddenDeclarations(e: MouseEvent?, property: JetProper .filterIsInstance() PsiElementListNavigator.openTargets(e, - navigatingOverrides.copyToArray(), + navigatingOverrides.toTypedArray(), JetBundle.message("navigation.title.overriding.property", property.getName()), JetBundle.message("navigation.findUsages.title.overriding.property", property.getName()), renderer) } diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt index 480b734e7e6..9972bb16b7e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt @@ -95,7 +95,7 @@ public class SuperDeclarationMarkerNavigationHandler : GutterIconNavigationHandl PsiElementListNavigator.openTargets( e, - superDeclarations.copyToArray(), + superDeclarations.toTypedArray(), JetBundle.message("navigation.title.super.declaration", elementName), JetBundle.message("navigation.findUsages.title.super.declaration", elementName), JetFunctionPsiElementCellRenderer()) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ReflectionNotFoundInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ReflectionNotFoundInspection.kt index f7429376b1a..53e9ec236b7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/ReflectionNotFoundInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ReflectionNotFoundInspection.kt @@ -86,7 +86,7 @@ public class ReflectionNotFoundInspection : AbstractKotlinInspection() { expression.getDoubleColonTokenReference(), JetBundle.message("reflection.not.found"), ProblemHighlightType.GENERIC_ERROR_OR_WARNING, - *(createQuickFix().singletonOrEmptyList().copyToArray()) + *(createQuickFix().singletonOrEmptyList().toTypedArray()) ) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt index 7b8e70f2251..8f6283189ab 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt @@ -114,7 +114,7 @@ public class UnusedSymbolInspection : AbstractKotlinInspection() { override fun applyFix(project: Project, descriptor: ProblemDescriptor?) { if (!FileModificationService.getInstance().prepareFileForWrite(declaration.getContainingFile())) return - SafeDeleteHandler.invoke(project, array(declaration), false) + SafeDeleteHandler.invoke(project, arrayOf(declaration), false) } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt index 8a429825388..8ec8a4bc1eb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt @@ -85,7 +85,7 @@ public abstract class CallableRefactoring( "refactor") val title = IdeBundle.message("title.warning")!! val icon = Messages.getQuestionIcon()!! - return Messages.showDialog(message, title, options.copyToArray(), 0, icon) + return Messages.showDialog(message, title, options.toTypedArray(), 0, icon) } protected fun checkModifiable(element: PsiElement): Boolean { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt index 6bc7a67b170..88ce79e09d2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt @@ -98,7 +98,7 @@ public class JetChangeInfo( public fun getNewParametersCount(): Int = newParameters.size() - override fun getNewParameters(): Array = newParameters.copyToArray() + override fun getNewParameters(): Array = newParameters.toTypedArray() fun getNonReceiverParametersCount(): Int = newParameters.size() - (if (receiverParameterInfo != null) 1 else 0) @@ -255,7 +255,7 @@ public class JetChangeInfo( } ParameterInfoImpl(javaOldIndex, info.getName(), type, info.defaultValueForCall?.getText() ?: "") - }.copyToArray() + }.toTypedArray() val returnType = if (isPrimaryMethodUpdated) currentPsiMethod.getReturnType() else PsiType.VOID diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetUsagesViewDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetUsagesViewDescriptor.kt index bb1d2968489..ec6986e77ad 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetUsagesViewDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetUsagesViewDescriptor.kt @@ -22,7 +22,7 @@ import com.intellij.usageView.UsageViewBundle import com.intellij.usageView.UsageViewDescriptor public class JetUsagesViewDescriptor(private val element: PsiElement, private val elementsHeader: String) : UsageViewDescriptor { - override fun getElements(): Array = array(element) + override fun getElements(): Array = arrayOf(element) override fun getProcessedElementsHeader(): String = elementsHeader diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt index 389328bcd9b..be2d9cd6f5c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt @@ -202,7 +202,7 @@ abstract class OutputValueBoxer(val outputValues: List) { } companion object { - private val selectors = array("first", "second", "third") + private val selectors = arrayOf("first", "second", "third") } override val returnType: JetType by Delegates.lazy { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt index 051ae041722..c5d2a50adb6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt @@ -77,14 +77,14 @@ public class KotlinIntroduceParameterDialog private constructor( editor, introduceParameterDescriptor, lambdaExtractionDescriptor, - lambdaExtractionDescriptor.suggestedNames.copyToArray(), + lambdaExtractionDescriptor.suggestedNames.toTypedArray(), listOf(lambdaExtractionDescriptor.returnType), helper ) private val typeNameSuggestions = typeSuggestions .map { IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(it) } - .copyToArray() + .toTypedArray() private val nameField = NameSuggestionsField(nameSuggestions, project, JetFileType.INSTANCE) private val typeField = NameSuggestionsField(typeNameSuggestions, project, JetFileType.INSTANCE) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt index e59f5de1a90..e99f55e0ceb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt @@ -311,7 +311,7 @@ public open class KotlinIntroduceParameterHandler( KotlinIntroduceParameterDialog(project, editor, introduceParameterDescriptor, - suggestedNames.copyToArray(), + suggestedNames.toTypedArray(), listOf(replacementType) + replacementType.supertypes(), helper).show() } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt index 53ad8302a78..0a8650f9adf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt @@ -94,7 +94,7 @@ public class KotlinInplacePropertyIntroducer( if (availableTargets.size() > 1) { addPanelControl( ControlWrapper { - val propertyKindComboBox = with(JComboBox(availableTargets.map { it.name.capitalize() }.copyToArray())) { + val propertyKindComboBox = with(JComboBox(availableTargets.map { it.name.capitalize() }.toTypedArray())) { addPopupMenuListener( object : PopupMenuListenerAdapter() { override fun popupMenuWillBecomeInvisible(e: PopupMenuEvent?) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt index 0862275d14e..356272f33d3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt @@ -120,15 +120,15 @@ public class RenameKotlinPropertyProcessor : RenamePsiElementProcessor() { } super.renameElement(element, PropertyCodegen.setterName(Name.identifier(newName!!)), - refKindUsages[UsageKind.SETTER_USAGE]?.copyToArray() ?: array(), + refKindUsages[UsageKind.SETTER_USAGE]?.toTypedArray() ?: arrayOf(), null) super.renameElement(element, PropertyCodegen.getterName(Name.identifier(newName)), - refKindUsages[UsageKind.GETTER_USAGE]?.copyToArray() ?: array(), + refKindUsages[UsageKind.GETTER_USAGE]?.toTypedArray() ?: arrayOf(), null) super.renameElement(element, newName, - refKindUsages[UsageKind.SIMPLE_PROPERTY_USAGE]?.copyToArray() ?: array(), + refKindUsages[UsageKind.SIMPLE_PROPERTY_USAGE]?.toTypedArray() ?: arrayOf(), null) listener?.elementRenamed(element) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt index a6809f045a4..f40ebf89350 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt @@ -277,7 +277,7 @@ public class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { } } - return result.copyToArray() + return result.toTypedArray() } override fun prepareForDeletion(element: PsiElement) { diff --git a/idea/src/org/jetbrains/kotlin/idea/util/attachment/attachmentUtils.kt b/idea/src/org/jetbrains/kotlin/idea/util/attachment/attachmentUtils.kt index a6a0e1d1f69..6d071fe8678 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/attachment/attachmentUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/attachment/attachmentUtils.kt @@ -23,9 +23,9 @@ import com.intellij.diagnostic.AttachmentFactory public fun attachmentByPsiFileAsArray(file: PsiFile?): Array { val attachment = attachmentByPsiFile(file) if (attachment == null) { - return array() + return arrayOf() } - return array(attachment) + return arrayOf(attachment) } public fun attachmentByPsiFile(file: PsiFile?): Attachment? { diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt index a14ac9e817c..9ec7d254000 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt @@ -249,7 +249,7 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe val extractionOptions = InTextDirectivesUtils.findListWithPrefixes(fileText, "// OPTIONS: ").let { if (it.isNotEmpty()) { @suppress("CAST_NEVER_SUCCEEDS") - val args = it.map { it.toBoolean() }.copyToArray() as Array + val args = it.map { it.toBoolean() }.toTypedArray() as Array javaClass().getConstructors().first { it.getParameterTypes().size() == args.size() }.newInstance(*args) as ExtractionOptions } else ExtractionOptions.DEFAULT } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt index 61cf5d67606..1b90f948e26 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt @@ -129,7 +129,7 @@ enum class MoveAction { val targetClassName = config.getString("targetClass") val visibility = config.getNullableString("visibility") - val options = MockMoveMembersOptions(targetClassName, array(member)) + val options = MockMoveMembersOptions(targetClassName, arrayOf(member)) if (visibility != null) { options.setMemberVisibility(visibility) } @@ -145,7 +145,7 @@ enum class MoveAction { MoveClassesOrPackagesProcessor( mainFile.getProject(), - array(classToMove), + arrayOf(classToMove), MultipleRootsMoveDestination(PackageWrapper(mainFile.getManager(), targetPackage)), /* searchInComments = */ false, /* searchInNonJavaFiles = */ true, @@ -162,7 +162,7 @@ enum class MoveAction { MoveClassesOrPackagesProcessor( project, - array(JavaPsiFacade.getInstance(project).findPackage(sourcePackage)!!), + arrayOf(JavaPsiFacade.getInstance(project).findPackage(sourcePackage)!!), MultipleRootsMoveDestination(PackageWrapper(mainFile.getManager(), targetPackage)), /* searchInComments = */ false, /* searchInNonJavaFiles = */ true, @@ -180,7 +180,7 @@ enum class MoveAction { MoveClassToInnerProcessor( project, - array(classToMove), + arrayOf(classToMove), JavaPsiFacade.getInstance(project).findClass(targetClass, project.allScope())!!, /* searchInComments = */ false, /* searchInNonJavaFiles = */ true, @@ -218,7 +218,7 @@ enum class MoveAction { ActionRunner.runInsideWriteAction { VfsUtil.createDirectoryIfMissing(rootDir, targetPackage.replace('.', '/')) } MoveFilesOrDirectoriesProcessor( project, - array(mainFile), + arrayOf(mainFile), JavaPsiFacade.getInstance(project).findPackage(targetPackage)!!.getDirectories()[0], /* searchInComments = */ false, /* searchInNonJavaFiles = */ true, @@ -231,7 +231,7 @@ enum class MoveAction { MoveHandler.doMove( project, - array(mainFile), + arrayOf(mainFile), PsiManager.getInstance(project).findFile(rootDir.findFileByRelativePath(targetFile)!!)!!, /* dataContext = */ null, /* callback = */ null diff --git a/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt b/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt index 91213878830..cd5e21e9cb8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt @@ -47,7 +47,7 @@ public abstract class AbstractKotlinFileStructureTest : JetLightCodeInsightFixtu popup.setup() - val printInfo = PrintInfo(array("text"), array("location")) + val printInfo = PrintInfo(arrayOf("text"), arrayOf("location")) val popupText = StructureViewUtil.print(popup.getTree(), false, printInfo, null) JetTestUtils.assertEqualsToFile(File("${FileUtil.getNameWithoutExtension(path)}.after"), popupText) } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ReferenceSearcher.kt b/j2k/src/org/jetbrains/kotlin/j2k/ReferenceSearcher.kt index 257f25026bd..95588e85ab2 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ReferenceSearcher.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ReferenceSearcher.kt @@ -73,7 +73,7 @@ public object IdeaReferenceSearcher: ReferenceSearcher { if (searchKotlin) { fileTypes.add(JetLanguage.INSTANCE.getAssociatedFileType()) } - val searchScope = GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.projectScope(element.getProject()), *fileTypes.copyToArray()) + val searchScope = GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.projectScope(element.getProject()), *fileTypes.toTypedArray()) return ReferencesSearch.search(element, searchScope).findAll() } } diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 46b432d6321..84a21e24908 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -248,7 +248,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val representativeTarget = chunk.representativeTarget() - fun concatenate(strings: Array?, cp: List) = arrayOf(*(strings ?: arrayOf()), *cp.toTypedArray()) + fun concatenate(strings: Array?, cp: List) = arrayOf(*(strings ?: emptyArray()), *cp.toTypedArray()) for (argumentProvider in ServiceLoader.load(javaClass())) { // appending to pluginOptions diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index bc116030047..05d889ce991 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -348,7 +348,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val jdk = addJdk("my jdk") val moduleDependencies = readModuleDependencies() if (moduleDependencies == null) { - addModule("module", array(getAbsolutePath("src")), null, null, jdk) + addModule("module", arrayOf(getAbsolutePath("src")), null, null, jdk) FileUtil.copyDir(testDataDir, File(workDir, "src"), { it.getName().endsWith(".kt") || it.getName().endsWith(".java") }) @@ -356,7 +356,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } else { val nameToModule = moduleDependencies.keySet() - .keysToMap { addModule(it, array(getAbsolutePath(it + "/src")), null, null, jdk)!! } + .keysToMap { addModule(it, arrayOf(getAbsolutePath(it + "/src")), null, null, jdk)!! } for ((moduleName, dependencies) in moduleDependencies) { val module = nameToModule[moduleName]!! diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt index 6d372d20709..83c99099017 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.resolve.diagnostics.SuppressDiagnosticsByAnnotations import org.jetbrains.kotlin.resolve.diagnostics.FUNCTION_NO_BODY_ERRORS import org.jetbrains.kotlin.resolve.diagnostics.PROPERTY_NOT_INITIALIZED_ERRORS -private val NATIVE_ANNOTATIONS = array(NATIVE.fqName, NATIVE_INVOKE.fqName, NATIVE_GETTER.fqName, NATIVE_SETTER.fqName) +private val NATIVE_ANNOTATIONS = arrayOf(NATIVE.fqName, NATIVE_INVOKE.fqName, NATIVE_GETTER.fqName, NATIVE_SETTER.fqName) public class SuppressUnusedParameterForJsNative : SuppressDiagnosticsByAnnotations(listOf(Errors.UNUSED_PARAMETER), *NATIVE_ANNOTATIONS) diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt index 4af074144e9..08ae8908efb 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt @@ -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" diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt index cbc858f3953..665ccd8c44d 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt @@ -43,7 +43,7 @@ public abstract class AndroidResourceManager(val project: Project) { fun VirtualFile.getAllChildren(): List { val allChildren = arrayListOf() - val currentChildren = getChildren() ?: array() + val currentChildren = getChildren() ?: emptyArray() for (child in currentChildren) { if (child.isDirectory()) { allChildren.addAll(child.getAllChildren()) diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidFindMemberUsagesHandler.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidFindMemberUsagesHandler.kt index bde83931079..a0ed2df9800 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidFindMemberUsagesHandler.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidFindMemberUsagesHandler.kt @@ -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() } diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt index 0eb3908d1af..c9a558af4fc 100644 --- a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt +++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidGotoDeclarationHandler.kt @@ -43,7 +43,7 @@ public class AndroidGotoDeclarationHandler : GotoDeclarationHandler { val parser = ModuleServiceManager.getService(moduleInfo.module, javaClass()) 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 }