diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt index 7e6648d7b63..8a0836fd467 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt @@ -34,7 +34,7 @@ public object CodegenUtilKt { // toTrait = Bar // delegateExpressionType = typeof(baz) // return Map - public [platformStatic] fun getDelegates( + public platformStatic fun getDelegates( descriptor: ClassDescriptor, toTrait: ClassDescriptor, delegateExpressionType: JetType? = null diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt index d33d9e26d42..a72d3af11d9 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt @@ -56,7 +56,7 @@ public fun generateBridges( // If it's a concrete fake override, some of the bridges may be inherited from the super-classes. Specifically, bridges for all // declarations that are reachable from all concrete immediate super-functions of the given function. Note that all such bridges are // guaranteed to delegate to the same implementation as bridges for the given function, that's why it's safe to inherit them - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") for (overridden in function.getOverridden() as Iterable) { if (!overridden.isAbstract) { bridgesToGenerate.removeAll(findAllReachableDeclarations(overridden).map(signature)) @@ -77,7 +77,7 @@ private fun findAllReachableDeclarations(function: F } } } - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") DFS.dfs(listOf(function), { it.getOverridden() as Iterable }, collector) return HashSet(collector.result()) } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt index e2e5673d005..40a9da250c3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt @@ -84,7 +84,7 @@ class PlatformStaticGenerator( } companion object { - [platformStatic] + @platformStatic public fun createStaticFunctionDescriptor(descriptor: FunctionDescriptor): FunctionDescriptor { val memberDescriptor = if (descriptor is PropertyAccessorDescriptor) descriptor.getCorrespondingProperty() else descriptor val copies = CodegenUtil.copyFunctions( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAPParser.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAPParser.kt index 9005af1de40..11fdf7ce1ce 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAPParser.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAPParser.kt @@ -21,7 +21,7 @@ import kotlin.platform.platformStatic object SMAPParser { - [platformStatic] + @platformStatic /*null smap means that there is no any debug info in file (e.g. sourceName)*/ public fun parseOrCreateDefault(mappingInfo: String?, source: String?, path: String, methodStartLine: Int, methodEndLine: Int): SMAP { if (mappingInfo == null || mappingInfo.isEmpty()) { @@ -41,7 +41,7 @@ object SMAPParser { return parse(mappingInfo) } - [platformStatic] + @platformStatic public fun parse(mappingInfo: String): SMAP { val fileMappings = linkedMapOf() diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt index 4a9e8b6c9cf..b74ad2935a7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt @@ -88,7 +88,7 @@ class TryBlockCluster(val blocks: MutableList) { fun doClustering(blocks: List): List> { - [data] class TryBlockInterval(val startLabel: LabelNode, val endLabel: LabelNode) + @data class TryBlockInterval(val startLabel: LabelNode, val endLabel: LabelNode) val clusters = linkedMapOf>() blocks.forEach { block -> 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 186edccb704..24907a54379 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.compiler.plugin.* public object PluginCliParser { - [platformStatic] + @platformStatic fun loadPlugins(arguments: CommonCompilerArguments, configuration: CompilerConfiguration) { val classLoader = PluginURLClassLoader( arguments.pluginClasspaths diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderPostConstruct.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderPostConstruct.kt index d3caa13dec6..4a164998810 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderPostConstruct.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderPostConstruct.kt @@ -29,15 +29,15 @@ public open class JavaClassFinderPostConstruct { public class JavaLazyAnalyzerPostConstruct : JavaClassFinderPostConstruct() { public var project: Project? = null - [Inject] set + @Inject set public var trace: BindingTrace? = null - [Inject] set + @Inject set public var codeAnalyzer: KotlinCodeAnalyzer? = null - [Inject] set + @Inject set - [PostConstruct] override fun postCreate() { + @PostConstruct override fun postCreate() { CodeAnalyzerInitializer.getInstance(project!!).initialize(trace!!, codeAnalyzer!!.getModuleDescriptor(), codeAnalyzer) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index 3eaac56a7d4..f9b2706302e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt @@ -313,7 +313,7 @@ public class TypeResolver( } companion object { - [platformStatic] + @platformStatic public fun resolveProjectionKind(projectionKind: JetProjectionKind): Variance { return when (projectionKind) { JetProjectionKind.IN -> IN_VARIANCE diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt index 3fa1966c744..4d0117e6945 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt @@ -94,7 +94,7 @@ public class CallCompleter( context: BasicCallResolutionContext, results: OverloadResolutionResultsImpl ) { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") val candidates = (if (context.collectAllCandidates) { results.getAllCandidates()!! } @@ -274,7 +274,7 @@ public class CallCompleter( if (cachedDataForCall == null) return null val (cachedResolutionResults, cachedContext, tracing) = cachedDataForCall - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") val cachedResults = cachedResolutionResults as OverloadResolutionResultsImpl val contextForArgument = cachedContext.replaceBindingTrace(context.trace) .replaceExpectedType(context.expectedType).replaceCollectAllCandidates(false) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt index 182444b7cca..fc9d4f6b9a8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt @@ -82,7 +82,7 @@ public fun JetCallElement.getValueArgumentsInParentheses(): List public fun Call.getValueArgumentListOrElement(): JetElement = getValueArgumentList() ?: getCalleeExpression() ?: getCallElement() -[suppress("UNCHECKED_CAST")] +@suppress("UNCHECKED_CAST") private fun List.filterArgsInParentheses() = filter { it !is JetFunctionLiteralArgument } as List public fun Call.getValueArgumentForExpression(expression: JetExpression): ValueArgument? { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkTraitRequirements.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkTraitRequirements.kt index 4c698ccb5ef..ac6851e1a54 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkTraitRequirements.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkTraitRequirements.kt @@ -43,7 +43,7 @@ fun checkTraitRequirements(c: Map { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return TypeUtils.getAllSupertypes(descriptor.getDefaultType()) .map { supertype -> supertype.getConstructor().getDeclarationDescriptor() } .filter { superClass -> DescriptorUtils.isTrait(superClass) } as List diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt index df56946a052..bdc4e087783 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt @@ -638,7 +638,7 @@ private val BOOLEAN = CompileTimeType() private val STRING = CompileTimeType() private val ANY = CompileTimeType() -[suppress("UNCHECKED_CAST")] +@suppress("UNCHECKED_CAST") private fun binaryOperation( a: CompileTimeType, b: CompileTimeType, @@ -647,7 +647,7 @@ private fun binaryOperation( checker: Function2 ) = BinaryOperationKey(a, b, functionName) to Pair(operation, checker) as Pair, Function2> -[suppress("UNCHECKED_CAST")] +@suppress("UNCHECKED_CAST") private fun unaryOperation( a: CompileTimeType, functionName: String, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt index 327b0e1f45e..06c2d219dd2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt @@ -115,7 +115,7 @@ public class LazyAnnotationDescriptor( if (!resolutionResults.isSingleResult()) return mapOf() - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return resolutionResults.getResultingCall().getValueArguments() .mapValues { val (valueParameter, resolvedArgument) = it; if (resolvedArgument == null) null diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt index 54c9269fbaa..9d9c9ffa469 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt @@ -101,7 +101,7 @@ public open class LazyClassMemberScope( OverridingUtil.generateOverridesInFunctionGroup(name, fromSupertypes, ArrayList(result), thisDescriptor, object : OverridingUtil.DescriptorSink { override fun addToScope(fakeOverride: CallableMemberDescriptor) { assert(exactDescriptorClass.isInstance(fakeOverride)) { "Wrong descriptor type in an override: " + fakeOverride + " while expecting " + exactDescriptorClass.getSimpleName() } - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") result.add(fakeOverride as D) } @@ -188,7 +188,7 @@ public open class LazyClassMemberScope( } } - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") protected override fun getNonDeclaredProperties(name: Name, result: MutableSet) { createPropertiesFromPrimaryConstructorParameters(name, result) @@ -319,7 +319,7 @@ public open class LazyClassMemberScope( private val EXTRACT_PROPERTIES: MemberExtractor = object : MemberExtractor { override fun extract(extractFrom: JetType, name: Name): Collection { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return extractFrom.getMemberScope().getProperties(name) as Collection } } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt b/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt index c68cc8f698c..015af25125c 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt @@ -203,7 +203,7 @@ class LazyOperationsLog( private fun Any.field(name: String): T { val field = this.javaClass.getDeclaredField(name) field.setAccessible(true) - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return field.get(this) as T } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/LoggingStorageManager.kt b/compiler/tests/org/jetbrains/kotlin/checkers/LoggingStorageManager.kt index ff9eef24559..efa1fae29bf 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/LoggingStorageManager.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/LoggingStorageManager.kt @@ -121,7 +121,7 @@ public class LoggingStorageManager( var c = this while (true) { result.addAll(c.getDeclaredFields().toList()) - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") val superClass = (c as Class).getSuperclass() as Class? if (superClass == null) break if (c == superClass) break diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt index 56d394e19a7..c167539f2ad 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt @@ -74,7 +74,7 @@ public abstract class AbstractLocalClassProtoTest : TestCaseWithTmpdir() { } private fun assertHasAnnotationData(clazz: Class<*>) { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") val annotation = clazz.getAnnotation( clazz.getClassLoader().loadClass(JvmAnnotationNames.KOTLIN_CLASS.asString()) as Class ) diff --git a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt index e0cfb519c89..9af4a3152ae 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt @@ -24,7 +24,7 @@ public class Services private(private val map: Map, Any>) { } public fun get(interfaceClass: Class): T { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return map.get(interfaceClass) as T } diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/concurrent.kt b/compiler/util/src/org/jetbrains/kotlin/utils/concurrent.kt index e3b60dd9c35..cfb3c7a30c1 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/concurrent.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/concurrent.kt @@ -28,7 +28,7 @@ public class LockedClearableLazyValue(val lock: Any, val init: () -> T) return synchronized(lock) { val _v2 = value // Suppress because of https://youtrack.jetbrains.com/issue/KT-6176 - [suppress("UNNECESSARY_NOT_NULL_ASSERTION")] + @suppress("UNNECESSARY_NOT_NULL_ASSERTION") if (_v2 != null) { _v2!! } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/ModuleClassResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/ModuleClassResolver.kt index 1552842fe7a..cba15f0dfba 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/ModuleClassResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/ModuleClassResolver.kt @@ -33,7 +33,7 @@ public class SingleModuleClassResolver() : ModuleClassResolver { } var resolver: JavaDescriptorResolver? = null - [Inject] set + @Inject set } public class ModuleClassResolverImpl(private val descriptorResolverByJavaClass: (JavaClass) -> JavaDescriptorResolver): ModuleClassResolver { diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt index 88730387188..fe5f9b4836c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt @@ -39,7 +39,7 @@ public class SubstitutingScope(private val workerScope: JetScope, private val su val substituted = substitutedDescriptors!!.getOrPut(descriptor, { descriptor.substitute(substitutor) }) - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return substituted as D? } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt index 8732a436b4f..ae5ee0bfc77 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt @@ -190,7 +190,7 @@ public class DeserializedClassDescriptor( override fun computeNonDeclaredProperties(name: Name, descriptors: MutableCollection) { val fromSupertypes = ArrayList() for (supertype in classDescriptor.getTypeConstructor().getSupertypes()) { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") fromSupertypes.addAll(supertype.getMemberScope().getProperties(name) as Collection) } generateFakeOverrides(name, fromSupertypes, descriptors) @@ -202,7 +202,7 @@ public class DeserializedClassDescriptor( override fun addToScope(fakeOverride: CallableMemberDescriptor) { // TODO: report "cannot infer visibility" OverridingUtil.resolveUnknownVisibilityForMember(fakeOverride, null) - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") result.add(fakeOverride as D) } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt index d38c73b2a2d..fa2fdf48a6a 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt @@ -75,7 +75,7 @@ public abstract class DeserializedMemberScope protected( val memberProtos = membersProtos()[ProtoKey(name, kind, isExtension = false)].orEmpty() + membersProtos()[ProtoKey(name, kind, isExtension = true)].orEmpty() - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return memberProtos.mapTo(LinkedHashSet()) { memberProto -> c.memberDeserializer.loadCallable(memberProto) as D } diff --git a/core/reflection.jvm/src/kotlin/reflect/exceptions.kt b/core/reflection.jvm/src/kotlin/reflect/exceptions.kt index b68b17d2009..7a0a7914a02 100644 --- a/core/reflection.jvm/src/kotlin/reflect/exceptions.kt +++ b/core/reflection.jvm/src/kotlin/reflect/exceptions.kt @@ -26,7 +26,7 @@ package kotlin.reflect */ public class IllegalPropertyAccessException(cause: IllegalAccessException) : Exception(cause.getMessage()) { init { - [suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")] + @suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN") (this as java.lang.Throwable).initCause(cause) } } @@ -37,7 +37,7 @@ public class IllegalPropertyAccessException(cause: IllegalAccessException) : Exc */ public class NoSuchPropertyException(cause: Exception? = null) : Exception() { init { - [suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")] + @suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN") if (cause != null) { (this as java.lang.Throwable).initCause(cause) } diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KMemberExtensionPropertyImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KMemberExtensionPropertyImpl.kt index e21d2d1f79d..5777671ca62 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KMemberExtensionPropertyImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KMemberExtensionPropertyImpl.kt @@ -36,7 +36,7 @@ open class KMemberExtensionPropertyImpl : DescriptorBasedProp override fun get(instance: D, extensionReceiver: E): R { try { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return getter.invoke(instance, extensionReceiver) as R } catch (e: IllegalAccessException) { diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KMemberPropertyImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KMemberPropertyImpl.kt index 8e7b81071ec..5a2522d63f5 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KMemberPropertyImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KMemberPropertyImpl.kt @@ -31,7 +31,7 @@ open class KMemberPropertyImpl : DescriptorBasedProperty, KMembe override fun get(instance: T): R { try { val getter = getter - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return if (getter != null) getter(instance) as R else field!!.get(instance) as R } catch (e: IllegalAccessException) { diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTopLevelExtensionPropertyImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTopLevelExtensionPropertyImpl.kt index 209efd23d3d..bae24330fce 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTopLevelExtensionPropertyImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTopLevelExtensionPropertyImpl.kt @@ -30,7 +30,7 @@ open class KTopLevelExtensionPropertyImpl : DescriptorBasedProperty, K override fun get(receiver: T): R { try { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return getter.invoke(null, receiver) as R } catch (e: IllegalAccessException) { diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTopLevelVariableImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTopLevelVariableImpl.kt index 36b07b671e1..b1758677721 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTopLevelVariableImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTopLevelVariableImpl.kt @@ -30,7 +30,7 @@ open class KTopLevelVariableImpl : DescriptorBasedProperty, KTopLevelVari override fun get(): R { try { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return getter.invoke(null) as R } catch (e: IllegalAccessException) { diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/foreignKClasses.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/foreignKClasses.kt index 0bb2d2ebeeb..695dd69fa0d 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/foreignKClasses.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/foreignKClasses.kt @@ -31,7 +31,7 @@ fun foreignKotlinClass(jClass: Class): KClassImpl { val name = jClass.getName() val cached = FOREIGN_K_CLASSES[name] if (cached is WeakReference<*>) { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") val kClass = cached.get() as KClassImpl? if (kClass?.jClass == jClass) { return kClass!! diff --git a/eval4j/test/org/jetbrains/eval4j/test/main.kt b/eval4j/test/org/jetbrains/eval4j/test/main.kt index 90ba0031520..b9e3da33d98 100644 --- a/eval4j/test/org/jetbrains/eval4j/test/main.kt +++ b/eval4j/test/org/jetbrains/eval4j/test/main.kt @@ -132,7 +132,7 @@ object REFLECTION_EVAL : Eval { return _class.isInstance(value.obj()) } - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") override fun newArray(arrayType: Type, size: Int): Value { return ObjectValue(JArray.newInstance(findClass(arrayType).getComponentType() as Class, size), arrayType) } @@ -275,7 +275,7 @@ object REFLECTION_EVAL : Eval { if (invokespecial) { if (methodDesc.name == "") { // Constructor call - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") val _class = findClass((instance as NewObjectValue).asmType) val ctor = _class.findConstructor(methodDesc) assertNotNull("Constructor not found: $methodDesc", ctor) @@ -306,7 +306,7 @@ object REFLECTION_EVAL : Eval { } class ReflectionLookup(val classLoader: ClassLoader) { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") fun findClass(asmType: Type): Class<*>? { return when (asmType.getSort()) { Type.BOOLEAN -> java.lang.Boolean.TYPE @@ -324,7 +324,7 @@ class ReflectionLookup(val classLoader: ClassLoader) { } } -[suppress("UNCHECKED_CAST")] +@suppress("UNCHECKED_CAST") fun Class.findMethod(methodDesc: MethodDescription): Method? { for (declared in getDeclaredMethods()) { if (methodDesc.matches(declared)) return declared @@ -341,7 +341,7 @@ fun Class.findMethod(methodDesc: MethodDescription): Method? { return null } -[suppress("UNCHECKED_CAST")] +@suppress("UNCHECKED_CAST") fun Class.findConstructor(methodDesc: MethodDescription): Constructor? { for (declared in getDeclaredConstructors()) { if (methodDesc.matches(declared)) return declared as Constructor @@ -371,7 +371,7 @@ fun MethodDescription.matches(method: Method): Boolean { return returnType.matches(method.getReturnType()!!) } -[suppress("UNCHECKED_CAST")] +@suppress("UNCHECKED_CAST") fun Class.findField(fieldDesc: FieldDescription): Field? { for (declared in getDeclaredFields()) { if (fieldDesc.matches(declared)) return declared diff --git a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt index 37010da86b8..b831d2b8f85 100644 --- a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt +++ b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt @@ -49,12 +49,12 @@ fun generate(): String { val binaryOperationsMap = arrayListOf>>() val builtIns = KotlinBuiltIns.getInstance() - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") val allPrimitiveTypes = builtIns.getBuiltInsPackageScope().getDescriptors() .filter { it is ClassDescriptor && KotlinBuiltIns.isPrimitiveType(it.getDefaultType()) } as List for (descriptor in allPrimitiveTypes + builtIns.getString()) { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") val functions = descriptor.getMemberScope(listOf()).getDescriptors() .filter { it is FunctionDescriptor && !EXCLUDED_FUNCTIONS.contains(it.getName().asString()) } as List diff --git a/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufConsistencyTest.kt b/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufConsistencyTest.kt index 49213a0be89..51b24e00653 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufConsistencyTest.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufConsistencyTest.kt @@ -26,7 +26,7 @@ import java.lang.reflect.Modifier public class ProtoBufConsistencyTest : TestCase() { public fun testExtensionNumbersDoNotIntersect() { - [data] class Key(val messageType: Class<*>, val index: Int) + @data class Key(val messageType: Class<*>, val index: Int) val extensions = LinkedHashMultimap.create() 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 a6fb627e03b..978f52ce48d 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 @@ -224,7 +224,7 @@ public open class JetPsiChecker : Annotator, HighlightRangeExtension { companion object { var namesHighlightingEnabled = true - [TestOnly] set + @TestOnly set platformStatic fun highlightName(holder: AnnotationHolder, psiElement: PsiElement, attributesKey: TextAttributesKey) { if (namesHighlightingEnabled) { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReference.kt index f055a37da0b..58d53a9b93b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReference.kt @@ -63,7 +63,7 @@ public abstract class AbstractJetReference(element: T) override fun bindToElement(element: PsiElement): PsiElement = throw IncorrectOperationException() - [suppress("CAST_NEVER_SUCCEEDS")] + @suppress("CAST_NEVER_SUCCEEDS") override fun getVariants(): Array = PsiReference.EMPTY_ARRAY as Array override fun isSoft(): Boolean = false 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 49104c1b31d..49c8b1e0d65 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 @@ -59,9 +59,9 @@ 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)) - } + @suppress("UNCHECKED_CAST") + return array(factory(element as E)) + } }) } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/commonFilters.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/commonFilters.kt index 79938f1c5b4..e4f56cc055d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/commonFilters.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/commonFilters.kt @@ -69,6 +69,6 @@ val (PsiReference.() -> Boolean).searchFilter: UsagesSearchFilter val (PsiReference.(T) -> Boolean).searchFilter: UsagesSearchFilter get() = object: UsagesSearchFilter { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") override fun accepts(ref: PsiReference, item: UsagesSearchRequestItem): Boolean = ref.this@searchFilter(item.target.element as T) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt index c497cceb5c5..9a66dae79a4 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt @@ -34,7 +34,7 @@ public class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider Project.executeWriteCommand(name: String, groupId: Any? = null, command: () -> T): T { var result: T = null as T CommandProcessor.getInstance().executeCommand(this, { result = runWriteAction(command) }, name, groupId) - [suppress("USELESS_CAST")] + @suppress("USELESS_CAST") return result as T } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt index 622ab3820a6..8511b8c9447 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt @@ -45,7 +45,7 @@ public abstract class ImportInsertHelper { public abstract fun importDescriptor(file: JetFile, descriptor: DeclarationDescriptor): ImportDescriptorResult companion object { - [platformStatic] + @platformStatic public fun getInstance(project: Project): ImportInsertHelper = ServiceManager.getService(project, javaClass()) } diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt index f003048cd25..00087b11dac 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt @@ -162,7 +162,7 @@ fun MutableCollection.addLoo for (info in expectedInfos) { val classification = infoClassifier(info) if (classification.substitutor != null) { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") val substitutedDescriptor = descriptor?.substitute(classification.substitutor) as TDescriptor val map = if (classification.makeNotNullable) makeNullableInfos else matchedInfos map.getOrPut(ItemData(substitutedDescriptor, info.itemOptions)) { ArrayList() }.add(info) diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 0b0281be30e..589b4ce14e3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -277,7 +277,7 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor, val fqName: FqName ) @@ -347,7 +347,7 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor = emptyList() } } diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/spellchecker/KotlinSpellcheckingStrategy.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/spellchecker/KotlinSpellcheckingStrategy.kt index 95086107a2a..d938870a413 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/spellchecker/KotlinSpellcheckingStrategy.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/spellchecker/KotlinSpellcheckingStrategy.kt @@ -32,7 +32,7 @@ class KotlinSpellcheckingStrategy: SpellcheckingStrategy() { private val emptyTokenizer = SpellcheckingStrategy.EMPTY_TOKENIZER override fun getTokenizer(element: PsiElement?): Tokenizer { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return when { element is PsiNameIdentifierOwner || element is PsiComment -> super.getTokenizer(element) diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt index 5667d05302e..cb66384c012 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt @@ -268,7 +268,7 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Mult } } - [deprecated("Since Idea 14.0.3 use createPrepareRequests fun")] + @deprecated("Since Idea 14.0.3 use createPrepareRequests fun") override fun createPrepareRequest(classPrepareRequestor: ClassPrepareRequestor, sourcePosition: SourcePosition): ClassPrepareRequest? { if (sourcePosition.getFile() !is JetFile) { throw NoDataException.INSTANCE diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt index a05f538f98a..10c3bfc21c8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt @@ -41,7 +41,7 @@ public class JavaMethodKotlinDerivedDefinitionUsage( function: JetFunction, functionDescriptor: FunctionDescriptor, javaMethodChangeInfo: JetChangeInfo): JavaMethodKotlinUsageWithDelegate(function, javaMethodChangeInfo) { - [suppress("CAST_NEVER_SUCCEEDS")] + @suppress("CAST_NEVER_SUCCEEDS") override protected val delegateUsage = JetFunctionDefinitionUsage( psiElement, functionDescriptor, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt index da72c01898e..1eb345ea27f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt @@ -110,7 +110,7 @@ public class KotlinIntroduceParameterMethodUsageProcessor : IntroduceParameterMe val refElement = usage.getElement() as? JetReferenceExpression ?: return true val callElement = refElement.getParentOfTypeAndBranch(true) { getCalleeExpression() } ?: return true val delegateUsage = if (callElement is JetConstructorDelegationCall) { - [suppress("CAST_NEVER_SUCCEEDS")] + @suppress("CAST_NEVER_SUCCEEDS") (JetConstructorDelegationCallUsage(callElement, changeInfo) as JetUsageInfo) } else { 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 a68dc4a867d..a14ac9e817c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt @@ -248,7 +248,7 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe val extractionOptions = InTextDirectivesUtils.findListWithPrefixes(fileText, "// OPTIONS: ").let { if (it.isNotEmpty()) { - [suppress("CAST_NEVER_SUCCEEDS")] + @suppress("CAST_NEVER_SUCCEEDS") val args = it.map { it.toBoolean() }.copyToArray() as Array javaClass().getConstructors().first { it.getParameterTypes().size() == args.size() }.newInstance(*args) as ExtractionOptions } else ExtractionOptions.DEFAULT diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt index 38e2b461ec0..a7b67bb1e6e 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt @@ -72,7 +72,7 @@ public open class JsFunctionScope(parent: JsScope, description: String) : JsScop * Safe call is necessary, because hasOwnName can be called * in constructor before labelName is initialized (see KT-4394) */ - [suppress("UNNECESSARY_SAFE_CALL")] + @suppress("UNNECESSARY_SAFE_CALL") override fun hasOwnName(name: String): Boolean = name in RESERVED_WORDS || name == ident diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/HasMetadata.kt b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/HasMetadata.kt index 0f956141273..43036629d6f 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/HasMetadata.kt +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/HasMetadata.kt @@ -20,7 +20,7 @@ abstract class HasMetadata { private val metadata: MutableMap = hashMapOf() fun getData(key: String): T { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") return metadata[key] as T } 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 cfa1e1566ec..6d372d20709 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 @@ -41,7 +41,7 @@ public class SuppressUninitializedErrorsForNativeDeclarations : DiagnosticsWithS override fun isSuppressed(diagnostic: Diagnostic): Boolean { if (diagnostic.getFactory() != Errors.UNINITIALIZED_VARIABLE) return false - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") val diagnosticWithParameters = diagnostic as DiagnosticWithParameters1 val variableDescriptor = diagnosticWithParameters.getA() diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCodePositioningStrategy.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCodePositioningStrategy.kt index 3ef865a589e..93b56c47c75 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCodePositioningStrategy.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCodePositioningStrategy.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1 public object JsCodePositioningStrategy : PositioningStrategy() { override fun markDiagnostic(diagnostic: ParametrizedDiagnostic): List { - [suppress("UNCHECKED_CAST")] + @suppress("UNCHECKED_CAST") val diagnosticWithParameters = diagnostic as DiagnosticWithParameters1 val textRange = diagnosticWithParameters.getA().reportRange return listOf(textRange) diff --git a/js/js.libraries/src/core/concurrent.kt b/js/js.libraries/src/core/concurrent.kt index 75ebbc1c1ad..3e35795968d 100644 --- a/js/js.libraries/src/core/concurrent.kt +++ b/js/js.libraries/src/core/concurrent.kt @@ -29,4 +29,4 @@ public annotation class volatile native public annotation class synchronized -public inline fun synchronized(lock: Any, [inlineOptions(ONLY_LOCAL_RETURN)] block: () -> R): R = block() +public inline fun synchronized(lock: Any, @inlineOptions(ONLY_LOCAL_RETURN) block: () -> R): R = block() diff --git a/js/js.libraries/src/core/core.kt b/js/js.libraries/src/core/core.kt index fa20b75ed5c..3a60d4fce4c 100644 --- a/js/js.libraries/src/core/core.kt +++ b/js/js.libraries/src/core/core.kt @@ -16,7 +16,7 @@ public val undefined: Nothing? = noImpl // Drop this after KT-2093 will be fixed and restore MutableMap.set in Maps.kt from MapsJVM.kt /** Provides [] access to maps */ -[suppress("BASE_WITH_NULLABLE_UPPER_BOUND")] +@suppress("BASE_WITH_NULLABLE_UPPER_BOUND") native public fun MutableMap.set(key: K, value: V): V? = noImpl library diff --git a/js/js.libraries/src/core/javautil.kt b/js/js.libraries/src/core/javautil.kt index 6e32b6ae569..2d5afba68fd 100644 --- a/js/js.libraries/src/core/javautil.kt +++ b/js/js.libraries/src/core/javautil.kt @@ -70,9 +70,9 @@ public open class LinkedList() : AbstractList() { override fun set(index: Int, element: E): E = noImpl override fun add(index: Int, element: E): Unit = noImpl - [suppress("BASE_WITH_NULLABLE_UPPER_BOUND")] + @suppress("BASE_WITH_NULLABLE_UPPER_BOUND") public fun poll(): E? = noImpl - [suppress("BASE_WITH_NULLABLE_UPPER_BOUND")] + @suppress("BASE_WITH_NULLABLE_UPPER_BOUND") public fun peek(): E? = noImpl public fun offer(e: E): Boolean = noImpl } @@ -104,13 +104,13 @@ library public open class HashMap(initialCapacity: Int = DEFAULT_INITIAL_CAPACITY, loadFactor: Float = DEFAULT_LOAD_FACTOR) : MutableMap { override fun size(): Int = noImpl override fun isEmpty(): Boolean = noImpl - [suppress("BASE_WITH_NULLABLE_UPPER_BOUND")] + @suppress("BASE_WITH_NULLABLE_UPPER_BOUND") override fun get(key: Any?): V? = noImpl override fun containsKey(key: Any?): Boolean = noImpl - [suppress("BASE_WITH_NULLABLE_UPPER_BOUND")] + @suppress("BASE_WITH_NULLABLE_UPPER_BOUND") override fun put(key: K, value: V): V? = noImpl override fun putAll(m: Map): Unit = noImpl - [suppress("BASE_WITH_NULLABLE_UPPER_BOUND")] + @suppress("BASE_WITH_NULLABLE_UPPER_BOUND") override fun remove(key: Any?): V? = noImpl override fun clear(): Unit = noImpl override fun containsValue(value: Any?): Boolean = noImpl diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt index ef3d099345f..a3b8c8e7813 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt @@ -31,7 +31,7 @@ fun File.mkdirsProperly() { class KDocSampleTest { - [Test] + @Test fun generateKDocForSample() { val compiler = KDocCompiler() diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt index 98f261e05aa..8fe98f14ca2 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt @@ -28,7 +28,7 @@ class PsiUtilsTest { private var environment: KotlinCoreEnvironment? = null - [Before] + @Before fun before() { System.setProperty("java.awt.headless", "true") @@ -37,7 +37,7 @@ class PsiUtilsTest { environment = KotlinCoreEnvironment.createForTests(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) } - [After] + @After fun after() { Disposer.dispose(rootDisposable) } @@ -49,7 +49,7 @@ class PsiUtilsTest { .trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false) as JetFile } - [Test] + @Test fun splitPsi() { val file = createFile("class Foo") val items: List = splitPsi(file).map { t -> t.first }