From 87799e9b6b4234cc09ed67e6cf88c638e0d58fea Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 24 Nov 2015 18:15:08 +0300 Subject: [PATCH] Fix "operator modifier required" errors in project --- .../kotlin/codegen/inline/ReifiedTypeInliner.kt | 2 +- .../kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt | 2 +- .../ValueArguments.kt | 2 +- .../src/org/jetbrains/kotlin/container/Dsl.kt | 2 +- .../src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt | 2 +- .../kotlin/resolve/scopes/WritableScopeStorage.kt | 2 +- .../jetbrains/kotlin/asJava/KtLightClassForFacade.kt | 2 +- .../tests/org/jetbrains/kotlin/tests/di/injection.kt | 2 +- .../org/jetbrains/kotlin/builtins/ReflectionTypes.kt | 2 +- .../org/jetbrains/kotlin/types/TypeSubstitution.kt | 2 +- .../src/org/jetbrains/kotlin/storage/storage.kt | 4 ++-- .../decompiler/stubBuilder/ClsStubBuilderContext.kt | 2 +- .../createFromUsage/callableBuilder/typeUtils.kt | 2 +- .../idea/util/psi/patternMatching/KotlinPsiRange.kt | 2 +- j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt | 2 +- j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt | 2 +- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 12 ++++++------ .../org/jetbrains/kotlin/js/inline/FunctionReader.kt | 4 ++-- 18 files changed, 25 insertions(+), 25 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt index 82d95ef292e..14e61f150d3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt @@ -220,7 +220,7 @@ public class ReifiedTypeParameterMappings() { mappingsByName[name] = ReifiedTypeParameterMapping(name, type = null, asmType = null, newName = newName, signature = null) } - fun get(name: String): ReifiedTypeParameterMapping? { + operator fun get(name: String): ReifiedTypeParameterMapping? { return mappingsByName[name] } } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt index ce60cbf4743..16baa569a94 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt @@ -51,7 +51,7 @@ public class JvmDependenciesIndex(_roots: List) { private class Cache { private val innerPackageCaches = HashMap() - fun get(name: String) = innerPackageCaches.getOrPut(name) { Cache() } + operator fun get(name: String) = innerPackageCaches.getOrPut(name) { Cache() } // indices of roots that are known to contain this package // if this list contains [1, 3, 5] then roots with indices 1, 3 and 5 are known to contain this package, 2 and 4 are known not to (no information about roots 6 or higher) diff --git a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/ValueArguments.kt b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/ValueArguments.kt index dbafa2cceec..22736bf4f00 100644 --- a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/ValueArguments.kt +++ b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/ValueArguments.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType data class PositionalAndNamedArguments(val positional: List, val named: List) { - fun get(position: Int, name: String): ValueArgument? = + operator fun get(position: Int, name: String): ValueArgument? = positional.getOrNull(position) ?: named.find { it.getArgumentName()!!.asName.asString() == name } } diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt b/compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt index c7c20819735..43c3c7b3fd0 100644 --- a/compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt +++ b/compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt @@ -40,6 +40,6 @@ public fun StorageComponentContainer.useInstance(instance: Any) { registerInstance(instance) } -public inline fun ComponentProvider.get(thisRef: Any?, desc: PropertyMetadata): T { +inline operator fun ComponentProvider.getValue(thisRef: Any?, desc: PropertyMetadata): T { return getService(javaClass()) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt index e0b5338003d..753ab17a8c3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt @@ -314,7 +314,7 @@ public fun PsiElement.getTextWithLocation(): String = "'${this.getText()}' at ${ // ----------------------------------------------------------------------------------------------------------------------------------------- -public fun SearchScope.contains(element: PsiElement): Boolean = PsiSearchScopeUtil.isInScope(this, element) +operator fun SearchScope.contains(element: PsiElement): Boolean = PsiSearchScopeUtil.isInScope(this, element) public fun E.createSmartPointer(): SmartPsiElementPointer = SmartPointerManager.getInstance(getProject()).createSmartPsiElementPointer(this) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeStorage.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeStorage.kt index 28465594993..64ac043da5d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeStorage.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeStorage.kt @@ -96,7 +96,7 @@ abstract class WritableScopeStorage(val redeclarationHandler: RedeclarationHandl private fun Int.descriptorByIndex() = addedDescriptors[this] - private fun IntList?.plus(value: Int) = IntList(value, this) + private operator fun IntList?.plus(value: Int) = IntList(value, this) private fun IntList.toDescriptors(): List { val result = ArrayList(1) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt index 241de4a0ddb..32e8f2c0a73 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt @@ -60,7 +60,7 @@ public class KtLightClassForFacade private constructor( { CachedValueProvider.Result.create(FacadeCacheData(), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT) }, /*trackValue = */ false) - public fun get(qualifiedName: FqName, searchScope: GlobalSearchScope): CachedValue { + public operator fun get(qualifiedName: FqName, searchScope: GlobalSearchScope): CachedValue { synchronized (cachedValue) { return cachedValue.getValue().cache.get(StubCacheKey(qualifiedName, searchScope)) } diff --git a/compiler/tests/org/jetbrains/kotlin/tests/di/injection.kt b/compiler/tests/org/jetbrains/kotlin/tests/di/injection.kt index 31abeeb688d..70340bbef40 100644 --- a/compiler/tests/org/jetbrains/kotlin/tests/di/injection.kt +++ b/compiler/tests/org/jetbrains/kotlin/tests/di/injection.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.tests.di import com.intellij.openapi.project.Project import org.jetbrains.kotlin.container.StorageComponentContainer import org.jetbrains.kotlin.container.createContainer -import org.jetbrains.kotlin.container.get +import org.jetbrains.kotlin.container.getValue import org.jetbrains.kotlin.container.useImpl import org.jetbrains.kotlin.context.ModuleContext import org.jetbrains.kotlin.descriptors.ModuleDescriptor diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt index b1e098dff32..7de395bf7d2 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt @@ -43,7 +43,7 @@ public class ReflectionTypes(private val module: ModuleDescriptor) { } private object ClassLookup { - fun getValue(types: ReflectionTypes, property: PropertyMetadata): ClassDescriptor { + operator fun getValue(types: ReflectionTypes, property: PropertyMetadata): ClassDescriptor { return types.find(property.name.capitalize()) } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt index 98da0a7ea8e..0b7a81596b3 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt @@ -30,7 +30,7 @@ public abstract class TypeSubstitution { } } - public abstract fun get(key: KotlinType): TypeProjection? + public abstract operator fun get(key: KotlinType): TypeProjection? public open fun isEmpty(): Boolean = false diff --git a/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt b/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt index ab558007706..e7b26b1179a 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt +++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt @@ -32,6 +32,6 @@ public interface NullableLazyValue : Function0 { public fun isComputed(): Boolean } -public fun NotNullLazyValue.getValue(_this: Any?, p: PropertyMetadata): T = invoke() +public operator fun NotNullLazyValue.getValue(_this: Any?, p: PropertyMetadata): T = invoke() -public fun NullableLazyValue.getValue(_this: Any?, p: PropertyMetadata): T? = invoke() +public operator fun NullableLazyValue.getValue(_this: Any?, p: PropertyMetadata): T? = invoke() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt index 22424991581..072bbe78e40 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt @@ -45,7 +45,7 @@ class ClsStubBuilderComponents( } interface TypeParameters { - fun get(id: Int): Name + operator fun get(id: Int): Name fun child(nameResolver: NameResolver, innerTypeParameters: List) = TypeParametersImpl(nameResolver, innerTypeParameters, parent = this) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt index 34f46e07387..48036552886 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.types.checker.KotlinTypeChecker import org.jetbrains.kotlin.types.typeUtil.makeNotNullable import java.util.* -internal fun KotlinType.contains(inner: KotlinType): Boolean { +internal operator fun KotlinType.contains(inner: KotlinType): Boolean { return KotlinTypeChecker.DEFAULT.equalTypes(this, inner) || getArguments().any { inner in it.getType() } } diff --git a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiRange.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiRange.kt index 07d91f8c2b7..331366d5131 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiRange.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiRange.kt @@ -55,7 +55,7 @@ public interface KotlinPsiRange { val empty: Boolean get() = this is Empty - fun contains(element: PsiElement): Boolean = getTextRange().contains(element.getTextRange() ?: TextRange.EMPTY_RANGE) + operator fun contains(element: PsiElement): Boolean = getTextRange().contains(element.getTextRange() ?: TextRange.EMPTY_RANGE) fun match(scope: PsiElement, unifier: KotlinPsiUnifier): List { val elements = elements.filter(SIGNIFICANT_FILTER) diff --git a/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt b/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt index 8de9baf583a..c685d34d98e 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt @@ -164,7 +164,7 @@ class CodeBuilder(private val topElement: PsiElement?, private var docConverter: } private data class Prefix(val elements: List, val lineBreaksBefore: Int) { - fun plus(other: Prefix): Prefix { + operator fun plus(other: Prefix): Prefix { return when { isEmpty() -> other other.isEmpty() -> this diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt index d8ffd61708a..8dac88b7be1 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt @@ -59,7 +59,7 @@ class Annotations(val annotations: List) : Element() { override val isEmpty: Boolean get() = annotations.isEmpty() - fun plus(other: Annotations) = Annotations(annotations + other.annotations).assignNoPrototype() + operator fun plus(other: Annotations) = Annotations(annotations + other.annotations).assignNoPrototype() companion object { val Empty = Annotations(listOf()) diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 0abcc98c861..97cc61c98f9 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -373,10 +373,10 @@ public class IncrementalCacheImpl( return CompilationResult(protoChanged = diff != DifferenceKind.NONE, changes = changes) } - public fun contains(className: JvmClassName): Boolean = + operator fun contains(className: JvmClassName): Boolean = className.internalName in storage - public fun get(className: JvmClassName): ProtoMapValue? = + operator fun get(className: JvmClassName): ProtoMapValue? = storage[className.internalName] public fun remove(className: JvmClassName) { @@ -405,7 +405,7 @@ public class IncrementalCacheImpl( return if (result.isEmpty()) null else result } - fun contains(className: JvmClassName): Boolean = + operator fun contains(className: JvmClassName): Boolean = className.internalName in storage public fun process(kotlinClass: LocalFileKotlinClass): CompilationResult { @@ -572,7 +572,7 @@ public class IncrementalCacheImpl( storage.append(sourceFile.absolutePath, { out -> IOUtil.writeUTF(out, className.internalName) }) } - public fun get(sourceFile: File): Collection = + public operator fun get(sourceFile: File): Collection = storage[sourceFile.absolutePath].orEmpty().map { JvmClassName.byInternalName(it) } override fun dumpValue(value: List) = value.toString() @@ -633,7 +633,7 @@ public class IncrementalCacheImpl( } } - public fun get(sourcePath: String, jvmSignature: String): Collection { + public operator fun get(sourcePath: String, jvmSignature: String): Collection { val key = PathFunctionPair(sourcePath, jvmSignature) return storage[key] ?: emptySet() } @@ -674,7 +674,7 @@ data class CompilationResult( public val NO_CHANGES: CompilationResult = CompilationResult() } - public fun plus(other: CompilationResult): CompilationResult = + public operator fun plus(other: CompilationResult): CompilationResult = CompilationResult(protoChanged || other.protoChanged, constantsChanged || other.constantsChanged, inlineChanged || other.inlineChanged, diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt index dc93330935a..9349c1e7992 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt @@ -88,13 +88,13 @@ public class FunctionReader(private val context: TranslationContext) { readFunction(descriptor).sure { "Could not read function: $descriptor" } } - public fun contains(descriptor: CallableDescriptor): Boolean { + operator fun contains(descriptor: CallableDescriptor): Boolean { val moduleName = getExternalModuleName(descriptor) val currentModuleName = context.getConfig().getModuleId() return currentModuleName != moduleName && moduleName != null && moduleName in moduleJsDefinition } - public fun get(descriptor: CallableDescriptor): JsFunction = functionCache.get(descriptor) + operator fun get(descriptor: CallableDescriptor): JsFunction = functionCache.get(descriptor) private fun readFunction(descriptor: CallableDescriptor): JsFunction? { if (descriptor !in this) return null