From 9c4564a5a6557a192e1ece40c93c89d676a312c1 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Mon, 14 Sep 2015 16:26:59 +0300
Subject: [PATCH] Get rid of deprecated annotations and modifiers in project
 code

---
 .../jetbrains/kotlin/ant/KotlinAntTaskUtil.kt |  3 +-
 .../kotlin/backend/common/CodegenUtilKt.kt    |  4 +-
 .../kotlin/backend/common/bridges/bridges.kt  |  4 +-
 .../codegen/context/CodegenContextUtil.kt     |  9 ++--
 .../codegen/inline/ReifiedTypeInliner.kt      |  7 +--
 .../kotlin/codegen/inline/SMAPParser.kt       |  5 +-
 .../codegen/inline/TryBlockClustering.kt      |  2 +-
 .../kotlin/codegen/pseudoInsns/PseudoInsns.kt |  1 -
 .../messages/CompilerMessageLocation.kt       |  8 +--
 .../src/org/jetbrains/kotlin/runner/Main.kt   |  2 +-
 .../jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt |  5 +-
 .../kotlin/cli/jvm/PluginCliParser.kt         |  5 +-
 .../CliLightClassGenerationSupport.kt         |  2 +-
 .../cli/jvm/compiler/KotlinCoreEnvironment.kt | 14 ++++--
 .../src/org/jetbrains/kotlin/container/Dsl.kt |  2 +-
 .../container/tests/ComponentContainerTest.kt | 50 ++++++++++++-------
 .../kotlin/fileClasses/JvmFileClassUtil.kt    | 36 ++++++++-----
 .../jetbrains/kotlin/jvm/RuntimeAssertions.kt |  4 +-
 .../load/java/JavaClassFinderPostConstruct.kt |  3 +-
 .../java/sam/SamConversionResolverImpl.kt     |  2 +-
 .../load/kotlin/JvmVirtualFileFinder.kt       |  3 +-
 .../kotlin/JvmVirtualFileFinderFactory.kt     |  3 +-
 .../load/kotlin/PackagePartClassUtils.kt      | 27 ++++++----
 .../load/kotlin/VirtualFileKotlinClass.kt     |  2 +-
 .../IncrementalPackagePartProvider.kt         |  2 +-
 .../kotlin/resolve/jvm/JvmAnalyzerFacade.kt   |  4 +-
 .../synthetic/JavaSyntheticPropertiesScope.kt |  2 +-
 .../kotlin/analyzer/AnalysisResult.kt         | 10 ++--
 .../cfg/PseudocodeVariableDataCollector.kt    |  2 +-
 .../kotlin/cfg/pseudocode/pseudocodeUtils.kt  |  2 +-
 .../org/jetbrains/kotlin/context/context.kt   |  8 +--
 .../diagnostics/PositioningStrategies.kt      |  3 +-
 .../kotlin/diagnostics/rendering/Renderers.kt | 13 +++--
 .../jetbrains/kotlin/frontend/di/injection.kt |  2 +-
 .../kotlin/kdoc/parser/KDocLinkParser.kt      |  3 +-
 .../jetbrains/kotlin/psi/JetClassOrObject.kt  |  2 +-
 .../jetbrains/kotlin/psi/JetConstructor.kt    |  4 +-
 .../org/jetbrains/kotlin/psi/JetElement.kt    |  2 +-
 .../kotlin/psi/JetObjectDeclaration.kt        |  2 +-
 .../org/jetbrains/kotlin/psi/JetPsiFactory.kt |  2 +-
 .../org/jetbrains/kotlin/psi/ValueArgument.kt |  2 +-
 .../jetbrains/kotlin/psi/createByPattern.kt   |  2 +-
 .../jetbrains/kotlin/psi/psiUtil/psiUtils.kt  | 12 ++---
 ...uperClassReferenceExpressionElementType.kt |  2 +-
 .../psi/stubs/elements/StubIndexService.kt    |  6 +--
 .../psi/stubs/impl/ModifierMaskUtils.kt       | 13 +++--
 .../kotlin/resolve/DescriptorToSourceUtils.kt | 11 ++--
 .../resolve/ImportDirectiveProcessor.kt       |  4 +-
 .../jetbrains/kotlin/resolve/TypeResolver.kt  |  3 +-
 .../kotlin/resolve/VarianceChecker.kt         |  4 +-
 .../kotlin/resolve/calls/CallCompleter.kt     |  4 +-
 .../tasks/CallableDescriptorCollectors.kt     |  2 +-
 .../resolve/calls/tasks/dynamicCalls.kt       |  4 +-
 .../kotlin/resolve/calls/util/callUtil.kt     |  4 +-
 .../evaluate/ConstantExpressionEvaluator.kt   | 11 ++--
 .../MutableDiagnosticsWithSuppression.kt      |  3 +-
 .../kotlin/resolve/lazy/LazyImportScope.kt    |  2 +-
 .../DeclarationProviderFactoryService.kt      |  4 +-
 .../lazy/descriptors/LazyAnnotations.kt       |  2 +-
 .../lazy/descriptors/LazyClassMemberScope.kt  |  6 +--
 .../kotlin/resolve/scopes/LexicalScopeImpl.kt |  2 +-
 .../resolve/scopes/WritableScopeImpl.kt       |  2 +-
 .../kotlin/resolve/scopes/utils/ScopeUtils.kt |  4 +-
 .../validation/SymbolUsageValidator.kt        |  1 -
 .../LockBasedLazyResolveStorageManager.kt     |  2 +-
 .../expressions/SenselessComparisonChecker.kt |  3 +-
 .../kotlin/util/MappedExtensionProvider.kt    |  7 +--
 .../kotlin/util/PerformanceCounter.kt         |  3 +-
 .../KotlinLightClassForExplicitDeclaration.kt |  6 +--
 .../asJava/KotlinLightClassForFacade.kt       |  4 +-
 .../compiler/plugin/CommandLineProcessor.kt   |  2 +-
 .../rmi/kotlinr/KotlinCompilerClient.kt       |  5 +-
 .../org/jetbrains/kotlin/rmi/DaemonParams.kt  |  6 ++-
 .../kotlin/rmi/service/CompileDaemon.kt       |  3 +-
 .../kotlin/rmi/service/CompileServiceImpl.kt  |  2 +-
 .../kotlin/checkers/LazyOperationsLog.kt      |  2 +-
 .../kotlin/checkers/LoggingStorageManager.kt  |  2 +-
 .../cli/jvm/KotlinCliJavaFileManagerTest.kt   |  2 +-
 .../kotlin/codegen/TestStdlibWithDxTest.kt    |  6 ++-
 .../AbstractLocalClassProtoTest.kt            |  2 +-
 .../org/jetbrains/kotlin/config/Services.kt   |  2 +-
 .../kotlin/progress/CancelationStatus.kt      |  8 +--
 .../utils/KotlinJavascriptMetadataUtils.kt    | 13 +++--
 .../jetbrains/kotlin/utils/LibraryUtils.kt    | 19 ++++---
 .../org/jetbrains/kotlin/utils/concurrent.kt  |  4 +-
 .../java/lazy/types/LazyJavaTypeResolver.kt   |  6 +--
 .../kotlin/load/java/lazy/types/RawType.kt    |  2 +-
 .../typeEnhacement/signatureEnhancement.kt    |  4 +-
 .../kotlin/load/kotlin/MemberSignature.kt     | 10 ++--
 .../kotlin/load/kotlin/ModuleMapping.kt       |  3 +-
 .../serialization/jvm/JvmProtoBufUtil.kt      |  9 ++--
 .../load/kotlin/reflect/ReflectKotlinClass.kt |  2 +-
 .../kotlin/builtins/CompanionObjectMapping.kt |  7 +--
 .../annotations/AnnotationsImpl.kt            |  5 +-
 .../incremental/components/LookupLocation.kt  |  2 +-
 .../inference/CapturedTypeConstructor.kt      |  2 +-
 .../resolve/constants/constantValues.kt       |  2 +-
 .../kotlin/resolve/scopes/JetScope.kt         |  2 +-
 .../resolve/scopes/SubstitutingScope.kt       |  2 +-
 .../DisjointKeysUnionTypeSubstitution.kt      |  4 +-
 .../org/jetbrains/kotlin/types/JetTypeImpl.kt |  7 ++-
 .../kotlin/types/TypeSubstitution.kt          |  8 +--
 .../jetbrains/kotlin/types/dynamicTypes.kt    |  2 +-
 .../jetbrains/kotlin/types/flexibleTypes.kt   |  6 +--
 .../DeserializedPackageFragment.kt            |  2 +-
 .../deserialization/LocalClassResolverImpl.kt |  2 +-
 .../DeserializedClassDescriptor.kt            |  4 +-
 .../descriptors/DeserializedMemberScope.kt    |  2 +-
 .../src/kotlin/reflect/exceptions.kt          |  4 +-
 .../src/kotlin/reflect/jvm/_Deprecated.kt     | 16 +++---
 .../reflect/jvm/internal/KCallableImpl.kt     |  4 +-
 .../kotlin/reflect/jvm/internal/KClassImpl.kt |  6 +--
 .../jvm/internal/KDeclarationContainerImpl.kt |  2 +-
 .../reflect/jvm/internal/KFunctionImpl.kt     |  2 +-
 .../reflect/jvm/internal/KPackageImpl.kt      |  2 +-
 .../reflect/jvm/internal/foreignKClasses.kt   |  2 +-
 .../src/kotlin/reflect/jvm/mapping.kt         |  4 +-
 .../src/kotlin/reflect/jvm/reflectLambda.kt   |  2 +-
 .../src/kotlin/jvm/internal/Lambda.kt         |  2 +-
 .../jvm/internal/PrimitiveSpreadBuilders.kt   |  2 +-
 .../org/jetbrains/kotlin/utils/functions.kt   |  2 +-
 eval4j/test/org/jetbrains/eval4j/test/main.kt | 12 ++---
 .../evaluate/GenerateOperationsMap.kt         |  4 +-
 .../protobuf/GenerateProtoBufCompare.kt       |  3 +-
 .../kotlin/generators/tests/GenerateTests.kt  |  2 +-
 .../protobuf/ProtoBufConsistencyTest.kt       |  2 +-
 .../codeInsight/ReferenceVariantsHelper.kt    |  2 +-
 .../kotlin/idea/analysis/AnalyzerUtil.kt      |  6 +--
 .../idea/caches/resolve/JsProjectDetector.kt  |  4 +-
 .../idea/caches/resolve/KotlinCacheService.kt |  6 +--
 .../resolve/LibraryModificationTracker.kt     |  4 +-
 .../idea/caches/resolve/resolutionApi.kt      |  2 +-
 .../idea/configuration/ModuleTypeCache.kt     |  4 +-
 .../idea/decompiler/KotlinClsFileBase.kt      |  2 +-
 .../KotlinJavaScriptLibraryDetectionUtil.kt   |  5 +-
 .../kotlin/idea/highlighter/JetPsiChecker.kt  |  7 +--
 .../KotlinBeforeResolveHighlightingPass.kt    |  2 +-
 .../inspections/IntentionBasedInspection.kt   |  2 +-
 .../intentions/JetSelfTargetingIntention.kt   |  6 +--
 .../references/BuiltInsReferenceResolver.kt   |  8 +--
 .../kotlin/idea/references/JetReference.kt    |  2 +-
 .../references/JetReferenceContributor.kt     |  2 +-
 .../KotlinInheritedMembersNodeProvider.kt     |  2 +-
 .../JetFileFacadeClassByPackageIndex.kt       |  3 +-
 .../stubindex/JetFileFacadeFqNameIndex.kt     |  3 +-
 .../stubindex/JetFileFacadeShortNameIndex.kt  |  3 +-
 .../idea/stubindex/JetFilePartClassIndex.kt   |  3 +-
 .../kotlin/idea/stubindex/PackageIndexUtil.kt | 16 +++---
 .../idea/stubindex/StaticFacadeIndexUtil.kt   |  3 +-
 .../kotlin/idea/util/ApplicationUtils.kt      |  2 +-
 .../kotlin/idea/util/ImportInsertHelper.kt    |  3 +-
 .../kotlin/idea/util/ShortenReferences.kt     |  4 +-
 .../idea/vfilefinder/JsVirtualFileFinder.kt   |  3 +-
 .../vfilefinder/JsVirtualFileFinderFactory.kt |  3 +-
 .../kotlin/idea/completion/CompletionUtils.kt |  6 +--
 .../kotlin/idea/completion/smart/Utils.kt     |  2 +-
 .../handlers/BasicCompletionHandlerTest.kt    |  2 +-
 .../kotlin/idea/core/NameValidators.kt        |  2 +-
 .../kotlin/idea/core/psiModificationUtils.kt  |  4 +-
 .../KotlinCopyPasteReferenceProcessor.kt      |  2 +-
 .../KotlinSpellcheckingStrategy.kt            |  2 +-
 .../copy/ConvertJavaCopyPastePostProcessor.kt |  2 +-
 .../idea/debugger/JetPositionManager.kt       |  4 +-
 .../idea/debugger/KotlinDebuggerSettings.kt   |  2 +-
 .../handlers/KotlinFindUsagesHandler.kt       |  2 +-
 .../markers/SuperDeclarationMarker.kt         |  2 +-
 .../ConflictingExtensionPropertyInspection.kt |  4 +-
 .../ReplaceWithOperatorAssignmentIntention.kt |  3 +-
 .../kotlin/idea/j2k/J2kPostProcessings.kt     |  8 +--
 .../kotlin/idea/quickfix/AutoImportFix.kt     |  2 +-
 .../kotlin/idea/quickfix/NullQuickFix.kt      |  2 +-
 .../quickfix/QuickFixWithDelegateFactory.kt   |  2 +-
 .../idea/quickfix/SpecifyTypeExplicitlyFix.kt |  1 -
 .../callableBuilder/CallableBuilder.kt        |  2 +-
 .../DeprecatedSymbolUsageFixBase.kt           |  2 +-
 .../changeSignature/JetChangeSignature.kt     | 13 +++--
 .../ui/JetChangeSignatureDialog.kt            |  4 +-
 .../changeSignature/usages/JetUsageInfo.kt    |  2 +-
 ...nIntroduceParameterMethodUsageProcessor.kt |  2 +-
 .../idea/refactoring/jetRefactoringUtil.kt    |  2 +-
 .../kotlin/idea/refactoring/move/moveUtils.kt |  2 +-
 .../DeprecatedSymbolUsageFixSpecialTest.kt    |  6 +--
 .../introduce/AbstractJetExtractionTest.kt    |  2 +-
 .../org/jetbrains/kotlin/j2k/CodeBuilder.kt   |  2 +-
 .../kotlin/jps/build/JpsJsModuleUtils.kt      |  5 +-
 .../jps/incremental/IncrementalCacheImpl.kt   |  6 +--
 .../jps/incremental/storage/BasicMap.kt       |  2 +-
 .../jps/build/AbstractIncrementalJpsTest.kt   |  2 +-
 .../dart/compiler/backend/js/ast/jsScopes.kt  |  2 +-
 .../backend/js/ast/metadata/HasMetadata.kt    |  2 +-
 .../kotlin/js/analyze/suppressWarnings.kt     |  2 +-
 .../kotlin/js/analyzer/JsAnalysisResult.kt    |  4 +-
 .../js/resolve/diagnostics/JsCallChecker.kt   |  5 +-
 .../diagnostics/JsCodePositioningStrategy.kt  |  2 +-
 .../kotlin/js/inline/ExpressionDecomposer.kt  |  3 +-
 .../kotlin/js/inline/FunctionInlineMutator.kt |  8 ++-
 .../kotlin/js/inline/FunctionReader.kt        |  1 -
 .../js/KotlinJavascriptSerializationUtil.kt   |  3 +-
 .../callTranslator/CallTranslator.kt          |  5 +-
 .../translate/declaration/ClassTranslator.kt  |  5 +-
 .../js/translate/expression/InlineMetadata.kt |  6 +--
 .../reference/CallArgumentTranslator.kt       |  5 +-
 .../android/AbstractAndroidCompletionTest.kt  |  2 +-
 .../kotlin/android/SamePluginVersionsTest.kt  |  2 +-
 204 files changed, 485 insertions(+), 439 deletions(-)

diff --git a/ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt b/ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt
index d0c2463ea37..22c3727ef68 100644
--- a/ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt
@@ -52,7 +52,8 @@ object KotlinAntTaskUtil {
         return this
     }
 
-    synchronized fun getOrCreateClassLoader(): ClassLoader {
+    @Synchronized
+    fun getOrCreateClassLoader(): ClassLoader {
         val cached = classLoaderRef.get()
         if (cached != null) return cached
 
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 73a4ff859f5..b710a38beab 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
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.types.JetType
 import org.jetbrains.kotlin.types.isDynamic
 import org.jetbrains.kotlin.utils.keysToMapExceptNulls
 import java.util.Comparator
-import kotlin.platform.platformStatic
 
 public object CodegenUtilKt {
 
@@ -35,7 +34,8 @@ public object CodegenUtilKt {
     //   toTrait = Bar
     //   delegateExpressionType = typeof(baz)
     // return Map<member of Foo, corresponding member of typeOf(baz)>
-    public platformStatic fun getDelegates(
+    @JvmStatic
+    public 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 5732c64cd87..35ee109220c 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 <Function : FunctionHandle, Signature> 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<Function>) {
             if (!overridden.isAbstract) {
                 bridgesToGenerate.removeAll(findAllReachableDeclarations(overridden).map(signature))
@@ -77,7 +77,7 @@ private fun <Function : FunctionHandle> findAllReachableDeclarations(function: F
             }
         }
     }
-    @suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     DFS.dfs(listOf(function), { it.getOverridden() as Iterable<Function> }, collector)
     return HashSet(collector.result())
 }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContextUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContextUtil.kt
index b4b7b3d54b3..b09101aec51 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContextUtil.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContextUtil.kt
@@ -21,16 +21,19 @@ import org.jetbrains.org.objectweb.asm.Type
 
 
 public object CodegenContextUtil {
-    public @JvmStatic fun getImplementationOwnerClassType(owner: CodegenContext<*>): Type? =
+    @JvmStatic
+    public fun getImplementationOwnerClassType(owner: CodegenContext<*>): Type? =
             when (owner) {
                 is DelegatingFacadeContext -> owner.delegateToClassType
                 is DelegatingToPartContext -> owner.implementationOwnerClassType
                 else -> null
             }
 
-    public @JvmStatic fun getImplementationClassShortName(owner: CodegenContext<*>): String? =
+    @JvmStatic
+    public fun getImplementationClassShortName(owner: CodegenContext<*>): String? =
             getImplementationOwnerClassType(owner)?.let { AsmUtil.shortNameByAsmType(it) }
 
-    public @JvmStatic fun isImplClassOwner(owner: CodegenContext<*>): Boolean =
+    @JvmStatic
+    public fun isImplClassOwner(owner: CodegenContext<*>): Boolean =
             owner !is DelegatingFacadeContext
 }
\ No newline at end of file
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 5541d35d1be..cd4f46f9fb7 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt
@@ -30,7 +30,6 @@ import org.jetbrains.org.objectweb.asm.Type
 import org.jetbrains.org.objectweb.asm.signature.SignatureReader
 import org.jetbrains.org.objectweb.asm.signature.SignatureWriter
 import org.jetbrains.org.objectweb.asm.tree.*
-import kotlin.platform.platformStatic
 
 public class ReifiedTypeInliner(private val parametersMapping: ReifiedTypeParameterMappings?) {
 
@@ -56,10 +55,12 @@ public class ReifiedTypeInliner(private val parametersMapping: ReifiedTypeParame
             return insn.owner == IntrinsicMethods.INTRINSICS_CLASS_NAME && namePredicate(insn.name)
         }
 
-        platformStatic public fun isNeedClassReificationMarker(insn: AbstractInsnNode): Boolean =
+        @JvmStatic
+        public fun isNeedClassReificationMarker(insn: AbstractInsnNode): Boolean =
                 isReifiedMarker(insn) { s -> s == NEED_CLASS_REIFICATION_MARKER_METHOD_NAME }
 
-        platformStatic public fun putNeedClassReificationMarker(v: MethodVisitor) {
+        @JvmStatic
+        public fun putNeedClassReificationMarker(v: MethodVisitor) {
             v.visitMethodInsn(
                     Opcodes.INVOKESTATIC,
                     IntrinsicMethods.INTRINSICS_CLASS_NAME, NEED_CLASS_REIFICATION_MARKER_METHOD_NAME,
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 11fdf7ce1ce..b5c192b428b 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAPParser.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAPParser.kt
@@ -17,11 +17,10 @@
 package org.jetbrains.kotlin.codegen.inline
 
 import com.intellij.util.SmartFMap
-import kotlin.platform.platformStatic
 
 object SMAPParser {
 
-    @platformStatic
+    @JvmStatic
     /*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 +40,7 @@ object SMAPParser {
         return parse(mappingInfo)
     }
 
-    @platformStatic
+    @JvmStatic
     public fun parse(mappingInfo: String): SMAP {
         val fileMappings = linkedMapOf<Int, FileMapping>()
 
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 c33582dd718..3583370ee85 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<T : IntervalWithHandler>(val blocks: MutableList<T>) {
 
 
 fun <T : IntervalWithHandler> doClustering(blocks: List<T>): List<TryBlockCluster<T>> {
-    @data class TryBlockInterval(val startLabel: LabelNode, val endLabel: LabelNode)
+    data class TryBlockInterval(val startLabel: LabelNode, val endLabel: LabelNode)
 
     val clusters = linkedMapOf<TryBlockInterval, TryBlockCluster<T>>()
     blocks.forEach { block ->
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/pseudoInsns/PseudoInsns.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/pseudoInsns/PseudoInsns.kt
index 112c259daf4..eacbebbef63 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/pseudoInsns/PseudoInsns.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/pseudoInsns/PseudoInsns.kt
@@ -22,7 +22,6 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode
 import org.jetbrains.org.objectweb.asm.tree.InsnList
 import org.jetbrains.org.objectweb.asm.tree.MethodInsnNode
-import kotlin.platform.platformStatic
 
 public val PSEUDO_INSN_CALL_OWNER: String = "kotlin/jvm/internal/\$PseudoInsn"
 
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageLocation.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageLocation.kt
index afabf866c6f..22f65941aca 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageLocation.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageLocation.kt
@@ -16,8 +16,6 @@
 
 package org.jetbrains.kotlin.cli.common.messages
 
-import kotlin.platform.platformStatic
-
 public data class CompilerMessageLocation private constructor(
         public val path: String?,
         public val line: Int,
@@ -28,9 +26,11 @@ public data class CompilerMessageLocation private constructor(
             path + (if (line != -1 || column != -1) " (" + line + ":" + column + ")" else "")
 
     companion object {
-        public platformStatic val NO_LOCATION: CompilerMessageLocation = CompilerMessageLocation(null, -1, -1, null)
+        @JvmStatic
+        public val NO_LOCATION: CompilerMessageLocation = CompilerMessageLocation(null, -1, -1, null)
 
-        public platformStatic fun create(
+        @JvmStatic
+        public fun create(
                 path: String?,
                 line: Int,
                 column: Int,
diff --git a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt
index 16d53be3728..6dc5d110868 100644
--- a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt
+++ b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt
@@ -99,7 +99,7 @@ public object Main {
         runner.run(classpath, arguments)
     }
 
-    @jvmStatic
+    @JvmStatic
     public fun main(args: Array<String>) {
         try {
             run(args)
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
index 2c37df3e028..d0489d307f7 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
@@ -49,9 +49,7 @@ import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
 import java.lang.management.ManagementFactory
 import java.util.concurrent.TimeUnit
-import kotlin.platform.platformStatic
 
-SuppressWarnings("UseOfSystemOutOrSystemErr")
 public open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
 
     override fun doExecute(arguments: K2JVMCompilerArguments, services: Services, messageCollector: MessageCollector, rootDisposable: Disposable): ExitCode {
@@ -244,7 +242,8 @@ public open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
             }
         }
 
-        platformStatic public fun main(args: Array<String>) {
+        @JvmStatic
+        public fun main(args: Array<String>) {
             CLICompiler.doMain(K2JVMCompiler(), args)
         }
 
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 a18d2e1bebf..c165900ba01 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
+    @JvmStatic
     fun loadPlugins(arguments: CommonCompilerArguments, configuration: CompilerConfiguration) {
         val classLoader = PluginURLClassLoader(
                 arguments.pluginClasspaths
@@ -103,7 +103,8 @@ public object PluginCliParser {
 private class PluginURLClassLoader(urls: Array<URL>, parent: ClassLoader) : ClassLoader(Thread.currentThread().getContextClassLoader()) {
     private val childClassLoader: SelfThenParentURLClassLoader = SelfThenParentURLClassLoader(urls, parent)
 
-    override synchronized fun loadClass(name: String, resolve: Boolean): Class<*> {
+    @Synchronized
+    override fun loadClass(name: String, resolve: Boolean): Class<*> {
         return try {
             childClassLoader.findClass(name)
         }
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
index 7d044ffb2d8..500679cf82d 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
@@ -193,7 +193,7 @@ public class CliLightClassGenerationSupport(project: Project) : LightClassGenera
         }
     }
 
-    public open class CliBindingTrace TestOnly constructor() : BindingTraceContext() {
+    public open class CliBindingTrace @TestOnly constructor() : BindingTraceContext() {
         private var kotlinCodeAnalyzer: KotlinCodeAnalyzer? = null
 
         override fun toString(): String {
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
index 487dd244a0a..61340849585 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
@@ -87,7 +87,6 @@ import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
 import java.util.ArrayList
 import java.util.Comparator
-import kotlin.platform.platformStatic
 
 public class KotlinCoreEnvironment private constructor(
         parentDisposable: Disposable, 
@@ -250,7 +249,8 @@ public class KotlinCoreEnvironment private constructor(
         private var ourApplicationEnvironment: JavaCoreApplicationEnvironment? = null
         private var ourProjectCount = 0
 
-        platformStatic public fun createForProduction(
+        @JvmStatic
+        public fun createForProduction(
                 parentDisposable: Disposable, configuration: CompilerConfiguration, configFilePaths: List<String>
         ): KotlinCoreEnvironment {
             // JPS may run many instances of the compiler in parallel (there's an option for compiling independent modules in parallel in IntelliJ)
@@ -272,7 +272,9 @@ public class KotlinCoreEnvironment private constructor(
             return environment
         }
 
-        TestOnly platformStatic public fun createForTests(
+        @TestOnly
+        @JvmStatic
+        public fun createForTests(
                 parentDisposable: Disposable, configuration: CompilerConfiguration, extensionConfigs: List<String>
         ): KotlinCoreEnvironment {
             // Tests are supposed to create a single project and dispose it right after use
@@ -358,7 +360,8 @@ public class KotlinCoreEnvironment private constructor(
         }
 
         // made public for Upsource
-        platformStatic public fun registerApplicationServices(applicationEnvironment: JavaCoreApplicationEnvironment) {
+        @JvmStatic
+        public fun registerApplicationServices(applicationEnvironment: JavaCoreApplicationEnvironment) {
             with(applicationEnvironment) {
                 registerFileType(JetFileType.INSTANCE, "kt")
                 registerFileType(JetFileType.INSTANCE, JetParserDefinition.STD_SCRIPT_SUFFIX)
@@ -374,7 +377,8 @@ public class KotlinCoreEnvironment private constructor(
         }
 
         // made public for Upsource
-        platformStatic public fun registerProjectServices(projectEnvironment: JavaCoreProjectEnvironment) {
+        @JvmStatic
+        public fun registerProjectServices(projectEnvironment: JavaCoreProjectEnvironment) {
             with (projectEnvironment.getProject()) {
                 registerService(javaClass<JetScriptDefinitionProvider>(), JetScriptDefinitionProvider())
                 registerService(javaClass<KotlinJavaPsiFacade>(), KotlinJavaPsiFacade(this))
diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt b/compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt
index 83e893268b5..c7c20819735 100644
--- a/compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt
+++ b/compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt
@@ -31,7 +31,7 @@ public inline fun <reified T : Any> ComponentProvider.get(): T {
     return getService(javaClass<T>())
 }
 
-@suppress("UNCHECKED_CAST")
+@Suppress("UNCHECKED_CAST")
 public fun <T : Any> ComponentProvider.getService(request: Class<T>): T {
     return resolve(request)!!.getValue() as T
 }
diff --git a/compiler/container/tests/org/jetbrains/kotlin/container/tests/ComponentContainerTest.kt b/compiler/container/tests/org/jetbrains/kotlin/container/tests/ComponentContainerTest.kt
index 54ae5ad4e58..ce959621374 100644
--- a/compiler/container/tests/org/jetbrains/kotlin/container/tests/ComponentContainerTest.kt
+++ b/compiler/container/tests/org/jetbrains/kotlin/container/tests/ComponentContainerTest.kt
@@ -23,19 +23,22 @@ import javax.inject.Inject
 import kotlin.test.*
 
 class ComponentContainerTest {
-    Test fun should_throw_when_not_composed() {
+    @Test
+    fun should_throw_when_not_composed() {
         val container = StorageComponentContainer("test")
         fails {
             container.resolve<TestComponentInterface>()
         }
     }
 
-    Test fun should_resolve_to_null_when_empty() {
+    @Test
+    fun should_resolve_to_null_when_empty() {
         val container = createContainer("test") { }
         assertNull(container.resolve<TestComponentInterface>())
     }
 
-    Test fun should_resolve_to_instance_when_registered() {
+    @Test
+    fun should_resolve_to_instance_when_registered() {
         val container = createContainer("test") { useImpl<TestComponent>() }
 
         val descriptor = container.resolve<TestComponentInterface>()
@@ -47,7 +50,8 @@ class ComponentContainerTest {
         }
     }
 
-    Test fun should_resolve_instance_dependency() {
+    @Test
+    fun should_resolve_instance_dependency() {
         val container = createContainer("test") {
             useInstance(ManualTestComponent("name"))
             useImpl<TestClientComponent>()
@@ -68,7 +72,8 @@ class ComponentContainerTest {
         assertFalse(instance.dep.disposed) // should not dispose manually passed instances
     }
 
-    Test fun should_resolve_type_dependency() {
+    @Test
+    fun should_resolve_type_dependency() {
         val container = createContainer("test") {
             useImpl<TestComponent>()
             useImpl<TestClientComponent>()
@@ -87,7 +92,8 @@ class ComponentContainerTest {
         assertTrue(instance.dep.disposed)
     }
 
-    Test fun should_resolve_multiple_types() {
+    @Test
+    fun should_resolve_multiple_types() {
         createContainer("test") {
             useImpl<TestComponent>()
             useImpl<TestClientComponent>()
@@ -99,7 +105,8 @@ class ComponentContainerTest {
         }
     }
 
-    Test fun should_resolve_singleton_types_to_same_instances() {
+    @Test
+    fun should_resolve_singleton_types_to_same_instances() {
         createContainer("test") {
             useImpl<TestComponent>()
             useImpl<TestClientComponent>()
@@ -113,7 +120,8 @@ class ComponentContainerTest {
         }
     }
 
-    Test fun should_resolve_adhoc_types_to_same_instances() {
+    @Test
+    fun should_resolve_adhoc_types_to_same_instances() {
         createContainer("test") {
             useImpl<TestAdhocComponent1>()
             useImpl<TestAdhocComponent2>()
@@ -128,7 +136,8 @@ class ComponentContainerTest {
         }
     }
 
-    Test fun should_resolve_iterable() {
+    @Test
+    fun should_resolve_iterable() {
         createContainer("test") {
             useImpl<TestComponent>()
             useImpl<TestClientComponent>()
@@ -144,7 +153,8 @@ class ComponentContainerTest {
         }
     }
 
-    Test fun should_resolve_java_iterable() {
+    @Test
+    fun should_resolve_java_iterable() {
         createContainer("test") {
             useImpl<TestComponent>()
             useImpl<TestClientComponent>()
@@ -163,7 +173,8 @@ class ComponentContainerTest {
         }
     }
 
-    Test fun should_distinguish_generic() {
+    @Test
+    fun should_distinguish_generic() {
         createContainer("test") {
             useImpl<TestGenericClient>()
             useImpl<TestStringComponent>()
@@ -177,8 +188,9 @@ class ComponentContainerTest {
         }
     }
 
-    Ignore("Need generic type substitution")
-    Test fun should_resolve_generic_adhoc() {
+    @Ignore("Need generic type substitution")
+    @Test
+    fun should_resolve_generic_adhoc() {
         createContainer("test") {
             useImpl<TestImplicitGenericClient>()
         }.use {
@@ -189,7 +201,8 @@ class ComponentContainerTest {
         }
     }
 
-    Test fun should_fail_with_invalid_cardinality() {
+    @Test
+    fun should_fail_with_invalid_cardinality() {
         createContainer("test") {
             useImpl<TestComponent>()
             useInstance(TestComponent())
@@ -211,7 +224,8 @@ class ComponentContainerTest {
             }
     }
 
-    Test fun should_inject_properties_of_singletons() {
+    @Test
+    fun should_inject_properties_of_singletons() {
         val withSetters = createContainer("test") {
             useImpl<WithSetters>()
         }.get<WithSetters>()
@@ -219,7 +233,8 @@ class ComponentContainerTest {
         assertTrue(withSetters.isSetterCalled)
     }
 
-    Test fun should_not_inject_properties_of_instances() {
+    @Test
+    fun should_not_inject_properties_of_instances() {
         val withSetters = WithSetters()
         createContainer("test") {
             useInstance(withSetters)
@@ -228,7 +243,8 @@ class ComponentContainerTest {
         assertFalse(withSetters.isSetterCalled)
     }
 
-    Test fun should_discover_dependencies_recursively() {
+    @Test
+    fun should_discover_dependencies_recursively() {
         class C
 
         class B {
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt
index cdaf062fa1b..02536cc9f36 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt
@@ -35,38 +35,46 @@ public object JvmFileClassUtil {
     public val JVM_MULTIFILE_CLASS: FqName = FqName("kotlin.jvm.JvmMultifileClass")
     public val JVM_MULTIFILE_CLASS_SHORT = JVM_MULTIFILE_CLASS.shortName().asString()
 
-    public @JvmStatic fun getFileClassInfo(file: JetFile, jvmFileClassAnnotations: ParsedJmvFileClassAnnotations?): JvmFileClassInfo =
+    @JvmStatic
+    public fun getFileClassInfo(file: JetFile, jvmFileClassAnnotations: ParsedJmvFileClassAnnotations?): JvmFileClassInfo =
             if (jvmFileClassAnnotations != null)
                 getFileClassInfoForAnnotation(file, jvmFileClassAnnotations)
             else
                 getDefaultFileClassInfo(file)
 
-    public @JvmStatic fun getFileClassInfoForAnnotation(file: JetFile, jvmFileClassAnnotations: ParsedJmvFileClassAnnotations): JvmFileClassInfo =
+    @JvmStatic
+    public fun getFileClassInfoForAnnotation(file: JetFile, jvmFileClassAnnotations: ParsedJmvFileClassAnnotations): JvmFileClassInfo =
             if (jvmFileClassAnnotations.multipleFiles)
                 JvmMultifileClassPartInfo(getHiddenPartFqName(file, jvmFileClassAnnotations),
                                           getFacadeFqName(file, jvmFileClassAnnotations))
             else
                 JvmSimpleFileClassInfo(getFacadeFqName(file, jvmFileClassAnnotations), true)
 
-    public @JvmStatic fun getDefaultFileClassInfo(file: JetFile): JvmFileClassInfo =
+    @JvmStatic
+    public fun getDefaultFileClassInfo(file: JetFile): JvmFileClassInfo =
             JvmSimpleFileClassInfo(PackagePartClassUtils.getPackagePartFqName(file.packageFqName, file.name), false)
 
-    public @JvmStatic fun getFacadeFqName(file: JetFile, jvmFileClassAnnotations: ParsedJmvFileClassAnnotations): FqName =
+    @JvmStatic
+    public fun getFacadeFqName(file: JetFile, jvmFileClassAnnotations: ParsedJmvFileClassAnnotations): FqName =
             file.packageFqName.child(Name.identifier(jvmFileClassAnnotations.name))
 
-    public @JvmStatic fun getPartFqNameForDeserializedCallable(callable: DeserializedCallableMemberDescriptor): FqName {
+    @JvmStatic
+    public fun getPartFqNameForDeserializedCallable(callable: DeserializedCallableMemberDescriptor): FqName {
         val implClassName = getImplClassName(callable)
         val packageFqName = (callable.containingDeclaration as PackageFragmentDescriptor).fqName
         return packageFqName.child(implClassName)
     }
 
-    public @JvmStatic fun getImplClassName(callable: DeserializedCallableMemberDescriptor): Name =
+    @JvmStatic
+    public fun getImplClassName(callable: DeserializedCallableMemberDescriptor): Name =
             callable.nameResolver.getName(callable.proto.getExtension(JvmProtoBuf.implClassName))
 
-    public @JvmStatic fun getHiddenPartFqName(file: JetFile, jvmFileClassAnnotations: ParsedJmvFileClassAnnotations): FqName =
+    @JvmStatic
+    public fun getHiddenPartFqName(file: JetFile, jvmFileClassAnnotations: ParsedJmvFileClassAnnotations): FqName =
             file.packageFqName.child(Name.identifier(manglePartName(jvmFileClassAnnotations.name, file.name)))
 
-    public @JvmStatic fun getMultifilePackageFacadePartInfo(file: JetFile): JvmFileClassInfo {
+    @JvmStatic
+    public fun getMultifilePackageFacadePartInfo(file: JetFile): JvmFileClassInfo {
         val packageFqName = file.packageFqName
         val packageFacadeFqName = PackageClassUtils.getPackageClassFqName(packageFqName)
         val filePartName = manglePartName(packageFacadeFqName.shortName().asString(), file.name)
@@ -74,13 +82,16 @@ public object JvmFileClassUtil {
         return JvmMultifileClassPartInfo(filePartFqName, packageFacadeFqName)
     }
 
-    public @JvmStatic fun manglePartName(facadeName: String, fileName: String): String =
+    @JvmStatic
+    public fun manglePartName(facadeName: String, fileName: String): String =
             "${facadeName}__${PackagePartClassUtils.getFilePartShortName(fileName)}"
 
-    public @JvmStatic fun getFileClassInfoNoResolve(file: JetFile): JvmFileClassInfo =
+    @JvmStatic
+    public fun getFileClassInfoNoResolve(file: JetFile): JvmFileClassInfo =
             getFileClassInfo(file, parseJvmNameOnFileNoResolve(file))
 
-    public @JvmStatic fun parseJvmNameOnFileNoResolve(file: JetFile): ParsedJmvFileClassAnnotations? {
+    @JvmStatic
+    public fun parseJvmNameOnFileNoResolve(file: JetFile): ParsedJmvFileClassAnnotations? {
         val jvmName = findAnnotationEntryOnFileNoResolve(file, JVM_NAME_SHORT) ?: return null
         val nameExpr = jvmName.valueArguments.firstOrNull()?.getArgumentExpression() ?: return null
         val name = getLiteralStringFromRestrictedConstExpression(nameExpr) ?: return null
@@ -89,7 +100,8 @@ public object JvmFileClassUtil {
         return ParsedJmvFileClassAnnotations(name, isMultifileClassPart)
     }
 
-    public @JvmStatic fun findAnnotationEntryOnFileNoResolve(file: JetFile, shortName: String): JetAnnotationEntry? =
+    @JvmStatic
+    public fun findAnnotationEntryOnFileNoResolve(file: JetFile, shortName: String): JetAnnotationEntry? =
             file.fileAnnotationList?.annotationEntries?.firstOrNull {
                 it.calleeExpression?.constructorReferenceExpression?.getReferencedName() == shortName
             }
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/jvm/RuntimeAssertions.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/jvm/RuntimeAssertions.kt
index 9b4be230f03..51382bcf1ac 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/jvm/RuntimeAssertions.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/jvm/RuntimeAssertions.kt
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.types.JetType
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.checker.JetTypeChecker
 import org.jetbrains.kotlin.types.upperIfFlexible
-import kotlin.platform.platformStatic
 
 public class RuntimeAssertionInfo(public val needNotNullAssertion: Boolean, public val message: String) {
     public interface DataFlowExtras {
@@ -47,7 +46,8 @@ public class RuntimeAssertionInfo(public val needNotNullAssertion: Boolean, publ
     }
 
     companion object {
-        platformStatic public fun create(
+        @JvmStatic
+        public fun create(
                 expectedType: JetType,
                 expressionType: JetType,
                 dataFlowExtras: DataFlowExtras
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 9090088823d..fc97255d6e9 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
@@ -24,7 +24,8 @@ import org.jetbrains.kotlin.resolve.BindingTrace
 import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer
 
 public open class JavaClassFinderPostConstruct {
-    PostConstruct public open fun postCreate() {}
+    @PostConstruct
+    public open fun postCreate() {}
 }
 
 public class JavaLazyAnalyzerPostConstruct : JavaClassFinderPostConstruct() {
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt
index d9d40bf5648..bc935aa2886 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt
@@ -38,7 +38,7 @@ public object SamConversionResolverImpl : SamConversionResolver {
         return SingleAbstractMethodUtils.createSamConstructorFunction(scope.getContainingDeclaration(), classifier)
     }
 
-    suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     override fun <D : FunctionDescriptor> resolveSamAdapter(original: D): D? {
         return when {
             !SingleAbstractMethodUtils.isSamAdapterNecessary(original) -> null
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinder.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinder.kt
index b895524a78b..90171fec7a1 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinder.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinder.kt
@@ -19,11 +19,10 @@ package org.jetbrains.kotlin.load.kotlin
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
-import kotlin.platform.platformStatic
 
 public interface JvmVirtualFileFinder : VirtualFileFinder, KotlinClassFinder {
     public object SERVICE {
-        platformStatic
+        @JvmStatic
         public fun getInstance(project: Project): JvmVirtualFileFinder =
             ServiceManager.getService(project, javaClass<JvmVirtualFileFinderFactory>()).create(GlobalSearchScope.allScope(project))
     }
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinderFactory.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinderFactory.kt
index 1b496ad00e2..cb053601aa8 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinderFactory.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinderFactory.kt
@@ -19,13 +19,12 @@ package org.jetbrains.kotlin.load.kotlin
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
-import kotlin.platform.platformStatic
 
 public interface JvmVirtualFileFinderFactory : VirtualFileFinderFactory {
     override fun create(scope: GlobalSearchScope): JvmVirtualFileFinder
 
     public object SERVICE {
-        platformStatic
+        @JvmStatic
         public fun getInstance(project: Project): JvmVirtualFileFinderFactory =
             ServiceManager.getService(project, javaClass<JvmVirtualFileFinderFactory>())
     }
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt
index f75617574d4..3aa3d481038 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt
@@ -31,7 +31,8 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 import java.util.*
 
 public object PackagePartClassUtils {
-    public @JvmStatic fun getPathHashCode(file: VirtualFile): Int =
+    @JvmStatic
+    public fun getPathHashCode(file: VirtualFile): Int =
             file.path.toLowerCase().hashCode()
 
     private val PART_CLASS_NAME_SUFFIX = "Kt"
@@ -54,35 +55,43 @@ public object PackagePartClassUtils {
                 "_$str"
 
     @TestOnly
-    public @JvmStatic fun getDefaultPartFqName(facadeClassFqName: FqName, file: VirtualFile): FqName =
+    @JvmStatic
+    public fun getDefaultPartFqName(facadeClassFqName: FqName, file: VirtualFile): FqName =
             getPackagePartFqName(facadeClassFqName.parent(), file.name)
 
-    public @JvmStatic fun getPackagePartFqName(packageFqName: FqName, fileName: String): FqName {
+    @JvmStatic
+    public fun getPackagePartFqName(packageFqName: FqName, fileName: String): FqName {
         val partClassName = getFilePartShortName(fileName)
         return packageFqName.child(Name.identifier(partClassName))
     }
 
     @Deprecated("Migrate to JvmFileClassesProvider")
-    public @JvmStatic fun getPackagePartInternalName(file: JetFile): String =
+    @JvmStatic
+    public fun getPackagePartInternalName(file: JetFile): String =
             JvmClassName.byFqNameWithoutInnerClasses(getPackagePartFqName(file)).internalName
 
     @Deprecated("Migrate to JvmFileClassesProvider")
-    public @JvmStatic fun getPackagePartFqName(file: JetFile): FqName =
+    @JvmStatic
+    public fun getPackagePartFqName(file: JetFile): FqName =
             getPackagePartFqName(file.packageFqName, file.name)
 
-    public @JvmStatic fun getPackagePartFqName(callable: DeserializedCallableMemberDescriptor): FqName {
+    @JvmStatic
+    public fun getPackagePartFqName(callable: DeserializedCallableMemberDescriptor): FqName {
         val implClassName = callable.nameResolver.getName(callable.proto.getExtension(JvmProtoBuf.implClassName))
         val packageFqName = (callable.containingDeclaration as PackageFragmentDescriptor).fqName
         return packageFqName.child(implClassName)
     }
 
-    public @JvmStatic fun getFilesWithCallables(files: Collection<JetFile>): List<JetFile> =
+    @JvmStatic
+    public fun getFilesWithCallables(files: Collection<JetFile>): List<JetFile> =
             files.filter { fileHasTopLevelCallables(it) }
 
-    public @JvmStatic fun fileHasTopLevelCallables(file: JetFile): Boolean =
+    @JvmStatic
+    public fun fileHasTopLevelCallables(file: JetFile): Boolean =
             file.declarations.any { it is JetProperty || it is JetNamedFunction }
 
-    public @JvmStatic fun getFilePartShortName(fileName: String): String =
+    @JvmStatic
+    public fun getFilePartShortName(fileName: String): String =
             getPartClassName(FileUtil.getNameWithoutExtension(fileName))
 
 }
\ No newline at end of file
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt
index 81cb027b552..e723a260a7e 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt
@@ -53,7 +53,7 @@ public class VirtualFileKotlinClass private constructor(
         private val LOG = Logger.getInstance(javaClass<VirtualFileKotlinClass>())
         private val perfCounter = PerformanceCounter.create("Binary class from Kotlin file")
 
-        deprecated("Use KotlinBinaryClassCache")
+        @Deprecated("Use KotlinBinaryClassCache")
         fun create(file: VirtualFile): VirtualFileKotlinClass? {
             return perfCounter.time {
                 assert(file.getFileType() == JavaClassFileType.INSTANCE) { "Trying to read binary data from a non-class file $file" }
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackagePartProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackagePartProvider.kt
index 3e5f57332e3..239001e812a 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackagePartProvider.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackagePartProvider.kt
@@ -43,7 +43,7 @@ internal class IncrementalPackagePartProvider private constructor(
     }
 
     companion object {
-        @jvmStatic
+        @JvmStatic
         public fun create(
                 parent: PackagePartProvider,
                 sourceFiles: Collection<JetFile>,
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt
index a7bb36d6e0c..01bdfb9420b 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.resolve.TargetEnvironment
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession
 import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService
 import java.util.ArrayList
-import kotlin.platform.platformStatic
 
 public class JvmPlatformParameters(
         public val moduleByJavaClass: (JavaClass) -> ModuleInfo
@@ -84,7 +83,8 @@ public object JvmAnalyzerFacade : AnalyzerFacade<JvmPlatformParameters>() {
     override val moduleParameters: ModuleParameters
         get() = TopDownAnalyzerFacadeForJVM.JVM_MODULE_PARAMETERS
 
-    public platformStatic fun getAllFilesToAnalyze(project: Project, moduleInfo: ModuleInfo?, baseFiles: Collection<JetFile>): List<JetFile> {
+    @JvmStatic
+    public fun getAllFilesToAnalyze(project: Project, moduleInfo: ModuleInfo?, baseFiles: Collection<JetFile>): List<JetFile> {
         val allFiles = ArrayList(baseFiles)
         for (externalDeclarationsProvider in ExternalDeclarationsProvider.getInstances(project)) {
             allFiles.addAll(externalDeclarationsProvider.getExternalDeclarations(moduleInfo))
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt
index a8bc9825c6e..66a3a34c0e9 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt
@@ -166,7 +166,7 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager) : JetScopeImp
     private fun collectSyntheticPropertiesByName(result: SmartList<PropertyDescriptor>?, type: TypeConstructor, name: Name, processedTypes: MutableSet<TypeConstructor>?): SmartList<PropertyDescriptor>? {
         if (processedTypes != null && !processedTypes.add(type)) return result
 
-        @suppress("NAME_SHADOWING")
+        @Suppress("NAME_SHADOWING")
         var result = result
 
         val classifier = type.declarationDescriptor
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt
index c9b8b395f5c..05e4bbdb7d9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.analyzer
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.types.ErrorUtils
-import kotlin.platform.platformStatic
 
 public data open class AnalysisResult protected constructor(
         public val bindingContext: BindingContext,
@@ -43,15 +42,18 @@ public data open class AnalysisResult protected constructor(
     companion object {
         public val EMPTY: AnalysisResult = success(BindingContext.EMPTY, ErrorUtils.getErrorModule())
 
-        platformStatic public fun success(bindingContext: BindingContext, module: ModuleDescriptor): AnalysisResult {
+        @JvmStatic
+        public fun success(bindingContext: BindingContext, module: ModuleDescriptor): AnalysisResult {
             return AnalysisResult(bindingContext, module, true)
         }
 
-        platformStatic public fun success(bindingContext: BindingContext, module: ModuleDescriptor, shouldGenerateCode: Boolean): AnalysisResult {
+        @JvmStatic
+        public fun success(bindingContext: BindingContext, module: ModuleDescriptor, shouldGenerateCode: Boolean): AnalysisResult {
             return AnalysisResult(bindingContext, module, shouldGenerateCode)
         }
 
-        platformStatic public fun error(bindingContext: BindingContext, error: Throwable): AnalysisResult {
+        @JvmStatic
+        public fun error(bindingContext: BindingContext, error: Throwable): AnalysisResult {
             return Error(bindingContext, error)
         }
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt
index ae91aa6abb2..6f9a0841927 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt
@@ -36,7 +36,7 @@ public class PseudocodeVariableDataCollector(
 ) {
     val lexicalScopeVariableInfo = computeLexicalScopeVariableInfo(pseudocode)
 
-    suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     public fun <D> collectData(
             traversalOrder: TraversalOrder,
             mergeDataWithLocalDeclarations: Boolean,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt
index 2649798f09f..60e6286a3e5 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt
@@ -197,7 +197,7 @@ public fun getExpectedTypePredicate(value: PseudoValue, bindingContext: BindingC
                     }
                 }
 
-                is MagicInstruction -> @suppress("NON_EXHAUSTIVE_WHEN") when (it.kind) {
+                is MagicInstruction -> @Suppress("NON_EXHAUSTIVE_WHEN") when (it.kind) {
                     AND, OR ->
                         addSubtypesOf(builtIns.getBooleanType())
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt b/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt
index 8d3af019319..be0aa6c3261 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt
@@ -112,14 +112,14 @@ public fun ContextForNewModule(
     return MutableModuleContextImpl(module, projectContext)
 }
 
-deprecated("Used temporarily while we are in transition from to lazy resolve")
+@Deprecated("Used temporarily while we are in transition from to lazy resolve")
 public open class TypeLazinessToken {
-    deprecated("Used temporarily while we are in transition from to lazy resolve")
+    @Deprecated("Used temporarily while we are in transition from to lazy resolve")
     public open fun isLazy(): Boolean = false
 }
 
-deprecated("Used temporarily while we are in transition from to lazy resolve")
+@Deprecated("Used temporarily while we are in transition from to lazy resolve")
 public class LazyResolveToken : TypeLazinessToken() {
-    deprecated("Used temporarily while we are in transition from to lazy resolve")
+    @Deprecated("Used temporarily while we are in transition from to lazy resolve")
     override fun isLazy() = true
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
index cee751b22ce..feaed65970c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.kotlin.utils.sure
-import kotlin.platform.platformStatic
 
 public object PositioningStrategies {
     private open class DeclarationHeader<T : JetDeclaration> : PositioningStrategy<T>() {
@@ -234,7 +233,7 @@ public object PositioningStrategies {
         }
     }
 
-    platformStatic
+    @JvmStatic
     public fun modifierSetPosition(vararg tokens: JetModifierKeywordToken): PositioningStrategy<JetModifierListOwner> {
         return object : PositioningStrategy<JetModifierListOwner>() {
             override fun mark(element: JetModifierListOwner): List<TextRange> {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt
index 7fa90560531..04cc406e9f8 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt
@@ -48,7 +48,6 @@ import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.types.checker.JetTypeChecker
 import java.io.PrintWriter
 import java.io.StringWriter
-import kotlin.platform.platformStatic
 
 public object Renderers {
 
@@ -107,7 +106,7 @@ public object Renderers {
                 .joinToString(separator = "\n", prefix = "\n") { DescriptorRenderer.FQ_NAMES_IN_TYPES.render(it) }
     }
 
-    platformStatic
+    @JvmStatic
     public fun <T> commaSeparated(itemRenderer: Renderer<T>): Renderer<Collection<T>> = Renderer {
         collection ->
         StringBuilder {
@@ -142,7 +141,7 @@ public object Renderers {
         renderCannotCaptureTypeParameterError(it, TabledDescriptorRenderer.create()).toString()
     }
 
-    platformStatic
+    @JvmStatic
     public fun renderConflictingSubstitutionsInferenceError(
             inferenceErrorData: InferenceErrorData, result: TabledDescriptorRenderer
     ): TabledDescriptorRenderer {
@@ -197,7 +196,7 @@ public object Renderers {
         return result
     }
 
-    platformStatic
+    @JvmStatic
     public fun renderParameterConstraintError(
             inferenceErrorData: InferenceErrorData, renderer: TabledDescriptorRenderer
     ): TabledDescriptorRenderer {
@@ -214,7 +213,7 @@ public object Renderers {
     }
 
 
-    platformStatic
+    @JvmStatic
     public fun renderNoInformationForParameterError(
             inferenceErrorData: InferenceErrorData, result: TabledDescriptorRenderer
     ): TabledDescriptorRenderer {
@@ -239,7 +238,7 @@ public object Renderers {
                                .text("Please specify it explicitly."))
     }
 
-    platformStatic
+    @JvmStatic
     public fun renderUpperBoundViolatedInferenceError(
             inferenceErrorData: InferenceErrorData, result: TabledDescriptorRenderer
     ): TabledDescriptorRenderer {
@@ -298,7 +297,7 @@ public object Renderers {
         return result
     }
 
-    platformStatic
+    @JvmStatic
     public fun renderCannotCaptureTypeParameterError(
             inferenceErrorData: InferenceErrorData, result: TabledDescriptorRenderer
     ): TabledDescriptorRenderer {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
index 823b36dbd64..2a3216b9833 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
@@ -122,7 +122,7 @@ public fun createContainerForLazyResolve(
     useImpl<ResolveSession>()
 }
 
-jvmOverloads
+@JvmOverloads
 public fun createLazyResolveSession(
         moduleContext: ModuleContext,
         declarationProviderFactory: DeclarationProviderFactory,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt
index 2e124631934..16f596c9ba3 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt
@@ -30,7 +30,8 @@ import kotlin.platform.*
  */
 class KDocLinkParser(): PsiParser {
     companion object {
-        platformStatic public fun parseMarkdownLink(root: IElementType, chameleon: ASTNode): ASTNode {
+        @JvmStatic
+        public fun parseMarkdownLink(root: IElementType, chameleon: ASTNode): ASTNode {
             val parentElement = chameleon.getTreeParent().getPsi()
             val project = parentElement.getProject()
             val builder = PsiBuilderFactory.getInstance().createBuilder(project,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt
index 68df09b80c4..42e2857b715 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.kt
@@ -109,7 +109,7 @@ abstract public class JetClassOrObject :
 
     public fun getSecondaryConstructors(): List<JetSecondaryConstructor> = getBody()?.getSecondaryConstructors().orEmpty()
 
-    deprecated(value = "It's no more possible to determine it exactly using AST. Use ClassDescriptor.getKind() instead")
+    @Deprecated(value = "It's no more possible to determine it exactly using AST. Use ClassDescriptor.getKind() instead")
     public fun isAnnotation(): Boolean =
             getAnnotation(KotlinBuiltIns.FQ_NAMES.annotation.shortName().asString()) != null || hasModifier(JetTokens.ANNOTATION_KEYWORD)
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructor.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructor.kt
index f575d5a98f3..70194003328 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructor.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructor.kt
@@ -43,7 +43,7 @@ public abstract class JetConstructor<T : JetConstructor<T>> : JetDeclarationStub
 
     override fun getTypeReference() = null
 
-    throws(IncorrectOperationException::class)
+    @Throws(IncorrectOperationException::class)
     override fun setTypeReference(typeRef: JetTypeReference?) = throw IncorrectOperationException("setTypeReference to constructor")
 
     override fun getColon() = findChildByType<PsiElement>(JetTokens.COLON)
@@ -76,7 +76,7 @@ public abstract class JetConstructor<T : JetConstructor<T>> : JetDeclarationStub
 
     override fun getNameIdentifier() = null
 
-    throws(IncorrectOperationException::class)
+    @Throws(IncorrectOperationException::class)
     override fun setName(name: String): PsiElement = throw IncorrectOperationException("setName to constructor")
 
     override fun getPresentation() = ItemPresentationProviders.getItemPresentation(this)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElement.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElement.kt
index fefb3bab1a3..38446d35773 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElement.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElement.kt
@@ -26,7 +26,7 @@ public interface JetElement : NavigatablePsiElement {
 
     public fun <R, D> accept(visitor: JetVisitor<R, D>, data: D): R
 
-    @deprecated("Don't use getReference() on JetElement for the choice is unpredictable")
+    @Deprecated("Don't use getReference() on JetElement for the choice is unpredictable")
     override fun getReference(): PsiReference?
 }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.kt
index 7f005751faa..9e213b54881 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.kt
@@ -50,7 +50,7 @@ public class JetObjectDeclaration : JetClassOrObject {
 
     override fun getNameIdentifier(): PsiElement? = getNameAsDeclaration()?.getNameIdentifier()
 
-    override fun setName(NonNls name: String): PsiElement {
+    override fun setName(@NonNls name: String): PsiElement {
         val declarationName = getNameAsDeclaration()
         if (declarationName == null) {
             val psiFactory = JetPsiFactory(getProject())
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt
index 08c8f377409..3318fb90123 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt
@@ -180,7 +180,7 @@ public class JetPsiFactory(private val project: Project) {
         val file = createFile(text)
         val declarations = file.getDeclarations()
         assert(declarations.size() == 1) { "${declarations.size()} declarations in $text" }
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         val result = declarations.first() as TDeclaration
         return result
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/ValueArgument.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/ValueArgument.kt
index d4ac812f75b..a515f46f095 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/ValueArgument.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/ValueArgument.kt
@@ -20,7 +20,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.kotlin.name.Name
 
 public interface ValueArgument {
-    IfNotParsed
+    @IfNotParsed
     public fun getArgumentExpression(): JetExpression?
 
     public fun getArgumentName(): ValueArgumentName?
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt
index 217f54b9c6e..0bdbc6e4718 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt
@@ -93,7 +93,7 @@ public fun <TElement : JetElement> createByPattern(pattern: String, vararg args:
     }
 
     // convert arguments that can be converted into plain text
-    @suppress("NAME_SHADOWING")
+    @Suppress("NAME_SHADOWING")
     val args = args.zip(argumentTypes).map {
         val (arg, type) = it
         if (type is PlainTextArgumentType)
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 2b56e048568..38d2aebabb9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt
@@ -90,7 +90,7 @@ public fun PsiElement.getParentOfTypesAndPredicate<T : PsiElement>(
 ): T? {
     var element = if (strict) getParent() else this
     while (element != null) {
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         when {
             (parentClasses.isEmpty() || parentClasses.any { parentClass -> parentClass.isInstance(element) }) && predicate(element!! as T) ->
                 return element as T
@@ -144,7 +144,7 @@ public inline fun PsiElement.getParentOfTypeAndBranch<reified T : PsiElement>(st
     return getParentOfType<T>(strict)?.getIfChildIsInBranch(this, branch)
 }
 
-public tailRecursive fun PsiElement.getOutermostParentContainedIn(container: PsiElement): PsiElement? {
+public tailrec fun PsiElement.getOutermostParentContainedIn(container: PsiElement): PsiElement? {
     val parent = getParent()
     return if (parent == container) this else parent?.getOutermostParentContainedIn(container)
 }
@@ -157,7 +157,7 @@ public inline fun <reified T : PsiElement> PsiElement.forEachDescendantOfType(no
     forEachDescendantOfType<T>({ true }, action)
 }
 
-public inline fun <reified T : PsiElement> PsiElement.forEachDescendantOfType(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) canGoInside: (PsiElement) -> Boolean, noinline action: (T) -> Unit) {
+public inline fun <reified T : PsiElement> PsiElement.forEachDescendantOfType(crossinline canGoInside: (PsiElement) -> Boolean, noinline action: (T) -> Unit) {
     this.accept(object : PsiRecursiveElementVisitor() {
         override fun visitElement(element: PsiElement) {
             if (canGoInside(element)) {
@@ -175,7 +175,7 @@ public inline fun <reified T : PsiElement> PsiElement.anyDescendantOfType(noinli
     return findDescendantOfType<T>(predicate) != null
 }
 
-public inline fun <reified T : PsiElement> PsiElement.anyDescendantOfType(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) canGoInside: (PsiElement) -> Boolean, noinline predicate: (T) -> Boolean = { true }): Boolean {
+public inline fun <reified T : PsiElement> PsiElement.anyDescendantOfType(crossinline canGoInside: (PsiElement) -> Boolean, noinline predicate: (T) -> Boolean = { true }): Boolean {
     return findDescendantOfType<T>(canGoInside, predicate) != null
 }
 
@@ -183,7 +183,7 @@ public inline fun <reified T : PsiElement> PsiElement.findDescendantOfType(noinl
     return findDescendantOfType<T>({ true }, predicate)
 }
 
-public inline fun <reified T : PsiElement> PsiElement.findDescendantOfType(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) canGoInside: (PsiElement) -> Boolean, noinline predicate: (T) -> Boolean = { true }): T? {
+public inline fun <reified T : PsiElement> PsiElement.findDescendantOfType(crossinline canGoInside: (PsiElement) -> Boolean, noinline predicate: (T) -> Boolean = { true }): T? {
     var result: T? = null
     this.accept(object : PsiRecursiveElementVisitor() {
         override fun visitElement(element: PsiElement) {
@@ -206,7 +206,7 @@ public inline fun <reified T : PsiElement> PsiElement.collectDescendantsOfType(n
     return collectDescendantsOfType<T>({ true }, predicate)
 }
 
-public inline fun <reified T : PsiElement> PsiElement.collectDescendantsOfType(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) canGoInside: (PsiElement) -> Boolean, noinline predicate: (T) -> Boolean = { true }): List<T> {
+public inline fun <reified T : PsiElement> PsiElement.collectDescendantsOfType(crossinline canGoInside: (PsiElement) -> Boolean, noinline predicate: (T) -> Boolean = { true }): List<T> {
     val result = ArrayList<T>()
     forEachDescendantOfType<T>(canGoInside) {
         if (predicate(it)) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetEnumEntrySuperClassReferenceExpressionElementType.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetEnumEntrySuperClassReferenceExpressionElementType.kt
index a18977a9a3d..f0c14195c4f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetEnumEntrySuperClassReferenceExpressionElementType.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetEnumEntrySuperClassReferenceExpressionElementType.kt
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetEnumEntrySuperclassReferenceExpression
 import org.jetbrains.kotlin.psi.stubs.KotlinEnumEntrySuperclassReferenceExpressionStub
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinEnumEntrySuperclassReferenceExpressionStubImpl
 
-public class JetEnumEntrySuperClassReferenceExpressionElementType(NonNls debugName: String)
+public class JetEnumEntrySuperClassReferenceExpressionElementType(@NonNls debugName: String)
     : JetStubElementType<KotlinEnumEntrySuperclassReferenceExpressionStub, JetEnumEntrySuperclassReferenceExpression>(
         debugName,
         javaClass<JetEnumEntrySuperclassReferenceExpression>(),
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.kt
index 8a85cfcfe6c..20ffda95aa0 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.kt
@@ -48,13 +48,13 @@ public open class StubIndexService protected constructor() {
         return KotlinFileStubImpl(file, file.packageFqNameByTree.asString(), file.isScriptByTree)
     }
 
-    throws(IOException::class)
+    @Throws(IOException::class)
     public open fun serializeFileStub(stub: KotlinFileStub, dataStream: StubOutputStream) {
         dataStream.writeName(stub.getPackageFqName().asString())
         dataStream.writeBoolean(stub.isScript())
     }
 
-    throws(IOException::class)
+    @Throws(IOException::class)
     public open fun deserializeFileStub(dataStream: StubInputStream): KotlinFileStub {
         val packageFqNameAsString = dataStream.readName()
         val isScript = dataStream.readBoolean()
@@ -62,7 +62,7 @@ public open class StubIndexService protected constructor() {
     }
 
     companion object {
-        @jvmStatic
+        @JvmStatic
         public fun getInstance(): StubIndexService {
             return ServiceManager.getService(StubIndexService::class.java) ?: NO_INDEX
         }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/ModifierMaskUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/ModifierMaskUtils.kt
index eb52ee99178..59af6e3fccb 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/ModifierMaskUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/ModifierMaskUtils.kt
@@ -20,16 +20,17 @@ import org.jetbrains.kotlin.psi.JetModifierList
 
 import org.jetbrains.kotlin.lexer.JetTokens.MODIFIER_KEYWORDS_ARRAY
 import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
-import kotlin.platform.platformStatic
 
 public object ModifierMaskUtils {
     init {
         assert(MODIFIER_KEYWORDS_ARRAY.size() <= 32, "Current implementation depends on the ability to represent modifier list as bit mask")
     }
 
-    platformStatic public fun computeMaskFromModifierList(modifierList: JetModifierList): Int = computeMask { modifierList.hasModifier(it) }
+    @JvmStatic
+    public fun computeMaskFromModifierList(modifierList: JetModifierList): Int = computeMask { modifierList.hasModifier(it) }
 
-    platformStatic public fun computeMask(hasModifier: (JetModifierKeywordToken) -> Boolean): Int {
+    @JvmStatic
+    public fun computeMask(hasModifier: (JetModifierKeywordToken) -> Boolean): Int {
         var mask = 0
         for ((index, modifierKeywordToken) in MODIFIER_KEYWORDS_ARRAY.withIndex()) {
             if (hasModifier(modifierKeywordToken)) {
@@ -39,13 +40,15 @@ public object ModifierMaskUtils {
         return mask
     }
 
-    platformStatic public fun maskHasModifier(mask: Int, modifierToken: JetModifierKeywordToken): Boolean {
+    @JvmStatic
+    public fun maskHasModifier(mask: Int, modifierToken: JetModifierKeywordToken): Boolean {
         val index = MODIFIER_KEYWORDS_ARRAY.indexOf(modifierToken)
         assert(index >= 0, "All JetModifierKeywordTokens should be present in MODIFIER_KEYWORDS_ARRAY")
         return (mask and (1 shl index)) != 0
     }
 
-    platformStatic public fun maskToString(mask: Int): String {
+    @JvmStatic
+    public fun maskToString(mask: Int): String {
         val sb = StringBuilder()
         sb.append("[")
         var first = true
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorToSourceUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorToSourceUtils.kt
index 23b9b7f06c7..83497ae982e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorToSourceUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorToSourceUtils.kt
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.psi.JetAnnotationEntry
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.resolve.source.getPsi
 import java.util.ArrayList
-import kotlin.platform.platformStatic
 
 public object DescriptorToSourceUtils {
     private fun collectEffectiveReferencedDescriptors(result: MutableList<DeclarationDescriptor>, descriptor: DeclarationDescriptor) {
@@ -44,19 +43,19 @@ public object DescriptorToSourceUtils {
         result.add(descriptor)
     }
 
-    platformStatic
+    @JvmStatic
     public fun getEffectiveReferencedDescriptors(descriptor: DeclarationDescriptor): Collection<DeclarationDescriptor> {
         val result = ArrayList<DeclarationDescriptor>()
         collectEffectiveReferencedDescriptors(result, descriptor.getOriginal())
         return result
     }
 
-    platformStatic
+    @JvmStatic
     public fun getSourceFromDescriptor(descriptor: DeclarationDescriptor): PsiElement? {
         return (descriptor as? DeclarationDescriptorWithSource)?.getSource()?.getPsi()
     }
 
-    platformStatic
+    @JvmStatic
     public fun getSourceFromAnnotation(descriptor: AnnotationDescriptor): JetAnnotationEntry? {
         return descriptor.source.getPsi() as? JetAnnotationEntry
     }
@@ -65,13 +64,13 @@ public object DescriptorToSourceUtils {
     // Returns PSI element for descriptor. If there are many relevant elements (e.g. it is fake override
     // with multiple declarations), returns null. It can't find declarations in builtins or decompiled code.
     // In IDE, use DescriptorToSourceUtilsIde instead.
-    platformStatic
+    @JvmStatic
     public fun descriptorToDeclaration(descriptor: DeclarationDescriptor): PsiElement? {
         val effectiveReferencedDescriptors = getEffectiveReferencedDescriptors(descriptor)
         return if (effectiveReferencedDescriptors.size() == 1) getSourceFromDescriptor(effectiveReferencedDescriptors.firstOrNull()!!) else null
     }
 
-    platformStatic
+    @JvmStatic
     public fun getContainingFile(declarationDescriptor: DeclarationDescriptor): JetFile? {
         // declarationDescriptor may describe a synthesized element which doesn't have PSI
         // To workaround that, we find a top-level parent (which is inside a PackageFragmentDescriptor), which is guaranteed to have PSI
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportDirectiveProcessor.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportDirectiveProcessor.kt
index 1f9c27603e9..4c9d2c6f565 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportDirectiveProcessor.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportDirectiveProcessor.kt
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.scopes.JetScope
 import java.util.ArrayList
-import kotlin.platform.platformStatic
 
 public class ImportDirectiveProcessor(
         private val qualifiedExpressionResolver: QualifiedExpressionResolver
@@ -161,7 +160,8 @@ public class ImportDirectiveProcessor(
 
         public fun canAllUnderImportFromClass(descriptor: ClassDescriptor): Boolean = !descriptor.getKind().isSingleton()
 
-        platformStatic public fun canImportMembersFrom(
+        @JvmStatic
+        public fun canImportMembersFrom(
                 descriptors: Collection<DeclarationDescriptor>,
                 reference: JetSimpleNameExpression,
                 trace: BindingTrace,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
index f90472adbcc..f2245970fb5 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
@@ -41,7 +41,6 @@ import org.jetbrains.kotlin.types.Variance.INVARIANT
 import org.jetbrains.kotlin.types.Variance.IN_VARIANCE
 import org.jetbrains.kotlin.types.Variance.OUT_VARIANCE
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
-import kotlin.platform.platformStatic
 
 public class TypeResolver(
         private val annotationResolver: AnnotationResolver,
@@ -327,7 +326,7 @@ public class TypeResolver(
     }
 
     companion object {
-        @platformStatic
+        @JvmStatic
         public fun resolveProjectionKind(projectionKind: JetProjectionKind): Variance {
             return when (projectionKind) {
                 JetProjectionKind.IN -> IN_VARIANCE
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt
index 2ac5e9e8a06..955dbd86759 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt
@@ -44,7 +44,6 @@ import org.jetbrains.kotlin.resolve.source.getPsi
 import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.kotlin.psi.JetTypeParameterListOwner
 import org.jetbrains.kotlin.resolve.BindingContext
-import kotlin.platform.platformStatic
 
 
 class VarianceChecker(private val trace: BindingTrace) {
@@ -80,7 +79,8 @@ class VarianceChecker(private val trace: BindingTrace) {
     )
 
     companion object {
-        platformStatic fun recordPrivateToThisIfNeeded(trace: BindingTrace, descriptor: CallableMemberDescriptor) {
+        @JvmStatic
+        fun recordPrivateToThisIfNeeded(trace: BindingTrace, descriptor: CallableMemberDescriptor) {
             if (isIrrelevant(descriptor) || descriptor.getVisibility() != Visibilities.PRIVATE) return
 
             val psiElement = descriptor.getSource().getPsi()
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 90496d18f02..ae690dcf793 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt
@@ -99,7 +99,7 @@ public class CallCompleter(
             context: BasicCallResolutionContext,
             results: OverloadResolutionResultsImpl<D>
     ) {
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         val candidates = (if (context.collectAllCandidates) {
             results.getAllCandidates()!!
         }
@@ -279,7 +279,7 @@ public class CallCompleter(
         val cachedData = getResolutionResultsCachedData(expression, context) ?: return null
         val (cachedResolutionResults, cachedContext, tracing) = cachedData
 
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         val cachedResults = cachedResolutionResults as OverloadResolutionResultsImpl<CallableDescriptor>
         val contextForArgument = cachedContext.replaceBindingTrace(context.trace)
                 .replaceExpectedType(context.expectedType).replaceCollectAllCandidates(false)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt
index b9759eb538f..f9dec7c1418 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt
@@ -54,7 +54,7 @@ public class CallableDescriptorCollectors<D : CallableDescriptor>(val collectors
         Iterable<CallableDescriptorCollector<D>> {
     override fun iterator(): Iterator<CallableDescriptorCollector<D>> = collectors.iterator()
 
-    @suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     companion object {
         public val FUNCTIONS_AND_VARIABLES: CallableDescriptorCollectors<CallableDescriptor> =
                 CallableDescriptorCollectors(listOf(
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt
index 449f5fca625..ff7c2e5d752 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt
@@ -38,11 +38,11 @@ import org.jetbrains.kotlin.types.expressions.OperatorConventions
 import org.jetbrains.kotlin.types.isDynamic
 import org.jetbrains.kotlin.utils.Printer
 import java.util.ArrayList
-import kotlin.platform.platformStatic
 
 object DynamicCallableDescriptors {
 
-    platformStatic fun createDynamicDescriptorScope(call: Call, owner: DeclarationDescriptor) = object : JetScopeImpl() {
+    @JvmStatic
+    fun createDynamicDescriptorScope(call: Call, owner: DeclarationDescriptor) = object : JetScopeImpl() {
         override fun getContainingDeclaration() = owner
 
         override fun printScopeStructure(p: Printer) {
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 fc2352154f1..e4b65dfab5b 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<ValueArgument>
 
 public fun Call.getValueArgumentListOrElement(): JetElement = getValueArgumentList() ?: getCalleeExpression() ?: getCallElement()
 
-@suppress("UNCHECKED_CAST")
+@Suppress("UNCHECKED_CAST")
 private fun List<ValueArgument?>.filterArgsInParentheses() = filter { it !is JetFunctionLiteralArgument } as List<ValueArgument>
 
 public fun Call.getValueArgumentForExpression(expression: JetExpression): ValueArgument? {
@@ -177,7 +177,7 @@ public fun JetExpression.getFunctionResolvedCallWithAssert(context: BindingConte
     assert(resolvedCall.getResultingDescriptor() is FunctionDescriptor) {
         "ResolvedCall for this expression must be ResolvedCall<? extends FunctionDescriptor>: ${this.getTextWithLocation()}"
     }
-    @suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     return resolvedCall as ResolvedCall<out FunctionDescriptor>
 }
 
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 b04ae298afd..24c1ff57124 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
@@ -38,7 +38,6 @@ import org.jetbrains.kotlin.types.expressions.OperatorConventions
 import java.math.BigInteger
 import java.util.ArrayList
 import java.util.HashMap
-import kotlin.platform.platformStatic
 
 public class ConstantExpressionEvaluator(
         internal val builtIns: KotlinBuiltIns
@@ -209,12 +208,14 @@ public class ConstantExpressionEvaluator(
 
 
     companion object {
-        platformStatic public fun getConstant(expression: JetExpression, bindingContext: BindingContext): CompileTimeConstant<*>? {
+        @JvmStatic
+        public fun getConstant(expression: JetExpression, bindingContext: BindingContext): CompileTimeConstant<*>? {
             val constant = getPossiblyErrorConstant(expression, bindingContext) ?: return null
             return if (!constant.isError) constant else null
         }
 
-        platformStatic fun getPossiblyErrorConstant(expression: JetExpression, bindingContext: BindingContext): CompileTimeConstant<*>? {
+        @JvmStatic
+        fun getPossiblyErrorConstant(expression: JetExpression, bindingContext: BindingContext): CompileTimeConstant<*>? {
             return bindingContext.get(BindingContext.COMPILE_TIME_VALUE, expression)
         }
     }
@@ -835,7 +836,7 @@ private val BOOLEAN = CompileTimeType<Boolean>()
 private val STRING = CompileTimeType<String>()
 private val ANY = CompileTimeType<Any>()
 
-@suppress("UNCHECKED_CAST")
+@Suppress("UNCHECKED_CAST")
 private fun <A, B> binaryOperation(
         a: CompileTimeType<A>,
         b: CompileTimeType<B>,
@@ -844,7 +845,7 @@ private fun <A, B> binaryOperation(
         checker: Function2<BigInteger, BigInteger, BigInteger>
 ) = BinaryOperationKey(a, b, functionName) to Pair(operation, checker) as Pair<Function2<Any?, Any?, Any>, Function2<BigInteger, BigInteger, BigInteger>>
 
-@suppress("UNCHECKED_CAST")
+@Suppress("UNCHECKED_CAST")
 private fun <A> unaryOperation(
         a: CompileTimeType<A>,
         functionName: String,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt
index 7382e9803d4..cac67e1f8aa 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt
@@ -58,5 +58,6 @@ public class MutableDiagnosticsWithSuppression(
         modificationTracker.incModificationCount()
     }
 
-    TestOnly public fun getReadonlyView(): DiagnosticsWithSuppression = readonlyView()
+    @TestOnly
+    public fun getReadonlyView(): DiagnosticsWithSuppression = readonlyView()
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt
index b3cfe63a825..b43049a05d6 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt
@@ -83,7 +83,7 @@ class LazyImportResolver(
 
     private inner class ImportDirectiveResolveCache(private val directive: JetImportDirective) {
 
-        volatile var importResolveStatus: ImportResolveStatus? = null
+        @Volatile var importResolveStatus: ImportResolveStatus? = null
 
         fun scopeForMode(mode: LookupMode): JetScope {
             val status = importResolveStatus
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt
index f56ab0d094c..96434756491 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.storage.StorageManager
 import com.intellij.openapi.vfs.VirtualFile
 import java.util.HashSet
-import kotlin.platform.platformStatic
 
 public abstract class DeclarationProviderFactoryService {
 
@@ -36,7 +35,8 @@ public abstract class DeclarationProviderFactoryService {
     ): DeclarationProviderFactory
 
     companion object {
-        public platformStatic fun createDeclarationProviderFactory(
+        @JvmStatic
+        public fun createDeclarationProviderFactory(
                 project: Project,
                 storageManager: StorageManager,
                 syntheticFiles: Collection<JetFile>,
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 be29aeac7be..aa33fbffa6c 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
@@ -142,7 +142,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 6c4a1a5c765..5df16fbe36b 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
@@ -103,7 +103,7 @@ public open class LazyClassMemberScope(
         OverridingUtil.generateOverridesInFunctionGroup(name, fromSupertypes, ArrayList(result), thisDescriptor, object : OverridingUtil.DescriptorSink {
             override fun addFakeOverride(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)
             }
 
@@ -192,7 +192,7 @@ public open class LazyClassMemberScope(
         }
     }
 
-    @suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     protected override fun getNonDeclaredProperties(name: Name, result: MutableSet<VariableDescriptor>) {
         createPropertiesFromPrimaryConstructorParameters(name, result)
 
@@ -323,7 +323,7 @@ public open class LazyClassMemberScope(
 
         private val EXTRACT_PROPERTIES: MemberExtractor<PropertyDescriptor> = object : MemberExtractor<PropertyDescriptor> {
             override fun extract(extractFrom: JetType, name: Name): Collection<PropertyDescriptor> {
-                @suppress("UNCHECKED_CAST")
+                @Suppress("UNCHECKED_CAST")
                 return extractFrom.memberScope.getProperties(name, NoLookupLocation.FOR_ALREADY_TRACKED) as Collection<PropertyDescriptor>
             }
         }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalScopeImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalScopeImpl.kt
index 13108d56f83..c2e96d2cbd7 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalScopeImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalScopeImpl.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.scopes.utils.takeSnapshot
 import org.jetbrains.kotlin.utils.Printer
 
-public class LexicalScopeImpl jvmOverloads constructor(
+public class LexicalScopeImpl @JvmOverloads constructor(
         parent: LexicalScope,
         override val ownerDescriptor: DeclarationDescriptor,
         override val isOwnerDescriptorAccessibleByLabel: Boolean,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
index e0ae0a09298..e8a8567476e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
@@ -30,7 +30,7 @@ import java.util.*
 
 // Writes to: maps
 
-public class WritableScopeImpl @jvmOverloads constructor(
+public class WritableScopeImpl @JvmOverloads constructor(
         outerScope: JetScope,
         private val ownerDeclarationDescriptor: DeclarationDescriptor,
         override val redeclarationHandler: RedeclarationHandler,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt
index 79c77ca9dfe..6f53e0516e2 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt
@@ -87,7 +87,7 @@ public fun LexicalScope.getDescriptorsFiltered(
 }
 
 
-@deprecated("Use getOwnProperties instead")
+@Deprecated("Use getOwnProperties instead")
 public fun LexicalScope.getLocalVariable(name: Name): VariableDescriptor? {
     processForMeAndParent {
         if (it is LazyFileScope) {
@@ -120,7 +120,7 @@ public fun LexicalScope.asJetScope(): JetScope {
 
 public fun JetScope.memberScopeAsFileScope(): FileScope = MemberScopeToFileScopeAdapter(this)
 
-@deprecated("Remove this method after scope refactoring")
+@Deprecated("Remove this method after scope refactoring")
 public fun JetScope.asLexicalScope(): LexicalScope
         = if (this is LexicalToJetScopeAdapter) {
             lexicalScope
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/SymbolUsageValidator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/SymbolUsageValidator.kt
index 89cd16d67e8..d04874ac109 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/SymbolUsageValidator.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/SymbolUsageValidator.kt
@@ -20,7 +20,6 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
 import org.jetbrains.kotlin.resolve.BindingTrace
-import kotlin.platform.platformStatic
 
 public interface SymbolUsageValidator {
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt b/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt
index 35ca14e496e..69c403b5130 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt
@@ -51,7 +51,7 @@ public class LockBasedLazyResolveStorageManager(private val storageManager: Stor
             storageManager.compute { context.addOwnDataTo(trace, commitDiagnostics) }
         }
 
-        TestOnly
+        @TestOnly
         override fun <K, V> getSliceContents(slice: ReadOnlySlice<K, V>) = storageManager.compute { context.getSliceContents<K, V>(slice) }
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/SenselessComparisonChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/SenselessComparisonChecker.kt
index 2d24bac4849..1c79eab3de8 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/SenselessComparisonChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/SenselessComparisonChecker.kt
@@ -22,13 +22,12 @@ import org.jetbrains.kotlin.types.JetType
 import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.resolve.calls.smartcasts.Nullability
 import org.jetbrains.kotlin.diagnostics.Errors
-import kotlin.platform.platformStatic
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue
 import org.jetbrains.kotlin.resolve.BindingTrace
 import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext
 
 object SenselessComparisonChecker {
-    platformStatic fun checkSenselessComparisonWithNull(
+    @JvmStatic fun checkSenselessComparisonWithNull(
             expression: JetBinaryExpression,
             left: JetExpression,
             right: JetExpression,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt
index 7cb1cfb51d8..dbaad9f13a0 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt
@@ -20,7 +20,6 @@ import com.intellij.openapi.application.Application
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.extensions.ExtensionPointName
 import java.lang.ref.WeakReference
-import kotlin.platform.platformStatic
 
 public open class MappedExtensionProvider<T, R>
 protected constructor(
@@ -49,13 +48,15 @@ protected constructor(
     }
 
     companion object {
-        platformStatic public fun <T, R> create(epName: ExtensionPointName<T>, map: (List<T>) -> R): MappedExtensionProvider<T, R>
+        @JvmStatic
+        public fun <T, R> create(epName: ExtensionPointName<T>, map: (List<T>) -> R): MappedExtensionProvider<T, R>
                 = MappedExtensionProvider(epName, map)
     }
 }
 
 public class ExtensionProvider<T>(epName: ExtensionPointName<T>) : MappedExtensionProvider<T, List<T>>(epName, { it }) {
     companion object {
-        platformStatic public fun <T> create(epName: ExtensionPointName<T>): ExtensionProvider<T> = ExtensionProvider(epName)
+        @JvmStatic
+        public fun <T> create(epName: ExtensionPointName<T>): ExtensionProvider<T> = ExtensionProvider(epName)
     }
 }
\ No newline at end of file
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/PerformanceCounter.kt b/compiler/frontend/src/org/jetbrains/kotlin/util/PerformanceCounter.kt
index a0aa4e08b75..b53a9b27993 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/util/PerformanceCounter.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/util/PerformanceCounter.kt
@@ -53,7 +53,8 @@ public abstract class PerformanceCounter protected constructor(val name: String)
             }
         }
 
-        public jvmOverloads fun create(name: String, reenterable: Boolean = false): PerformanceCounter {
+        @JvmOverloads
+        public fun create(name: String, reenterable: Boolean = false): PerformanceCounter {
             return if (reenterable)
                 ReenterableCounter(name)
             else
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
index b21e7591696..ec8f1067dfd 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
@@ -308,7 +308,7 @@ public open class KotlinLightClassForExplicitDeclaration(
 
     private fun isAbstract(): Boolean = classOrObject.hasModifier(ABSTRACT_KEYWORD) || isInterface
 
-    override fun hasModifierProperty(NonNls name: String): Boolean = getModifierList().hasModifierProperty(name)
+    override fun hasModifierProperty(@NonNls name: String): Boolean = getModifierList().hasModifierProperty(name)
 
     override fun isDeprecated(): Boolean {
         val jetModifierList = classOrObject.modifierList ?: return false
@@ -357,8 +357,8 @@ public open class KotlinLightClassForExplicitDeclaration(
         return qualifiedName != null && thisDescriptor != null && checkSuperTypeByFQName(thisDescriptor, qualifiedName, checkDeep)
     }
 
-    throws(IncorrectOperationException::class)
-    override fun setName(NonNls name: String): PsiElement {
+    @Throws(IncorrectOperationException::class)
+    override fun setName(@NonNls name: String): PsiElement {
         getOrigin().setName(name)
         return this
     }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForFacade.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForFacade.kt
index e1699d73b99..adbf19153fd 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForFacade.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForFacade.kt
@@ -125,7 +125,7 @@ public class KotlinLightClassForFacade private constructor(
 
     override fun getModifierList() = modifierList
 
-    override fun hasModifierProperty(NonNls name: String) = modifierList.hasModifierProperty(name)
+    override fun hasModifierProperty(@NonNls name: String) = modifierList.hasModifierProperty(name)
 
     override fun isDeprecated() = false
 
@@ -176,7 +176,7 @@ public class KotlinLightClassForFacade private constructor(
 
     override fun getInitializers() = PsiClassInitializer.EMPTY_ARRAY
 
-    override fun findInnerClassByName(NonNls name: String, checkBases: Boolean) = null
+    override fun findInnerClassByName(@NonNls name: String, checkBases: Boolean) = null
 
     override fun getName() = facadeClassFqName.shortName().asString()
 
diff --git a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt
index c763ed5bcb4..3aa4a7d707a 100644
--- a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt
+++ b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt
@@ -22,6 +22,6 @@ public interface CommandLineProcessor {
     public val pluginId: String
     public val pluginOptions: Collection<CliOption>
 
-    throws(CliOptionProcessingException::class)
+    @Throws(CliOptionProcessingException::class)
     public fun processOption(option: CliOption, value: String, configuration: CompilerConfiguration)
 }
\ No newline at end of file
diff --git a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt
index e2f97e23ce7..cc7aa7f342d 100644
--- a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt
+++ b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt
@@ -143,7 +143,8 @@ public object KotlinCompilerClient {
     }
 
 
-    @JvmStatic public fun main(vararg args: String) {
+    @JvmStatic
+    public fun main(vararg args: String) {
         val compilerId = CompilerId()
         val daemonOptions = DaemonOptions()
         val daemonLaunchingOptions = DaemonJVMOptions()
@@ -351,7 +352,7 @@ public object KotlinCompilerClient {
                      makeRunFilenameString(timestamp = "lock",
                                            digest = compilerId.compilerClasspath.map { File(it).absolutePath }.distinctStringsDigest(),
                                            port = "0"))
-        private @Volatile var locked = acquireLockFile(lockFile)
+        @Volatile private var locked = acquireLockFile(lockFile)
         private val channel = if (locked) RandomAccessFile(lockFile, "rw").channel else null
         private val lock = channel?.lock()
 
diff --git a/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/DaemonParams.kt b/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/DaemonParams.kt
index a6025c77426..48e8f164c45 100644
--- a/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/DaemonParams.kt
+++ b/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/DaemonParams.kt
@@ -271,9 +271,11 @@ public data class CompilerId(
     }
 
     companion object {
-        public @JvmStatic fun makeCompilerId(vararg paths: File): CompilerId = makeCompilerId(paths.asIterable())
+        @JvmStatic
+        public fun makeCompilerId(vararg paths: File): CompilerId = makeCompilerId(paths.asIterable())
 
-        public @JvmStatic fun makeCompilerId(paths: Iterable<File>): CompilerId =
+        @JvmStatic
+        public fun makeCompilerId(paths: Iterable<File>): CompilerId =
                 CompilerId(compilerClasspath = paths.map { it.absolutePath }, compilerDigest = paths.getFilesClasspathDigest())
     }
 }
diff --git a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileDaemon.kt b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileDaemon.kt
index 10b2d2037a8..a8354de5a8f 100644
--- a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileDaemon.kt
+++ b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileDaemon.kt
@@ -89,7 +89,8 @@ public object CompileDaemon {
         return null
     }
 
-    @JvmStatic public fun main(args: Array<String>) {
+    @JvmStatic
+    public fun main(args: Array<String>) {
 
         log.info("Kotlin compiler daemon version " + (loadVersionFromResource() ?: "<unknown>"))
         log.info("daemon JVM args: " + ManagementFactory.getRuntimeMXBean().inputArguments.joinToString(" "))
diff --git a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileServiceImpl.kt b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileServiceImpl.kt
index 00529f9cff9..872f3a3beed 100644
--- a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileServiceImpl.kt
+++ b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileServiceImpl.kt
@@ -91,7 +91,7 @@ class CompileServiceImpl<Compiler: CLICompiler<*>>(
 
     // internal implementation stuff
 
-    private @Volatile var _lastUsedSeconds = nowSeconds()
+    @Volatile private var _lastUsedSeconds = nowSeconds()
     public val lastUsedSeconds: Long get() = if (rwlock.isWriteLocked || rwlock.readLockCount - rwlock.readHoldCount > 0) nowSeconds() else _lastUsedSeconds
 
     val log by lazy { Logger.getLogger("compiler") }
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt b/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt
index 78d660714fa..6fb9a1e3f82 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt
@@ -206,7 +206,7 @@ class LazyOperationsLog(
 private fun <T> 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 efa1fae29bf..dc20ba6814d 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<Any>).getSuperclass() as Class<Any>?
             if (superClass == null) break
             if (c == superClass) break
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt
index 32e7e827ba3..b3309015df1 100644
--- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt
@@ -138,7 +138,7 @@ public class KotlinCliJavaFileManagerTest : PsiTestCase() {
         TestCase.assertNull("Should not find class in empty scope", manager.findClass("foo.Test", GlobalSearchScope.EMPTY_SCOPE))
     }
 
-    private fun configureManager(Language("JAVA") text: String, className: String): KotlinCliJavaFileManagerImpl {
+    private fun configureManager(@Language("JAVA") text: String, className: String): KotlinCliJavaFileManagerImpl {
         val root = PsiTestUtil.createTestProjectStructure(myProject, myModule, PlatformTestCase.myFilesToDelete)
         val pkg = root.createChildDirectory(this, "foo")
         val dir = myPsiManager.findDirectory(pkg)
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/TestStdlibWithDxTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/TestStdlibWithDxTest.kt
index 3dcc09dd98f..81e050f9648 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/TestStdlibWithDxTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/TestStdlibWithDxTest.kt
@@ -23,11 +23,13 @@ import java.io.FileInputStream
 import java.util.zip.ZipInputStream
 
 public class TestStdlibWithDxTest {
-    Test public fun testRuntimeWithDx() {
+    @Test
+    public fun testRuntimeWithDx() {
         doTest(ForTestCompileRuntime.runtimeJarForTests())
     }
 
-    Test public fun testReflectWithDx() {
+    @Test
+    public fun testReflectWithDx() {
         doTest(ForTestCompileRuntime.reflectJarForTests())
     }
 
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt
index 2a0a653897d..0df8f40a4ad 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt
@@ -77,7 +77,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<Annotation>
         )
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt
index d9ef72bfc89..c5b66112f7a 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 constructor(private val map: Map<Class<*>, Any>) {
     }
 
     public fun <T> get(interfaceClass: Class<T>): T {
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         return map.get(interfaceClass) as T
     }
 
diff --git a/compiler/util/src/org/jetbrains/kotlin/progress/CancelationStatus.kt b/compiler/util/src/org/jetbrains/kotlin/progress/CancelationStatus.kt
index fa5f472c9d1..39fddfeaedb 100644
--- a/compiler/util/src/org/jetbrains/kotlin/progress/CancelationStatus.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/progress/CancelationStatus.kt
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.progress
 
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.progress.ProgressIndicatorProvider
-import kotlin.platform.platformStatic
 
 public class CompilationCanceledException : ProcessCanceledException()
 
@@ -29,12 +28,13 @@ public interface CompilationCanceledStatus {
 public object ProgressIndicatorAndCompilationCanceledStatus {
     private var canceledStatus: CompilationCanceledStatus? = null
 
-    platformStatic
-    synchronized public fun setCompilationCanceledStatus(newCanceledStatus: CompilationCanceledStatus?): Unit {
+    @JvmStatic
+    @Synchronized
+    public fun setCompilationCanceledStatus(newCanceledStatus: CompilationCanceledStatus?): Unit {
         canceledStatus = newCanceledStatus
     }
 
-    platformStatic
+    @JvmStatic
     public fun checkCanceled(): Unit {
         ProgressIndicatorProvider.checkCanceled()
         canceledStatus?.checkCanceled()
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt
index 1417a6100da..5d3e4b37483 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.utils
 import java.io.File
 import javax.xml.bind.DatatypeConverter.parseBase64Binary
 import javax.xml.bind.DatatypeConverter.printBase64Binary
-import kotlin.platform.platformStatic
 
 public class KotlinJavascriptMetadata(public val abiVersion: Int, public val moduleName: String, public val body: ByteArray) {
     public val isAbiVersionCompatible: Boolean = KotlinJavascriptMetadataUtils.isAbiVersionCompatible(abiVersion)
@@ -36,15 +35,15 @@ public object KotlinJavascriptMetadataUtils {
      */
     private val METADATA_PATTERN = "(?m)\\w+\\.$KOTLIN_JAVASCRIPT_METHOD_NAME\\((\\d+),\\s*(['\"])([^'\"]*)\\2,\\s*(['\"])([^'\"]*)\\4\\)".toPattern()
 
-    platformStatic
+    @JvmStatic
     public val ABI_VERSION: Int = 3
 
     public fun replaceSuffix(filePath: String): String = filePath.substringBeforeLast(JS_EXT) + META_JS_SUFFIX
 
-    platformStatic
+    @JvmStatic
     public fun isAbiVersionCompatible(abiVersion: Int): Boolean = abiVersion == ABI_VERSION
 
-    platformStatic
+    @JvmStatic
     public fun hasMetadata(text: String): Boolean =
             KOTLIN_JAVASCRIPT_METHOD_NAME_PATTERN.matcher(text).find() && METADATA_PATTERN.matcher(text).find()
 
@@ -60,7 +59,7 @@ public object KotlinJavascriptMetadataUtils {
     public fun formatMetadataAsString(moduleName: String, content: ByteArray): String =
         "// Kotlin.$KOTLIN_JAVASCRIPT_METHOD_NAME($ABI_VERSION, \"$moduleName\", \"${printBase64Binary(content)}\");\n"
 
-    platformStatic
+    @JvmStatic
     public fun loadMetadata(file: File): List<KotlinJavascriptMetadata> {
         assert(file.exists()) { "Library " + file + " not found" }
         val metadataList = arrayListOf<KotlinJavascriptMetadata>()
@@ -77,10 +76,10 @@ public object KotlinJavascriptMetadataUtils {
         return metadataList
     }
 
-    platformStatic
+    @JvmStatic
     public fun loadMetadata(path: String): List<KotlinJavascriptMetadata> = loadMetadata(File(path))
 
-    platformStatic
+    @JvmStatic
     public fun parseMetadata(text: String, metadataList: MutableList<KotlinJavascriptMetadata>) {
         // Check for literal pattern first in order to reduce time for large files without metadata
         if (!KOTLIN_JAVASCRIPT_METHOD_NAME_PATTERN.matcher(text).find()) return
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt b/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt
index ff5311fdde8..14f5984f968 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt
@@ -27,7 +27,6 @@ import java.util.jar.Attributes
 import java.util.jar.JarFile
 import java.util.jar.Manifest
 import java.util.zip.ZipFile
-import kotlin.platform.platformStatic
 
 public object LibraryUtils {
     private val LOG = Logger.getInstance(javaClass<LibraryUtils>())
@@ -65,33 +64,33 @@ public object LibraryUtils {
         TITLE_KOTLIN_JAVASCRIPT_LIB = jsLib
     }
 
-    platformStatic
+    @JvmStatic
     public fun getJarFile(classesRoots: List<VirtualFile>, jarName: String): VirtualFile? {
         return classesRoots.firstOrNull { it.name == jarName }
     }
 
-    platformStatic
+    @JvmStatic
     public fun getKotlinJsModuleName(library: File): String? {
         return getManifestMainAttributesFromJarOrDirectory(library)?.getValue(KOTLIN_JS_MODULE_ATTRIBUTE_NAME)
     }
 
-    platformStatic
+    @JvmStatic
     public fun isOldKotlinJavascriptLibrary(library: File): Boolean =
             checkAttributeValue(library, TITLE_KOTLIN_JAVASCRIPT_LIB, Attributes.Name.SPECIFICATION_TITLE) && getKotlinJsModuleName(library) != null
 
-    platformStatic
+    @JvmStatic
     public fun isKotlinJavascriptLibraryWithMetadata(library: File): Boolean = KotlinJavascriptMetadataUtils.loadMetadata(library).isNotEmpty()
 
-    platformStatic
+    @JvmStatic
     public fun isKotlinJavascriptLibrary(library: File): Boolean =
             isOldKotlinJavascriptLibrary(library) || isKotlinJavascriptLibraryWithMetadata(library)
 
-    platformStatic
+    @JvmStatic
     public fun isKotlinJavascriptStdLibrary(library: File): Boolean {
         return checkAttributeValue(library, TITLE_KOTLIN_JAVASCRIPT_STDLIB, Attributes.Name.IMPLEMENTATION_TITLE)
     }
 
-    platformStatic
+    @JvmStatic
     public fun copyJsFilesFromLibraries(libraries: List<String>, outputLibraryJsPath: String) {
         for (library in libraries) {
             val file = File(library)
@@ -106,12 +105,12 @@ public object LibraryUtils {
         }
     }
 
-    platformStatic
+    @JvmStatic
     public fun traverseJsLibraries(libs: List<File>, action: (content: String, path: String)->Unit) {
         libs.forEach { traverseJsLibrary(it, action) }
     }
 
-    platformStatic
+    @JvmStatic
     public fun traverseJsLibrary(lib: File, action: (content: String, path: String)->Unit) {
         when {
             lib.isDirectory() -> traverseDirectory(lib, action)
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/concurrent.kt b/compiler/util/src/org/jetbrains/kotlin/utils/concurrent.kt
index cfb3c7a30c1..938a889df4f 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/concurrent.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/concurrent.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.utils.concurrent.block
 
 public class LockedClearableLazyValue<T: Any>(val lock: Any, val init: () -> T) {
-    private volatile var value: T? = null
+    @Volatile private var value: T? = null
 
     public fun get(): T {
         val _v1 = value
@@ -28,7 +28,7 @@ public class LockedClearableLazyValue<T: Any>(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/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
index cf3d3044c86..e7392ffc0e3 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
@@ -45,7 +45,6 @@ import org.jetbrains.kotlin.types.typeUtil.createProjection
 import org.jetbrains.kotlin.types.typeUtil.replaceAnnotations
 import org.jetbrains.kotlin.utils.sure
 import java.util.HashSet
-import kotlin.platform.platformStatic
 
 private val JAVA_LANG_CLASS_FQ_NAME: FqName = FqName("java.lang.Class")
 
@@ -288,12 +287,13 @@ class LazyJavaTypeResolver(
     }
 
     public object FlexibleJavaClassifierTypeCapabilities : FlexibleTypeCapabilities {
-        platformStatic fun create(lowerBound: JetType, upperBound: JetType) = DelegatingFlexibleType.create(lowerBound, upperBound, this)
+        @JvmStatic
+        fun create(lowerBound: JetType, upperBound: JetType) = DelegatingFlexibleType.create(lowerBound, upperBound, this)
 
         override val id: String get() = "kotlin.jvm.PlatformType"
 
         override fun <T : TypeCapability> getCapability(capabilityClass: Class<T>, jetType: JetType, flexibility: Flexibility): T? {
-            @suppress("UNCHECKED_CAST")
+            @Suppress("UNCHECKED_CAST")
             return when (capabilityClass) {
                 javaClass<CustomTypeVariable>(), javaClass<Specificity>() -> Impl(flexibility) as T
                 else -> null
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/RawType.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/RawType.kt
index d4b9176b3bb..e735ffa5fff 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/RawType.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/RawType.kt
@@ -70,7 +70,7 @@ public object RawTypeCapabilities : TypeCapabilities {
     }
 
     override fun <T : TypeCapability> getCapability(capabilityClass: Class<T>): T? {
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         return when(capabilityClass) {
             javaClass<CustomSubstitutionCapability>() -> RawSubstitutionCapability as T
             javaClass<CustomFlexibleRendering>() -> RawFlexibleRendering as T
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/signatureEnhancement.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/signatureEnhancement.kt
index 8ce45937608..54d66a2612d 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/signatureEnhancement.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/signatureEnhancement.kt
@@ -43,7 +43,7 @@ public fun <D : CallableMemberDescriptor> D.enhanceSignature(): D {
     val enhancedReturnType = parts(isCovariant = true) { it.getReturnType()!! }.enhance()
 
     if (this is JavaCallableMemberDescriptor) {
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         return this.enhance(enhancedReceiverType, enhancedValueParametersTypes, enhancedReturnType) as D
     }
 
@@ -65,7 +65,7 @@ private fun <D : CallableMemberDescriptor> D.parts(isCovariant: Boolean, collect
     return SignatureParts(
             collector(this),
             this.getOverriddenDescriptors().map {
-                @suppress("UNCHECKED_CAST")
+                @Suppress("UNCHECKED_CAST")
                 collector(it as D)
             },
             isCovariant
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
index 52f9052b313..fb72c81d605 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
@@ -16,22 +16,24 @@
 
 package org.jetbrains.kotlin.load.kotlin
 
-import kotlin.platform.platformStatic
 import org.jetbrains.kotlin.name.Name
 
 // The purpose of this class is to hold a unique signature of either a method or a field, so that annotations on a member can be put
 // into a map indexed by these signatures
 data class MemberSignature private constructor(private val signature: String) {
     companion object {
-        platformStatic public fun fromMethodNameAndDesc(nameAndDesc: String): MemberSignature {
+        @JvmStatic
+        public fun fromMethodNameAndDesc(nameAndDesc: String): MemberSignature {
             return MemberSignature(nameAndDesc)
         }
 
-        platformStatic public fun fromFieldNameAndDesc(name: Name, desc: String): MemberSignature {
+        @JvmStatic
+        public fun fromFieldNameAndDesc(name: Name, desc: String): MemberSignature {
             return MemberSignature(name.asString() + "#" + desc)
         }
 
-        platformStatic public fun fromMethodSignatureAndParameterIndex(signature: MemberSignature, index: Int): MemberSignature {
+        @JvmStatic
+        public fun fromMethodSignatureAndParameterIndex(signature: MemberSignature, index: Int): MemberSignature {
             return MemberSignature(signature.signature + "@" + index)
         }
     }
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
index ff59eb67a31..65fe0e55676 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
@@ -81,7 +81,8 @@ public class PackageParts(val packageFqName: String) {
             packageFqName.hashCode() * 31 + parts.hashCode()
 
     companion object {
-        @jvmStatic public fun PackageParts.serialize(builder: JvmPackageTable.PackageTable.Builder) {
+        @JvmStatic
+        public fun PackageParts.serialize(builder: JvmPackageTable.PackageTable.Builder) {
             if (this.parts.isNotEmpty()) {
                 val packageParts = JvmPackageTable.PackageParts.newBuilder()
                 packageParts.setPackageFqName(this.packageFqName)
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt
index eb4b1e4e9a0..0fdcbf9ba82 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.serialization.jvm
 import com.google.protobuf.ExtensionRegistryLite
 import org.jetbrains.kotlin.serialization.ClassData
 import org.jetbrains.kotlin.serialization.PackageData
-import kotlin.platform.platformStatic
 
 public object JvmProtoBufUtil {
     public val EXTENSION_REGISTRY: ExtensionRegistryLite = run {
@@ -28,15 +27,15 @@ public object JvmProtoBufUtil {
         registry
     }
 
-    platformStatic
+    @JvmStatic
     public fun readClassDataFrom(encodedData: Array<String>): ClassData = readClassDataFrom(BitEncoding.decodeBytes(encodedData))
 
-    platformStatic
+    @JvmStatic
     public fun readClassDataFrom(data: ByteArray): ClassData = ClassData.read(data, EXTENSION_REGISTRY)
 
-    platformStatic
+    @JvmStatic
     public fun readPackageDataFrom(encodedData: Array<String>): PackageData = readPackageDataFrom(BitEncoding.decodeBytes(encodedData))
 
-    platformStatic
+    @JvmStatic
     public fun readPackageDataFrom(data: ByteArray): PackageData = PackageData.read(data, EXTENSION_REGISTRY)
 }
diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt
index 7a9123ff0e0..00649c3e56d 100644
--- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt
+++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt
@@ -27,7 +27,7 @@ import java.lang.reflect.Constructor
 import java.lang.reflect.Field
 import java.lang.reflect.Method
 
-suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
+@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
 private val TYPES_ELIGIBLE_FOR_SIMPLE_VISIT = setOf(
         // Primitives
         javaClass<java.lang.Integer>(), javaClass<java.lang.Character>(), javaClass<java.lang.Byte>(), javaClass<java.lang.Long>(),
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt
index 73195a92666..1c28a64ca97 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.builtins
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import java.util.Collections
-import kotlin.platform.platformStatic
 
 public object CompanionObjectMapping {
     private val classes = linkedSetOf<ClassDescriptor>()
@@ -33,10 +32,12 @@ public object CompanionObjectMapping {
         classes.add(builtIns.getEnum())
     }
 
-    public platformStatic fun allClassesWithIntrinsicCompanions(): Set<ClassDescriptor> =
+    @JvmStatic
+    public fun allClassesWithIntrinsicCompanions(): Set<ClassDescriptor> =
             Collections.unmodifiableSet(classes)
 
-    public platformStatic fun hasMappingToObject(classDescriptor: ClassDescriptor): Boolean {
+    @JvmStatic
+    public fun hasMappingToObject(classDescriptor: ClassDescriptor): Boolean {
         return DescriptorUtils.isCompanionObject(classDescriptor) &&
                classDescriptor.getContainingDeclaration() in classes
     }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt
index d7be00cb266..5b4b852a341 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.descriptors.annotations
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.DescriptorUtils
-import kotlin.platform.platformStatic
 
 public class AnnotationsImpl : Annotations {
     private val annotations: List<AnnotationDescriptor>
@@ -33,7 +32,7 @@ public class AnnotationsImpl : Annotations {
     // List<AnnotationDescriptor> and List<AnnotationWithTarget> have the same signature
     private constructor(
             targetedAnnotations: List<AnnotationWithTarget>,
-            @suppress("UNUSED_PARAMETER") i: Int
+            @Suppress("UNUSED_PARAMETER") i: Int
     ) {
         this.targetedAnnotations = targetedAnnotations
         this.annotations = targetedAnnotations.filter { it.target == null }.map { it.annotation }
@@ -61,7 +60,7 @@ public class AnnotationsImpl : Annotations {
     override fun toString() = annotations.toString()
 
     companion object {
-        platformStatic
+        @JvmStatic
         public fun create(annotationsWithTargets: List<AnnotationWithTarget>): AnnotationsImpl {
             return AnnotationsImpl(annotationsWithTargets, 0)
         }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt b/core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt
index f23d700bff9..af8b6780810 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt
@@ -20,7 +20,7 @@ public interface LookupLocation {
 }
 
 public enum class NoLookupLocation : LookupLocation {
-    @deprecated("Use more suitable constant if possible")
+    @Deprecated("Use more suitable constant if possible")
     UNSORTED,
     FROM_IDE,
     FROM_BACKEND,
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/CapturedTypeConstructor.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/CapturedTypeConstructor.kt
index c75aa2ca00c..0fcbf021329 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/CapturedTypeConstructor.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/CapturedTypeConstructor.kt
@@ -66,7 +66,7 @@ public class CapturedType(
     override fun getDelegate(): JetType = delegateType
 
     override fun <T : TypeCapability> getCapability(capabilityClass: Class<T>): T? {
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         return if (capabilityClass == javaClass<SubtypingRepresentatives>()) this as T
         else super<DelegatingType>.getCapability(capabilityClass)
     }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt
index 3122f021ebe..c091697f707 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt
@@ -159,7 +159,7 @@ public class EnumValue(
 
 public abstract class ErrorValue : ConstantValue<Unit>(Unit) {
 
-    deprecated("Should not be called, for this is not a real value, but a indication of an error")
+    @Deprecated("Should not be called, for this is not a real value, but a indication of an error")
     override val value: Unit
         get() = throw UnsupportedOperationException()
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt
index fe557d1691a..355708e191a 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt
@@ -48,7 +48,7 @@ public interface JetScope {
     public fun getDeclarationsByLabel(labelName: Name): Collection<DeclarationDescriptor>
 
     // Temporary overloads which will be dropped when all usages will be processed
-    @deprecated("Provide `location` explicitly", replaceWith = ReplaceWith("getClassifier(name, NoLookupLocation.UNSORTED)"))
+    @Deprecated("Provide `location` explicitly", replaceWith = ReplaceWith("getClassifier(name, NoLookupLocation.UNSORTED)"))
     public final fun getClassifier(name: Name): ClassifierDescriptor? = getClassifier(name, NoLookupLocation.UNSORTED)
 
     /**
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 f8f8a921292..ccbbc41a296 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt
@@ -44,7 +44,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/descriptors/src/org/jetbrains/kotlin/types/DisjointKeysUnionTypeSubstitution.kt b/core/descriptors/src/org/jetbrains/kotlin/types/DisjointKeysUnionTypeSubstitution.kt
index fc860181966..627bf7d11ae 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/DisjointKeysUnionTypeSubstitution.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/DisjointKeysUnionTypeSubstitution.kt
@@ -17,14 +17,14 @@
 package org.jetbrains.kotlin.types;
 
 import org.jetbrains.annotations.NotNull;
-import kotlin.platform.platformStatic
 
 public class DisjointKeysUnionTypeSubstitution private constructor(
     private val first: TypeSubstitution,
     private val second: TypeSubstitution
 ) : TypeSubstitution() {
     companion object {
-        platformStatic public fun create(first: TypeSubstitution, second: TypeSubstitution): TypeSubstitution {
+        @JvmStatic
+        public fun create(first: TypeSubstitution, second: TypeSubstitution): TypeSubstitution {
             if (first.isEmpty()) return second
             if (second.isEmpty()) return first
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/JetTypeImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/types/JetTypeImpl.kt
index 889e2e1db6d..a7be829612a 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/JetTypeImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/JetTypeImpl.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.types
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.resolve.scopes.JetScope
-import kotlin.platform.platformStatic
 
 public open class JetTypeImpl
 private constructor(
@@ -32,7 +31,7 @@ private constructor(
 ) : AbstractJetType() {
 
     companion object {
-        @platformStatic
+        @JvmStatic
         public fun create(annotations: Annotations,
                           constructor: TypeConstructor,
                           nullable: Boolean,
@@ -41,7 +40,7 @@ private constructor(
 
                 = JetTypeImpl(annotations, constructor, nullable, arguments, null, memberScope)
 
-        @platformStatic
+        @JvmStatic
         public fun create(annotations: Annotations,
                           constructor: TypeConstructor,
                           nullable: Boolean,
@@ -56,7 +55,7 @@ private constructor(
             return JetTypeImpl(annotations, constructor, nullable, arguments, substitution, memberScope)
         }
 
-        @platformStatic
+        @JvmStatic
         public fun create(annotations: Annotations,
                           descriptor: ClassDescriptor,
                           nullable: Boolean,
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt
index 1bb0d52bac1..47215b38b5f 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt
@@ -17,11 +17,11 @@
 package org.jetbrains.kotlin.types
 
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
-import kotlin.platform.platformStatic
 
 public abstract class TypeSubstitution {
     companion object {
-        platformStatic public val EMPTY: TypeSubstitution = object : TypeSubstitution() {
+        @JvmStatic
+        public val EMPTY: TypeSubstitution = object : TypeSubstitution() {
             override fun get(key: JetType) = null
             override fun isEmpty() = true
             override fun toString() = "Empty TypeSubstitution"
@@ -43,14 +43,14 @@ public abstract class TypeConstructorSubstitution : TypeSubstitution() {
     public abstract fun get(key: TypeConstructor): TypeProjection?
 
     companion object {
-        platformStatic
+        @JvmStatic
         public fun createByConstructorsMap(map: Map<TypeConstructor, TypeProjection>): TypeConstructorSubstitution =
             object : TypeConstructorSubstitution() {
                 override fun get(key: TypeConstructor) = map[key]
                 override fun isEmpty() = map.isEmpty()
             }
 
-        platformStatic
+        @JvmStatic
         public fun createByParametersMap(map: Map<TypeParameterDescriptor, TypeProjection>): TypeConstructorSubstitution =
             object : TypeConstructorSubstitution() {
                 override fun get(key: TypeConstructor) = map[key.declarationDescriptor]
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/dynamicTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/types/dynamicTypes.kt
index ac74e3173b8..cff5ccf3365 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/dynamicTypes.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/dynamicTypes.kt
@@ -44,7 +44,7 @@ public object DynamicTypeCapabilities : FlexibleTypeCapabilities {
     override val id: String get() = "kotlin.DynamicType"
 
     override fun <T : TypeCapability> getCapability(capabilityClass: Class<T>, jetType: JetType, flexibility: Flexibility): T? {
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         return if (capabilityClass in Impl.capabilityClasses) Impl(flexibility) as T else null
     }
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt
index def12b533bc..7015653d685 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.types.checker.JetTypeChecker
-import kotlin.platform.platformStatic
 
 public interface FlexibleTypeCapabilities {
     fun <T: TypeCapability> getCapability(capabilityClass: Class<T>, jetType: JetType, flexibility: Flexibility): T?
@@ -123,7 +122,8 @@ public open class DelegatingFlexibleType protected constructor(
                 javaClass<FlexibleTypeDelegation>()
         )
 
-        platformStatic fun create(lowerBound: JetType, upperBound: JetType, extraCapabilities: FlexibleTypeCapabilities): JetType {
+        @JvmStatic
+        fun create(lowerBound: JetType, upperBound: JetType, extraCapabilities: FlexibleTypeCapabilities): JetType {
             if (lowerBound == upperBound) return lowerBound
             return DelegatingFlexibleType(lowerBound, upperBound, extraCapabilities)
         }
@@ -144,7 +144,7 @@ public open class DelegatingFlexibleType protected constructor(
         val extra = extraCapabilities.getCapability(capabilityClass, this, this)
         if (extra != null) return extra
 
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         if (capabilityClass in capabilityClasses) return this as T
 
         return super<DelegatingType>.getCapability(capabilityClass)
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt
index d96e3158968..9f10b7f42b1 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt
@@ -47,7 +47,7 @@ public abstract class DeserializedPackageFragment(
     protected var components: DeserializationComponents by Delegates.notNull()
 
     // component dependency cycle
-    Inject
+    @Inject
     public fun setDeserializationComponents(components: DeserializationComponents) {
         this.components = components
     }
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolverImpl.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolverImpl.kt
index 33b8f54d1ef..196c74751c9 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolverImpl.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/LocalClassResolverImpl.kt
@@ -25,7 +25,7 @@ public class LocalClassResolverImpl : LocalClassResolver {
     public var components: DeserializationComponents by Delegates.notNull()
 
     // component dependency cycle
-    Inject
+    @Inject
     public fun setDeserializationComponents(components: DeserializationComponents) {
         this.components = components
     }
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 ec421ee3b13..81c4a6f03dc 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
@@ -204,7 +204,7 @@ public class DeserializedClassDescriptor(
         override fun computeNonDeclaredProperties(name: Name, descriptors: MutableCollection<PropertyDescriptor>) {
             val fromSupertypes = ArrayList<PropertyDescriptor>()
             for (supertype in classDescriptor.getTypeConstructor().supertypes) {
-                @suppress("UNCHECKED_CAST")
+                @Suppress("UNCHECKED_CAST")
                 fromSupertypes.addAll(supertype.memberScope.getProperties(name, NoLookupLocation.FOR_ALREADY_TRACKED) as Collection<PropertyDescriptor>)
             }
             generateFakeOverrides(name, fromSupertypes, descriptors)
@@ -216,7 +216,7 @@ public class DeserializedClassDescriptor(
                 override fun addFakeOverride(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 920c97152ad..f972056c09f 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
@@ -76,7 +76,7 @@ public abstract class DeserializedMemberScope protected constructor(
         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<D>()) { 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 185eb7d6daa..996b42ce438 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 IllegalCallableAccessException(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 IllegalCallableAccessException(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/_Deprecated.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt
index 49316f69bd9..926031282d2 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt
@@ -19,39 +19,39 @@ package kotlin.reflect.jvm
 import java.lang.reflect.Field
 import kotlin.reflect.*
 
-@deprecated("Use kotlinProperty instead.", ReplaceWith("kotlinProperty"))
+@Deprecated("Use kotlinProperty instead.", ReplaceWith("kotlinProperty"))
 public val Field.kotlin: KProperty<*>?
     get() = kotlinProperty
 
 
-@deprecated("Use memberProperties instead.", ReplaceWith("memberProperties"))
+@Deprecated("Use memberProperties instead.", ReplaceWith("memberProperties"))
 public val <T : Any> KClass<T>.properties: Collection<KProperty1<T, *>>
     get() = memberProperties
 
-@deprecated("Use extensionProperties instead.", ReplaceWith("extensionProperties"))
+@Deprecated("Use extensionProperties instead.", ReplaceWith("extensionProperties"))
 public val <T : Any> KClass<T>.extensionProperties: Collection<KProperty2<T, *, *>>
     get() = memberExtensionProperties
 
-@deprecated("Use declaredMemberProperties instead.", ReplaceWith("declaredMemberProperties"))
+@Deprecated("Use declaredMemberProperties instead.", ReplaceWith("declaredMemberProperties"))
 public val <T : Any> KClass<T>.declaredProperties: Collection<KProperty1<T, *>>
     get() = declaredMemberProperties
 
-@deprecated("Use declaredMemberExtensionProperties instead.", ReplaceWith("declaredMemberExtensionProperties"))
+@Deprecated("Use declaredMemberExtensionProperties instead.", ReplaceWith("declaredMemberExtensionProperties"))
 public val <T : Any> KClass<T>.declaredExtensionProperties: Collection<KProperty2<T, *, *>>
     get() = declaredMemberExtensionProperties
 
 
-@deprecated("Use isAccessible instead.", ReplaceWith("isAccessible"))
+@Deprecated("Use isAccessible instead.", ReplaceWith("isAccessible"))
 public var KProperty<*>.accessible: Boolean
     get() = isAccessible
     set(value) { isAccessible = value }
 
 @HiddenDeclaration
-@deprecated("Moved to package kotlin.jvm", ReplaceWith("java"))
+@Deprecated("Moved to package kotlin.jvm", ReplaceWith("java"))
 public val <T : Any> KClass<T>.java: Class<T>
     get() = java
 
 @HiddenDeclaration
-@deprecated("Moved to package kotlin.jvm", ReplaceWith("kotlin"))
+@Deprecated("Moved to package kotlin.jvm", ReplaceWith("kotlin"))
 public val <T : Any> Class<T>.kotlin: KClass<T>
     get() = kotlin
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt
index 4ae44a55b75..9b5433ea64b 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableImpl.kt
@@ -60,7 +60,7 @@ internal interface KCallableImpl<out R> : KCallable<R>, KAnnotatedElementImpl {
     override val returnType: KType
         get() = KTypeImpl(descriptor.returnType!!) { caller.returnType }
 
-    @suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     override fun call(vararg args: Any?): R = reflectionCall {
         return caller.call(args) as R
     }
@@ -112,7 +112,7 @@ internal interface KCallableImpl<out R> : KCallable<R>, KAnnotatedElementImpl {
             arguments.add(null)
         }
 
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         return reflectionCall {
             caller.call(arguments.toTypedArray()) as R
         }
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
index 0d49a45cdd4..67b206cb15a 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
@@ -70,7 +70,7 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclaration
             return emptyList()
         }
 
-    @suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     override fun getProperties(name: Name): Collection<PropertyDescriptor> =
             (memberScope.getProperties(name, NoLookupLocation.FROM_REFLECTION) +
              staticScope.getProperties(name, NoLookupLocation.FROM_REFLECTION)) as Collection<PropertyDescriptor>
@@ -110,7 +110,7 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclaration
         }
     }
 
-    @suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     override val constructors: Collection<KFunction<T>>
         get() = constructorDescriptors.map {
             KFunctionImpl(this, it) as KFunction<T>
@@ -137,7 +137,7 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclaration
             }
         }.filterNotNull().map { KClassImpl(it) }
 
-    @suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     override val objectInstance: T? by ReflectProperties.lazy {
         val descriptor = descriptor
         if (descriptor.kind != ClassKind.OBJECT) return@lazy null
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt
index 7c6a01b5cf8..adc1729a847 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt
@@ -158,7 +158,7 @@ internal abstract class KDeclarationContainerImpl : ClassBasedDeclarationContain
 
     // TODO: check resulting method's return type
     fun findMethodBySignature(
-            @suppress("UNUSED_PARAMETER") proto: ProtoBuf.Callable,
+            @Suppress("UNUSED_PARAMETER") proto: ProtoBuf.Callable,
             signature: JvmProtoBuf.JvmMethodSignature,
             nameResolver: NameResolver,
             declared: Boolean
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt
index 42f82c6d4aa..b2c30727a25 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@file:suppress("DEPRECATED_SYMBOL_WITH_MESSAGE")
+@file:Suppress("DEPRECATED_SYMBOL_WITH_MESSAGE")
 package kotlin.reflect.jvm.internal
 
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
index 3d2bea1fb81..f4cc50a177a 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
@@ -44,7 +44,7 @@ internal class KPackageImpl(override val jClass: Class<*>, val moduleName: Strin
     override val constructorDescriptors: Collection<ConstructorDescriptor>
         get() = emptyList()
 
-    @suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     override fun getProperties(name: Name): Collection<PropertyDescriptor> =
             scope.getProperties(name, NoLookupLocation.FROM_REFLECTION) as Collection<PropertyDescriptor>
 
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 af346803ba0..4cf52b34db0 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 @@ internal fun <T : Any> foreignKotlinClass(jClass: Class<T>): KClassImpl<T> {
     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<T>?
         if (kClass?.jClass == jClass) {
             return kClass!!
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt
index 5b03b7fce25..3d3f16598e3 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/mapping.kt
@@ -70,7 +70,7 @@ public val KFunction<*>.javaMethod: Method?
  * Returns a Java [Constructor] instance corresponding to the given Kotlin function,
  * or `null` if this function is not a constructor or cannot be represented by a Java [Constructor].
  */
-@suppress("UNCHECKED_CAST")
+@Suppress("UNCHECKED_CAST")
 public val <T> KFunction<T>.javaConstructor: Constructor<T>?
     get() = (this as? KCallableImpl<T>)?.caller?.member as? Constructor<T>
 
@@ -93,7 +93,7 @@ public val KType.javaType: Type
  * See the [Kotlin language documentation](http://kotlinlang.org/docs/reference/java-interop.html#package-level-functions)
  * for more information.
  */
-@deprecated("After dropping old package facades it would be impossible to retrieve package by java class")
+@Deprecated("After dropping old package facades it would be impossible to retrieve package by java class")
 public val Class<*>.kotlinPackage: KPackage?
     get() = if (getSimpleName().endsWith("Package") &&
                 getAnnotation(javaClass<kotlin.jvm.internal.KotlinPackage>()) != null) {
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt
index a26fca088ef..c61a5bb8092 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt
@@ -43,6 +43,6 @@ public fun <R> Function<R>.reflect(): KFunction<R>? {
     val context = DeserializationContext(moduleData.deserialization, nameResolver, moduleData.module,
                                          parentTypeDeserializer = null, typeParameters = listOf())
     val descriptor = MemberDeserializer(context).loadCallable(proto) as FunctionDescriptor
-    @suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     return KFunctionImpl(EmptyContainerForLocal, descriptor) as KFunction<R>
 }
diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/Lambda.kt b/core/runtime.jvm/src/kotlin/jvm/internal/Lambda.kt
index a8b68232083..71d4cba4951 100644
--- a/core/runtime.jvm/src/kotlin/jvm/internal/Lambda.kt
+++ b/core/runtime.jvm/src/kotlin/jvm/internal/Lambda.kt
@@ -19,6 +19,6 @@ package kotlin.jvm.internal
 public abstract class Lambda(private val arity: Int) : FunctionImpl() {
     override fun getArity() = arity
 
-    @suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
+    @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
     override fun toString() = "${(this as Object).getClass().getGenericInterfaces()[0]}"
 }
diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/PrimitiveSpreadBuilders.kt b/core/runtime.jvm/src/kotlin/jvm/internal/PrimitiveSpreadBuilders.kt
index 0646197b3ac..fb37ca7e6c0 100644
--- a/core/runtime.jvm/src/kotlin/jvm/internal/PrimitiveSpreadBuilders.kt
+++ b/core/runtime.jvm/src/kotlin/jvm/internal/PrimitiveSpreadBuilders.kt
@@ -21,7 +21,7 @@ private abstract class PrimitiveSpreadBuilder<T : Any>(private val size: Int) {
 
     protected var position: Int = 0
 
-    @suppress("CAST_NEVER_SUCCEEDS")
+    @Suppress("CAST_NEVER_SUCCEEDS")
     private val spreads: Array<T?> = arrayOfNulls<Any>(size) as Array<T?>
 
     public fun addSpread(spreadArgument: T) {
diff --git a/core/util.runtime/src/org/jetbrains/kotlin/utils/functions.kt b/core/util.runtime/src/org/jetbrains/kotlin/utils/functions.kt
index 5414a37327f..a613901dc93 100644
--- a/core/util.runtime/src/org/jetbrains/kotlin/utils/functions.kt
+++ b/core/util.runtime/src/org/jetbrains/kotlin/utils/functions.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.utils
 
 private val IDENTITY: (Any?) -> Any? = { it }
 
-suppress("UNCHECKED_CAST")
+@Suppress("UNCHECKED_CAST")
 public fun <T> identity(): (T) -> T = IDENTITY as (T) -> T
 
 
diff --git a/eval4j/test/org/jetbrains/eval4j/test/main.kt b/eval4j/test/org/jetbrains/eval4j/test/main.kt
index 6b4b30a414b..eeadda6e676 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<Any>, size), arrayType)
     }
@@ -275,7 +275,7 @@ object REFLECTION_EVAL : Eval {
         if (invokespecial) {
             if (methodDesc.name == "<init>") {
                 // 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<Any>.findMethod(methodDesc: MethodDescription): Method? {
     for (declared in getDeclaredMethods()) {
         if (methodDesc.matches(declared)) return declared
@@ -341,7 +341,7 @@ fun Class<Any>.findMethod(methodDesc: MethodDescription): Method? {
     return null
 }
 
-@suppress("UNCHECKED_CAST")
+@Suppress("UNCHECKED_CAST")
 fun Class<Any>.findConstructor(methodDesc: MethodDescription): Constructor<Any?>? {
     for (declared in getDeclaredConstructors()) {
         if (methodDesc.matches(declared)) return declared as Constructor<Any?>
@@ -371,7 +371,7 @@ fun MethodDescription.matches(method: Method): Boolean {
     return returnType.matches(method.getReturnType()!!)
 }
 
-@suppress("UNCHECKED_CAST")
+@Suppress("UNCHECKED_CAST")
 fun Class<Any>.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 bcb6cc7b13c..0987afa8c69 100644
--- a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt
@@ -48,12 +48,12 @@ fun generate(): String {
     val binaryOperationsMap = arrayListOf<Pair<String, List<JetType>>>()
 
     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<ClassDescriptor>
 
     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<FunctionDescriptor>
 
diff --git a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
index 57b0387a1a0..669bac933c0 100644
--- a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
@@ -24,13 +24,12 @@ import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf
 import org.jetbrains.kotlin.utils.Printer
 import java.io.File
 import java.util.*
-import kotlin.platform.platformStatic
 
 class GenerateProtoBufCompare {
     companion object {
         val DEST_FILE: File = File("jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt")
 
-        platformStatic
+        @JvmStatic
         fun main(args: Array<String>) {
             generate(DEST_FILE)
         }
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index ff4ceb730e6..b690b2677b8 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -953,7 +953,7 @@ fun main(args: Array<String>) {
 private class TestGroup(val testsRoot: String, val testDataRoot: String) {
     inline fun <reified T: TestCase> testClass(
             suiteTestClass: String = getDefaultSuiteTestClass(javaClass<T>()),
-            @noinline init: TestClass.() -> Unit
+            noinline init: TestClass.() -> Unit
     ) {
         testClass(javaClass<T>(), suiteTestClass, init)
     }
diff --git a/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufConsistencyTest.kt b/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufConsistencyTest.kt
index 51b24e00653..0e8e0a0d4d2 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<Key, Descriptors.FieldDescriptor>()
 
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt
index fc75f3b6491..72adf022d86 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt
@@ -65,7 +65,7 @@ public class ReferenceVariantsHelper(
         }
     }
 
-    @jvmOverloads
+    @JvmOverloads
     public fun getReferenceVariants(
             expression: JetSimpleNameExpression,
             kindFilter: DescriptorKindFilter,
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/analysis/AnalyzerUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/analysis/AnalyzerUtil.kt
index 28c2150462a..77f388f1c39 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/analysis/AnalyzerUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/analysis/AnalyzerUtil.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices
 import org.jetbrains.kotlin.types.expressions.JetTypeInfo
 
-jvmOverloads
+@JvmOverloads
 public fun JetExpression.computeTypeInfoInContext(
         scope: JetScope,
         contextExpression: JetExpression = this,
@@ -43,7 +43,7 @@ public fun JetExpression.computeTypeInfoInContext(
             .getTypeInfo(scope.asLexicalScope(), this, expectedType, dataFlowInfo, trace, isStatement)
 }
 
-jvmOverloads
+@JvmOverloads
 public fun JetExpression.analyzeInContext(
         scope: JetScope,
         contextExpression: JetExpression = this,
@@ -56,7 +56,7 @@ public fun JetExpression.analyzeInContext(
     return trace.getBindingContext()
 }
 
-jvmOverloads
+@JvmOverloads
 public fun JetExpression.computeTypeInContext(
         scope: JetScope,
         contextExpression: JetExpression = this,
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsProjectDetector.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsProjectDetector.kt
index 4df516da13e..ff1e44f81ef 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsProjectDetector.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsProjectDetector.kt
@@ -19,14 +19,14 @@ package org.jetbrains.kotlin.idea.caches.resolve
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.module.ModuleManager
 import org.jetbrains.kotlin.idea.project.ProjectStructureUtil
-import kotlin.platform.platformStatic
 import com.intellij.psi.util.CachedValuesManager
 import com.intellij.psi.util.CachedValueProvider
 import com.intellij.openapi.roots.ProjectRootModificationTracker
 
 //TODO: this should go away to support cross-platform projects
 public object JsProjectDetector {
-    platformStatic public fun isJsProject(project: Project): Boolean {
+    @JvmStatic
+    public fun isJsProject(project: Project): Boolean {
         return CachedValuesManager.getManager(project).getCachedValue(project) {
             val result = ModuleManager.getInstance(project).getModules().any { ProjectStructureUtil.isJsKotlinModule(it) }
             CachedValueProvider.Result(result, ProjectRootModificationTracker.getInstance(project))
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt
index 81630b85866..9f456e6bc90 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt
@@ -37,13 +37,13 @@ import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.resolve.TargetPlatform
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 import org.jetbrains.kotlin.utils.keysToMap
-import kotlin.platform.platformStatic
 
 private val LOG = Logger.getInstance(javaClass<KotlinCacheService>())
 
 public class KotlinCacheService(val project: Project) {
     companion object {
-        platformStatic public fun getInstance(project: Project): KotlinCacheService = ServiceManager.getService(project, javaClass<KotlinCacheService>())!!
+        @JvmStatic
+        public fun getInstance(project: Project): KotlinCacheService = ServiceManager.getService(project, javaClass<KotlinCacheService>())!!
     }
 
     public fun getResolutionFacade(elements: List<JetElement>): ResolutionFacade {
@@ -76,7 +76,7 @@ public class KotlinCacheService(val project: Project) {
         }
     }
 
-    deprecated("Use JetElement.getResolutionFacade(), please avoid introducing new usages")
+    @Deprecated("Use JetElement.getResolutionFacade(), please avoid introducing new usages")
     public fun <T : Any> getProjectService(platform: TargetPlatform, ideaModuleInfo: IdeaModuleInfo, serviceClass: Class<T>): T {
         return globalFacade(platform).resolverForModuleInfo(ideaModuleInfo).componentProvider.getService(serviceClass)
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt
index c28b803c5cb..2093291a402 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt
@@ -25,14 +25,14 @@ import com.intellij.openapi.vfs.VirtualFileAdapter
 import com.intellij.openapi.vfs.VirtualFileEvent
 import com.intellij.openapi.vfs.VirtualFileMoveEvent
 import com.intellij.openapi.roots.ProjectFileIndex
-import kotlin.platform.platformStatic
 import com.intellij.codeInsight.ExternalAnnotationsManager
 import com.intellij.codeInsight.ExternalAnnotationsListener
 import com.intellij.psi.PsiModifierListOwner
 
 class LibraryModificationTracker(project: Project) : SimpleModificationTracker() {
     companion object {
-        platformStatic fun getInstance(project: Project) = ServiceManager.getService(project, javaClass<LibraryModificationTracker>())!!
+        @JvmStatic
+        fun getInstance(project: Project) = ServiceManager.getService(project, javaClass<LibraryModificationTracker>())!!
     }
 
     init {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
index 7102b4b4da6..c6f9e0ecd80 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
@@ -55,7 +55,7 @@ public fun JetFile.resolveImportReference(fqName: FqName): Collection<Declaratio
 // analyze - see ResolveSessionForBodies, ResolveElementCache
 // analyzeFully - see KotlinResolveCache, KotlinResolveDataProvider
 // In the future these two approaches should be unified
-@jvmOverloads
+@JvmOverloads
 public fun JetElement.analyze(bodyResolveMode: BodyResolveMode = BodyResolveMode.FULL): BindingContext {
     return getResolutionFacade().analyze(this, bodyResolveMode)
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt
index 770c29e7eea..a9bf3e851c0 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt
@@ -29,11 +29,11 @@ import com.intellij.openapi.vfs.VirtualFileMoveEvent
 import com.intellij.openapi.vfs.VirtualFileCopyEvent
 import com.intellij.openapi.vfs.VirtualFilePropertyEvent
 import com.intellij.openapi.util.SimpleModificationTracker
-import kotlin.platform.platformStatic
 
 class ModuleTypeCacheManager private constructor(project: Project) {
     companion object {
-        platformStatic fun getInstance(project: Project) = ServiceManager.getService(project, javaClass<ModuleTypeCacheManager>())
+        @JvmStatic
+        fun getInstance(project: Project) = ServiceManager.getService(project, javaClass<ModuleTypeCacheManager>())
     }
 
     private val vfsModificationTracker = VfsModificationTracker(project)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinClsFileBase.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinClsFileBase.kt
index f1ab8003f33..1325c1ff581 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinClsFileBase.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinClsFileBase.kt
@@ -69,7 +69,7 @@ public abstract class KotlinClsFileBase(val provider: KotlinClassFileViewProvide
         decompiledText.drop()
     }
 
-    TestOnly
+    @TestOnly
     fun getRenderedDescriptorsToRange(): Map<String, TextRange> {
         return decompiledText.get().renderedDescriptorsToRange
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/KotlinJavaScriptLibraryDetectionUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/KotlinJavaScriptLibraryDetectionUtil.kt
index 2d0ec40d72c..62e655148b1 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/KotlinJavaScriptLibraryDetectionUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/KotlinJavaScriptLibraryDetectionUtil.kt
@@ -25,14 +25,13 @@ import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.idea.caches.JarUserDataManager
 import org.jetbrains.kotlin.js.JavaScript
 import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
-import kotlin.platform.platformStatic
 
 public object KotlinJavaScriptLibraryDetectionUtil {
-    platformStatic
+    @JvmStatic
     public fun isKotlinJavaScriptLibrary(library: Library): Boolean =
             isKotlinJavaScriptLibrary(library.getFiles(OrderRootType.CLASSES).toList())
 
-    platformStatic
+    @JvmStatic
     public fun isKotlinJavaScriptLibrary(classesRoots: List<VirtualFile>): Boolean {
         // Prevent clashing with java runtime
         if (JavaRuntimeDetectionUtil.getJavaRuntimeVersion(classesRoots) != null) return false
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 43c6332c626..355e149d928 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
@@ -48,7 +48,6 @@ import org.jetbrains.kotlin.psi.JetParameter
 import org.jetbrains.kotlin.psi.JetReferenceExpression
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
-import kotlin.platform.platformStatic
 
 public open class JetPsiChecker : Annotator, HighlightRangeExtension {
 
@@ -222,13 +221,15 @@ public open class JetPsiChecker : Annotator, HighlightRangeExtension {
         var namesHighlightingEnabled = true
             @TestOnly set
 
-        platformStatic fun highlightName(holder: AnnotationHolder, psiElement: PsiElement, attributesKey: TextAttributesKey) {
+        @JvmStatic
+        fun highlightName(holder: AnnotationHolder, psiElement: PsiElement, attributesKey: TextAttributesKey) {
             if (namesHighlightingEnabled) {
                 holder.createInfoAnnotation(psiElement, null).setTextAttributes(attributesKey)
             }
         }
 
-        platformStatic fun highlightName(holder: AnnotationHolder, textRange: TextRange, attributesKey: TextAttributesKey) {
+        @JvmStatic
+        fun highlightName(holder: AnnotationHolder, textRange: TextRange, attributesKey: TextAttributesKey) {
             if (namesHighlightingEnabled) {
                 holder.createInfoAnnotation(textRange, null).setTextAttributes(attributesKey)
             }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinBeforeResolveHighlightingPass.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinBeforeResolveHighlightingPass.kt
index f15b5650ddd..0d5a469c4e2 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinBeforeResolveHighlightingPass.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinBeforeResolveHighlightingPass.kt
@@ -41,7 +41,7 @@ public class KotlinBeforeResolveHighlightingPass(
         document: Document
 ) : TextEditorHighlightingPass(file.project, document), DumbAware {
 
-    private volatile var annotationHolder: AnnotationHolderImpl? = null
+    @Volatile private var annotationHolder: AnnotationHolderImpl? = null
 
     override fun doCollectInformation(progress: ProgressIndicator) {
         val annotationHolder = AnnotationHolderImpl(AnnotationSession(file))
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt
index 11a72e3bb00..564843059f3 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt
@@ -53,7 +53,7 @@ public abstract class IntentionBasedInspection<TElement : JetElement>(
             override fun visitElement(element: PsiElement) {
                 if (!elementType.isInstance(element) || element.getTextLength() == 0) return
 
-                @suppress("UNCHECKED_CAST")
+                @Suppress("UNCHECKED_CAST")
                 val targetElement = element as TElement
 
                 var problemRange: TextRange? = null
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt
index 2ee99ea3f13..147e8a931db 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt
@@ -71,7 +71,7 @@ public abstract class JetSelfTargetingIntention<TElement : JetElement>(
         }
 
         for (element in elementsToCheck) {
-            @suppress("UNCHECKED_CAST")
+            @Suppress("UNCHECKED_CAST")
             if (elementType.isInstance(element) && isApplicableTo(element as TElement, offset)) {
                 return element as TElement
             }
@@ -111,7 +111,7 @@ public abstract class JetSelfTargetingIntention<TElement : JetElement>(
 
         fun <TElement : JetElement> findInspection(intentionClass: Class<out JetSelfTargetingIntention<TElement>>): IntentionBasedInspection<TElement>? {
             if (intentionBasedInspections.containsKey(intentionClass)) {
-                @suppress("UNCHECKED_CAST")
+                @Suppress("UNCHECKED_CAST")
                 return intentionBasedInspections[intentionClass] as IntentionBasedInspection<TElement>?
             }
 
@@ -119,7 +119,7 @@ public abstract class JetSelfTargetingIntention<TElement : JetElement>(
                 val inspection = extension.instance as? IntentionBasedInspection<*> ?: continue
                 if (inspection.intentions.any { it.intention.javaClass == intentionClass }) {
                     intentionBasedInspections[intentionClass] = inspection
-                    @suppress("UNCHECKED_CAST")
+                    @Suppress("UNCHECKED_CAST")
                     return inspection as IntentionBasedInspection<TElement>
                 }
             }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt
index ce2f0a6ed4e..8578f58c585 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt
@@ -47,10 +47,12 @@ import java.net.URL
 
 public class BuiltInsReferenceResolver(val project: Project, val startupManager: StartupManager) {
 
-    volatile private var moduleDescriptor: ModuleDescriptor? = null
-    volatile public var builtInsSources: Set<JetFile>? = null
+    @Volatile private var moduleDescriptor: ModuleDescriptor? = null
+
+    @Volatile public var builtInsSources: Set<JetFile>? = null
         private set
-    volatile private var builtinsPackageFragment: PackageFragmentDescriptor? = null
+
+    @Volatile private var builtinsPackageFragment: PackageFragmentDescriptor? = null
 
     init {
         startupManager.runWhenProjectIsInitialized { initialize() }
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 983f9885c27..b214b77f639 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
@@ -65,7 +65,7 @@ public abstract class AbstractJetReference<T : JetElement>(element: T)
 
     override fun bindToElement(element: PsiElement): PsiElement = throw IncorrectOperationException()
 
-    @suppress("CAST_NEVER_SUCCEEDS")
+    @Suppress("CAST_NEVER_SUCCEEDS")
     override fun getVariants(): Array<Any> = PsiReference.EMPTY_ARRAY as Array<Any>
 
     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 d2c8213c554..e8d9613845a 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
@@ -78,7 +78,7 @@ public class JetReferenceContributor() : PsiReferenceContributor() {
     private fun <E : JetElement> PsiReferenceRegistrar.registerMultiProvider(elementClass: Class<E>, factory: (E) -> Array<PsiReference>) {
         registerReferenceProvider(PlatformPatterns.psiElement(elementClass), object: PsiReferenceProvider() {
             override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array<PsiReference> {
-                @suppress("UNCHECKED_CAST")
+                @Suppress("UNCHECKED_CAST")
                 return factory(element as E)
             }
         })
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 9a66dae79a4..0cfa26f9bca 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<Tr
         val element = node.getElement()
         if (element !is JetClassOrObject) return listOf()
 
-        @suppress("USELESS_CAST") // KT-3996 Workaround
+        @Suppress("USELESS_CAST") // KT-3996 Workaround
         val project = (element as NavigatablePsiElement).getProject()
 
         val context = element.analyze()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeClassByPackageIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeClassByPackageIndex.kt
index 2638710645e..c0057756e84 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeClassByPackageIndex.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeClassByPackageIndex.kt
@@ -31,6 +31,7 @@ public class JetFileFacadeClassByPackageIndex private constructor() : StringStub
     companion object {
         private val KEY = KotlinIndexUtil.createIndexKey(JetFileFacadeClassByPackageIndex::class.java)
         public val INSTANCE: JetFileFacadeClassByPackageIndex = JetFileFacadeClassByPackageIndex()
-        public @jvmStatic fun getInstance(): JetFileFacadeClassByPackageIndex = INSTANCE
+        @JvmStatic
+        public fun getInstance(): JetFileFacadeClassByPackageIndex = INSTANCE
     }
 }
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeFqNameIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeFqNameIndex.kt
index 2fa12c7fc2d..6d19a5a92c5 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeFqNameIndex.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeFqNameIndex.kt
@@ -31,6 +31,7 @@ public class JetFileFacadeFqNameIndex private constructor() : StringStubIndexExt
     companion object {
         private val KEY = KotlinIndexUtil.createIndexKey(JetFileFacadeFqNameIndex::class.java)
         public val INSTANCE: JetFileFacadeFqNameIndex = JetFileFacadeFqNameIndex()
-        public @jvmStatic fun getInstance(): JetFileFacadeFqNameIndex = INSTANCE
+        @JvmStatic
+        public fun getInstance(): JetFileFacadeFqNameIndex = INSTANCE
     }
 }
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeShortNameIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeShortNameIndex.kt
index 597a86dacd3..bc4ebccbf68 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeShortNameIndex.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeShortNameIndex.kt
@@ -31,6 +31,7 @@ public class JetFileFacadeShortNameIndex private constructor() : StringStubIndex
     companion object {
         private val KEY = KotlinIndexUtil.createIndexKey(JetFileFacadeShortNameIndex::class.java)
         public val INSTANCE: JetFileFacadeShortNameIndex = JetFileFacadeShortNameIndex()
-        public @jvmStatic fun getInstance(): JetFileFacadeShortNameIndex = INSTANCE
+        @JvmStatic
+        public fun getInstance(): JetFileFacadeShortNameIndex = INSTANCE
     }
 }
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFilePartClassIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFilePartClassIndex.kt
index ac60220b94b..592e8fc2bc6 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFilePartClassIndex.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFilePartClassIndex.kt
@@ -32,6 +32,7 @@ public class JetFilePartClassIndex private constructor() : StringStubIndexExtens
     companion object {
         private val KEY = KotlinIndexUtil.createIndexKey(JetFilePartClassIndex::class.java)
         public val INSTANCE: JetFilePartClassIndex = JetFilePartClassIndex()
-        public @jvmStatic fun getInstance(): JetFilePartClassIndex = INSTANCE
+        @JvmStatic
+        public fun getInstance(): JetFilePartClassIndex = INSTANCE
     }
 }
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt
index 556258abbbb..b86c021c31f 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt
@@ -21,7 +21,6 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.stubs.StubIndex
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.name.FqName
-import kotlin.platform.platformStatic
 import com.intellij.util.containers.MultiMap
 import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
 import com.intellij.psi.util.CachedValuesManager
@@ -30,7 +29,8 @@ import com.intellij.psi.util.PsiModificationTracker
 import org.jetbrains.kotlin.name.Name
 
 public object PackageIndexUtil {
-    platformStatic public fun getSubPackageFqNames(
+    @JvmStatic
+    public fun getSubPackageFqNames(
             packageFqName: FqName,
             scope: GlobalSearchScope,
             project: Project,
@@ -39,7 +39,8 @@ public object PackageIndexUtil {
         return SubpackagesIndexService.getInstance(project).getSubpackages(packageFqName, scope, nameFilter)
     }
 
-    platformStatic public fun findFilesWithExactPackage(
+    @JvmStatic
+    public fun findFilesWithExactPackage(
             packageFqName: FqName,
             searchScope: GlobalSearchScope,
             project: Project
@@ -47,7 +48,8 @@ public object PackageIndexUtil {
         return JetExactPackagesIndex.getInstance().get(packageFqName.asString(), project, searchScope)
     }
 
-    platformStatic public fun packageExists(
+    @JvmStatic
+    public fun packageExists(
             packageFqName: FqName,
             searchScope: GlobalSearchScope,
             project: Project
@@ -56,7 +58,8 @@ public object PackageIndexUtil {
                SubpackagesIndexService.getInstance(project).hasSubpackages(packageFqName, searchScope)
     }
 
-    platformStatic public fun containsFilesWithExactPackage(
+    @JvmStatic
+    public fun containsFilesWithExactPackage(
             packageFqName: FqName,
             searchScope: GlobalSearchScope,
             project: Project
@@ -71,7 +74,8 @@ public object PackageIndexUtil {
         return result
     }
 
-    platformStatic public fun getAllPossiblePackageClasses(project: Project): MultiMap<String, FqName> {
+    @JvmStatic
+    public fun getAllPossiblePackageClasses(project: Project): MultiMap<String, FqName> {
         return CachedValuesManager.getManager(project).getCachedValue(project) {
             Result(computeAllPossiblePackageClasses(project), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT)
         }!!
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StaticFacadeIndexUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StaticFacadeIndexUtil.kt
index b4db214b452..e0fbea4f4b8 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StaticFacadeIndexUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StaticFacadeIndexUtil.kt
@@ -26,7 +26,8 @@ import org.jetbrains.kotlin.psi.JetFile
 public object StaticFacadeIndexUtil {
 
     // TODO change as we introduce multi-file facades (this will require a separate index)
-    @JvmStatic public fun findFilesForFilePart(
+    @JvmStatic
+    public fun findFilesForFilePart(
             partFqName: FqName,
             searchScope: GlobalSearchScope,
             project: Project
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt
index 91fe777f763..0a06cef1a8a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt
@@ -39,6 +39,6 @@ public fun Project.executeCommand(name: String, groupId: Any? = null, command: (
 public fun <T> 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 91cbfdf5753..e6a1f7a64aa 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
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.resolve.ImportPath
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.components.ServiceManager
-import kotlin.platform.platformStatic
 import java.util.*
 
 public abstract class ImportInsertHelper {
@@ -42,7 +41,7 @@ public abstract class ImportInsertHelper {
     public abstract fun importDescriptor(file: JetFile, descriptor: DeclarationDescriptor): ImportDescriptorResult
 
     companion object {
-        @platformStatic
+        @JvmStatic
         public fun getInstance(project: Project): ImportInsertHelper
             = ServiceManager.getService<ImportInsertHelper>(project, javaClass<ImportInsertHelper>())
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
index 9caabd79a44..fd97eac9ee4 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
@@ -68,7 +68,7 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options.
         }
     }
 
-    @jvmOverloads
+    @JvmOverloads
     public fun process(element: JetElement, elementFilter: (PsiElement) -> FilterResult = { FilterResult.PROCESS }): JetElement {
         return process(listOf(element), elementFilter).single()
     }
@@ -125,7 +125,7 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options.
         PROCESS
     }
 
-    @jvmOverloads
+    @JvmOverloads
     public fun process(elements: Iterable<JetElement>, elementFilter: (PsiElement) -> FilterResult = { FilterResult.PROCESS }): Collection<JetElement> {
         return elements.groupBy { element -> element.getContainingJetFile() }
                 .flatMap { shortenReferencesInFile(it.key, it.value, elementFilter) }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinder.kt
index f8d8f1574ea..c164ee2b99f 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinder.kt
@@ -20,11 +20,10 @@ import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
-import kotlin.platform.platformStatic
 
 public interface JsVirtualFileFinder : VirtualFileFinder {
     public object SERVICE {
-        platformStatic
+        @JvmStatic
         public fun getInstance(project: Project): JsVirtualFileFinder =
             ServiceManager.getService(project, javaClass<JsVirtualFileFinderFactory>()).create(GlobalSearchScope.allScope(project))
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinderFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinderFactory.kt
index d73875dd700..6d587bc9578 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinderFactory.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinderFactory.kt
@@ -20,13 +20,12 @@ import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory
-import kotlin.platform.platformStatic
 
 public interface JsVirtualFileFinderFactory : VirtualFileFinderFactory {
     override fun create(scope: GlobalSearchScope): JsVirtualFileFinder
 
     public object SERVICE {
-        platformStatic
+        @JvmStatic
         public fun getInstance(project: Project): JsVirtualFileFinderFactory =
                 ServiceManager.getService(project, javaClass<JsVirtualFileFinderFactory>())
     }
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt
index 6267bcdb93c..361f05afe08 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt
@@ -45,8 +45,7 @@ import org.jetbrains.kotlin.types.typeUtil.TypeNullability
 import org.jetbrains.kotlin.types.typeUtil.nullability
 import java.util.*
 
-@tailRecursive
-fun <T : Any> LookupElement.putUserDataDeep(key: Key<T>, value: T?) {
+tailrec fun <T : Any> LookupElement.putUserDataDeep(key: Key<T>, value: T?) {
     if (this is LookupElementDecorator<*>) {
         getDelegate().putUserDataDeep(key, value)
     }
@@ -55,8 +54,7 @@ fun <T : Any> LookupElement.putUserDataDeep(key: Key<T>, value: T?) {
     }
 }
 
-@tailRecursive
-fun <T : Any> LookupElement.getUserDataDeep(key: Key<T>): T? {
+tailrec fun <T : Any> LookupElement.getUserDataDeep(key: Key<T>): T? {
     if (this is LookupElementDecorator<*>) {
         return getDelegate().getUserDataDeep(key)
     }
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 f260e617c50..96313d6d3b9 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
@@ -169,7 +169,7 @@ fun<TDescriptor: DeclarationDescriptor?> MutableCollection<LookupElement>.addLoo
     for (info in expectedInfos) {
         val classification = infoClassifier(info)
         if (classification.substitutor != null) {
-            @suppress("UNCHECKED_CAST")
+            @Suppress("UNCHECKED_CAST")
             val substitutedDescriptor = descriptor.substituteFixed(classification.substitutor)
             val map = if (classification.makeNotNullable) makeNullableInfos else matchedInfos
             map.getOrPut(ItemData(substitutedDescriptor, info.itemOptions)) { ArrayList() }.add(info)
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt
index 0cd608d3030..3ecf0d53fed 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import java.io.File
 
-deprecated("All tests from here to be moved to the generated test")
+@Deprecated("All tests from here to be moved to the generated test")
 public class BasicCompletionHandlerTest : CompletionHandlerTestBase(){
     private fun checkResult(){
         fixture.checkResultByFile(getTestName(false) + ".kt.after")
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt
index aa262d69544..95de7cd2788 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 import java.util.Collections
 import java.util.HashSet
 
-public class CollectingNameValidator @jvmOverloads constructor(
+public class CollectingNameValidator @JvmOverloads constructor(
         existingNames: Collection<String> = Collections.emptySet(),
         private val filter: (String) -> Boolean = { true }
 ): (String) -> Boolean {
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt
index 2f5ecbe1624..598b83a78b5 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.calls.callUtil.getValueArgumentsInParentheses
 import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
 
-@suppress("UNCHECKED_CAST")
+@Suppress("UNCHECKED_CAST")
 public inline fun <reified T: PsiElement> PsiElement.replaced(newElement: T): T {
     val result = replace(newElement)
     return if (result is T)
@@ -37,7 +37,7 @@ public inline fun <reified T: PsiElement> PsiElement.replaced(newElement: T): T
         (result as JetParenthesizedExpression).getExpression() as T
 }
 
-@suppress("UNCHECKED_CAST")
+@Suppress("UNCHECKED_CAST")
 public fun <T: PsiElement> T.copied(): T = copy() as T
 
 public fun JetFunctionLiteralArgument.moveInsideParentheses(bindingContext: BindingContext): JetCallExpression {
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
index ae757c5589c..aaf44490b79 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
@@ -271,7 +271,7 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<Kotlin
         val importHelper = ImportInsertHelper.getInstance(file.getProject())
         val smartPointerManager = SmartPointerManager.getInstance(file.getProject())
 
-        @data class BindingRequest(
+        data class BindingRequest(
                 val pointer: SmartPsiElementPointer<JetSimpleNameExpression>,
                 val fqName: FqName
         )
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 d938870a413..82d44741e76 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<out PsiElement?> {
-        @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/conversion/copy/ConvertJavaCopyPastePostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
index 9d134cffa77..b80953e46d9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
@@ -78,7 +78,7 @@ public class ConvertJavaCopyPastePostProcessor : CopyPastePostProcessor<TextBloc
         val document = editor.getDocument()
         val targetFile = PsiDocumentManager.getInstance(project).getPsiFile(document) as? JetFile ?: return
 
-        @data class Result(val text: String?, val referenceData: Collection<KotlinReferenceData>, val explicitImports: Set<FqName>)
+        data class Result(val text: String?, val referenceData: Collection<KotlinReferenceData>, val explicitImports: Set<FqName>)
 
         fun doConversion(): Result {
             val dataForConversion = DataForConversion.prepare(data, project)
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt
index b0cb4a50ace..b49107fa2cb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt
@@ -279,7 +279,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
@@ -301,7 +301,7 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Mult
         }.filterNotNull()
     }
 
-    TestOnly
+    @TestOnly
     public fun addTypeMapper(file: JetFile, typeMapper: JetTypeMapper) {
         val value = CachedValuesManager.getManager(file.getProject()).createCachedValue<JetTypeMapper>(
                 { CachedValueProvider.Result<JetTypeMapper>(typeMapper, PsiModificationTracker.MODIFICATION_COUNT) }, false)
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt
index cbf9bafb077..f0618d90ac3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt
@@ -30,7 +30,7 @@ import com.intellij.xdebugger.settings.XDebuggerSettings
 import com.intellij.xdebugger.XDebuggerUtil
 import org.jetbrains.kotlin.idea.debugger.stepping.KotlinSteppingConfigurableUi
 
-State(name = "KotlinDebuggerSettings", storages = arrayOf(Storage(file = StoragePathMacros.APP_CONFIG + "/kotlin_debug.xml")))
+@State(name = "KotlinDebuggerSettings", storages = arrayOf(Storage(file = StoragePathMacros.APP_CONFIG + "/kotlin_debug.xml")))
 public class KotlinDebuggerSettings : XDebuggerSettings<KotlinDebuggerSettings>("kotlin_debugger"), Getter<KotlinDebuggerSettings> {
     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/findUsages/handlers/KotlinFindUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt
index aeaa03556f6..c9c0b7f5872 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt
@@ -35,7 +35,7 @@ public abstract class KotlinFindUsagesHandler<T : PsiElement>(psiElement: T,
                                                               public val factory: KotlinFindUsagesHandlerFactory)
     : FindUsagesHandler(psiElement) {
 
-    @suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     public fun getElement(): T {
         return getPsiElement() as T
     }
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 aa635f5cc4f..c4d69215417 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt
@@ -67,7 +67,7 @@ object SuperDeclarationMarkerTooltip: Function<JetDeclaration, String> {
 public class SuperDeclarationMarkerNavigationHandler : GutterIconNavigationHandler<JetDeclaration> {
     private var testNavigableElements: List<NavigatablePsiElement>? = null
 
-    TestOnly
+    @TestOnly
     public fun getNavigationElements(): List<NavigatablePsiElement> {
         val navigationResult = testNavigableElements!!
         testNavigableElements = null
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt
index 4a4cb58003c..7e92abf0b48 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt
@@ -222,13 +222,13 @@ public class ConflictingExtensionPropertyInspection : AbstractKotlinInspection()
     }
 
     private class MarkHiddenAndDeprecatedAction(property: JetProperty) : JetIntentionAction<JetProperty>(property) {
-        override fun getFamilyName() = "Mark with @HiddenDeclaration and @deprecated"
+        override fun getFamilyName() = "Mark with @HiddenDeclaration and @Deprecated"
         override fun getText() = familyName
 
         override fun invoke(project: Project, editor: Editor?, file: JetFile) {
             val factory = JetPsiFactory(project)
             val name = element.nameAsName!!.render()
-            element.addAnnotationWithLineBreak(factory.createAnnotationEntry("@deprecated(\"Is replaced with automatic synthetic extension\", ReplaceWith(\"$name\"))"))
+            element.addAnnotationWithLineBreak(factory.createAnnotationEntry("@Deprecated(\"Is replaced with automatic synthetic extension\", ReplaceWith(\"$name\"))"))
             element.addAnnotationWithLineBreak(factory.createAnnotationEntry("@HiddenDeclaration"))
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignmentIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignmentIntention.kt
index 30b73c021b1..a20ef0aa552 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignmentIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignmentIntention.kt
@@ -88,8 +88,7 @@ public class ReplaceWithOperatorAssignmentIntention : JetSelfTargetingOffsetInde
         element.replace(JetPsiFactory(element).createExpression(replacement))
     }
 
-    @tailRecursive
-    private fun buildOperatorAssignmentText(variableExpression: JetSimpleNameExpression, expression: JetBinaryExpression, tail: String): String {
+    tailrec private fun buildOperatorAssignmentText(variableExpression: JetSimpleNameExpression, expression: JetBinaryExpression, tail: String): String {
         val operationText = expression.getOperationReference().getText()
         val variableName = variableExpression.getText()
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
index 9fbe64965eb..f53bbb3b3c2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
@@ -93,12 +93,12 @@ object J2KPostProcessingRegistrar {
 
     private inline fun <reified TElement : JetElement, TIntention: JetSelfTargetingRangeIntention<TElement>> registerIntentionBasedProcessing(
             intention: TIntention,
-            inlineOptions(InlineOption.ONLY_LOCAL_RETURN) apply: TIntention.(TElement) -> Unit
+            crossinline apply: TIntention.(TElement) -> Unit
     ) {
         _processings.add(object : J2kPostProcessing {
             override fun createAction(element: JetElement, diagnostics: Diagnostics): (() -> Unit)? {
                 if (!javaClass<TElement>().isInstance(element)) return null
-                @suppress("UNCHECKED_CAST")
+                @Suppress("UNCHECKED_CAST")
                 if (intention.applicabilityRange(element as TElement) == null) return null
                 return { intention.apply(element) }
             }
@@ -107,14 +107,14 @@ object J2KPostProcessingRegistrar {
 
     private inline fun <reified TElement : JetElement> registerDiagnosticBasedProcessing(
             diagnosticFactory: DiagnosticFactory<*>,
-            inlineOptions(InlineOption.ONLY_LOCAL_RETURN) fix: (TElement, Diagnostic) -> Unit
+            crossinline fix: (TElement, Diagnostic) -> Unit
     ) {
         registerDiagnosticBasedProcessingFactory(diagnosticFactory) { element: TElement, diagnostic: Diagnostic -> { fix(element, diagnostic) } }
     }
 
     private inline fun <reified TElement : JetElement> registerDiagnosticBasedProcessingFactory(
             diagnosticFactory: DiagnosticFactory<*>,
-            inlineOptions(InlineOption.ONLY_LOCAL_RETURN) fixFactory: (TElement, Diagnostic) -> (() -> Unit)?
+            crossinline fixFactory: (TElement, Diagnostic) -> (() -> Unit)?
     ) {
         _processings.add(object : J2kPostProcessing {
             override fun createAction(element: JetElement, diagnostics: Diagnostics): (() -> Unit)? {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
index d712f8c2dca..c570f39da7d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
@@ -51,7 +51,7 @@ import java.util.*
 public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction<JetSimpleNameExpression>(element), HighPriorityAction {
     private val modificationCountOnCreate = PsiModificationTracker.SERVICE.getInstance(element.getProject()).getModificationCount()
 
-    volatile private var anySuggestionFound: Boolean? = null
+    @Volatile private var anySuggestionFound: Boolean? = null
 
     private val suggestions: Collection<DeclarationDescriptor> by CachedValueProperty(
             {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/NullQuickFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/NullQuickFix.kt
index 2617290b7bf..97bddc49bf9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/NullQuickFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/NullQuickFix.kt
@@ -31,7 +31,7 @@ public object NullQuickFix : IntentionAction {
 
     override fun startInWriteAction() = false
 
-    override fun invoke(NotNull project: Project, editor: Editor?, file: PsiFile?) {
+    override fun invoke(@NotNull project: Project, editor: Editor?, file: PsiFile?) {
         throw UnsupportedOperationException("invoke() shouldn't be called")
     }
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixWithDelegateFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixWithDelegateFactory.kt
index e6d0bd179f9..e093124e3cf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixWithDelegateFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixWithDelegateFactory.kt
@@ -46,7 +46,7 @@ public open class QuickFixWithDelegateFactory(
 
     override fun startInWriteAction() = startInWriteAction
 
-    override fun invoke(NotNull project: Project, editor: Editor?, file: PsiFile?) {
+    override fun invoke(@NotNull project: Project, editor: Editor?, file: PsiFile?) {
         delegateFactory().invoke(project, editor, file)
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifyTypeExplicitlyFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifyTypeExplicitlyFix.kt
index 31e602fc5f9..6d66050614f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifyTypeExplicitlyFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifyTypeExplicitlyFix.kt
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.psi.JetNamedFunction
 import org.jetbrains.kotlin.psi.JetProperty
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 
-SuppressWarnings("IntentionDescriptionNotFoundInspection")
 public class SpecifyTypeExplicitlyFix : PsiElementBaseIntentionAction() {
     override fun getFamilyName() = "Specify type explicitly"
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index acba708931c..afb692d7393 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -166,7 +166,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
             val types = typeInfo.getPossibleTypes(this).reverse()
 
             // We have to use semantic equality here
-            @data class EqWrapper(val _type: JetType) {
+            data class EqWrapper(val _type: JetType) {
                 override fun equals(other: Any?) = this === other
                                                    || other is EqWrapper && JetTypeChecker.DEFAULT.equalTypes(_type, other._type)
                 override fun hashCode() = 0 // no good way to compute hashCode() that would agree with our equals()
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
index ee6b4479e2e..33c5d5b797e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
@@ -62,7 +62,7 @@ public abstract class DeprecatedSymbolUsageFixBase(
         fun fetchReplaceWithPattern(descriptor: DeclarationDescriptor, project: Project): ReplaceWith? {
             val annotationClass = descriptor.builtIns.deprecatedAnnotation
             val annotation = descriptor.annotations.findAnnotation(DescriptorUtils.getFqNameSafe(annotationClass)) ?: return null
-            val replaceWithValue = annotation.argumentValue(kotlin.deprecated::replaceWith.name) as? AnnotationDescriptor ?: return null
+            val replaceWithValue = annotation.argumentValue(kotlin.Deprecated::replaceWith.name) as? AnnotationDescriptor ?: return null
             val pattern = replaceWithValue.argumentValue(kotlin.ReplaceWith::expression.name) as? String ?: return null
             if (pattern.isEmpty()) return null
             val importValues = replaceWithValue.argumentValue(kotlin.ReplaceWith::imports.name) as? List<*> ?: return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt
index cc87043490a..ac7f66bafe5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt
@@ -220,11 +220,14 @@ public class JetChangeSignature(project: Project,
     }
 }
 
-TestOnly public fun createChangeInfo(project: Project,
-                                             callableDescriptor: CallableDescriptor,
-                                             configuration: JetChangeSignatureConfiguration,
-                                             bindingContext: BindingContext,
-                                             defaultValueContext: PsiElement): JetChangeInfo? {
+@TestOnly
+public fun createChangeInfo(
+        project: Project,
+        callableDescriptor: CallableDescriptor,
+        configuration: JetChangeSignatureConfiguration,
+        bindingContext: BindingContext,
+        defaultValueContext: PsiElement
+): JetChangeInfo? {
     val jetChangeSignature = JetChangeSignature(project, callableDescriptor, configuration, bindingContext, defaultValueContext, null)
     val declarations = if (callableDescriptor is CallableMemberDescriptor) {
         OverrideResolver.getDeepestSuperDeclarations(callableDescriptor)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt
index b1c46c9d179..17bdca71e47 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt
@@ -250,7 +250,7 @@ public class JetChangeSignatureDialog(
                         val columnInfo = parametersTableModel.getColumnInfos()[column]
 
                         if (JetPrimaryConstructorParameterTableModel.isValVarColumn(columnInfo))
-                            return (components.get(column) as @suppress("NO_TYPE_ARGUMENTS_ON_RHS") JComboBox).getSelectedItem()
+                            return (components.get(column) as @Suppress("NO_TYPE_ARGUMENTS_ON_RHS") JComboBox).getSelectedItem()
                         else if (JetCallableParameterTableModel.isTypeColumn(columnInfo))
                             return item.typeCodeFragment
                         else if (JetCallableParameterTableModel.isNameColumn(columnInfo))
@@ -270,7 +270,7 @@ public class JetChangeSignatureDialog(
             }
 
             private fun getEditorIndex(x: Int): Int {
-                @suppress("NAME_SHADOWING") var x = x
+                @Suppress("NAME_SHADOWING") var x = x
 
                 val columnLetters = if (isDefaultColumnEnabled())
                     intArrayOf(4, getParamNamesMaxLength(), getTypesMaxLength(), getDefaultValuesMaxLength())
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetUsageInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetUsageInfo.kt
index 9702a5a5e4f..fc988cc3910 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetUsageInfo.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetUsageInfo.kt
@@ -25,7 +25,7 @@ public abstract class JetUsageInfo<T : PsiElement> : UsageInfo {
     public constructor(element: T) : super(element)
     public constructor(reference: PsiReference) : super(reference)
 
-    @suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST")
     override fun getElement() = super.getElement() as T?
 
     public abstract fun processUsage(changeInfo: JetChangeInfo, element: T, allUsages: Array<out UsageInfo>): Boolean
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 93cc6296caa..d57c07985de 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
@@ -101,7 +101,7 @@ public class KotlinIntroduceParameterMethodUsageProcessor : IntroduceParameterMe
         val refElement = usage.getElement() as? JetReferenceExpression ?: return true
         val callElement = refElement.getParentOfTypeAndBranch<JetCallElement>(true) { getCalleeExpression() } ?: return true
         val delegateUsage = if (callElement is JetConstructorDelegationCall) {
-            @suppress("CAST_NEVER_SUCCEEDS")
+            @Suppress("CAST_NEVER_SUCCEEDS")
             (JetConstructorDelegationCallUsage(callElement, changeInfo) as JetUsageInfo<JetCallElement>)
         }
         else {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
index bc80ebe7d82..a70143bcec5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
@@ -660,7 +660,7 @@ public fun (() -> Any).runRefactoringWithPostprocessing(
     this()
 }
 
-@throws(ConfigurationException::class)
+@Throws(ConfigurationException::class)
 public fun JetElement.validateElement(errorMessage: String) {
     try {
         AnalyzingUtils.checkForSyntacticErrors(this)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
index ed22e10c1db..ca07b175186 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
@@ -75,7 +75,7 @@ public fun JetElement.getInternalReferencesToUpdateOnPackageNameChange(packageNa
 
     val importPaths = file.getImportDirectives().map { it.getImportPath() }.filterNotNull()
 
-    @tailRecursive fun isImported(descriptor: DeclarationDescriptor): Boolean {
+    tailrec fun isImported(descriptor: DeclarationDescriptor): Boolean {
         val fqName = DescriptorUtils.getFqName(descriptor).let { if (it.isSafe()) it.toSafe() else return@isImported false }
         if (importPaths.any { fqName.isImported(it, false) }) return true
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt
index fd0a00d0620..12e9881c49b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt
@@ -30,9 +30,9 @@ import org.jetbrains.kotlin.test.TestMetadata
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance
 import org.junit.runner.RunWith
 
-TestMetadata("idea/testData/quickfix.special")
-TestDataPath("\$PROJECT_ROOT")
-RunWith(JUnit3RunnerWithInners::class)
+@TestMetadata("idea/testData/quickfix.special")
+@TestDataPath("\$PROJECT_ROOT")
+@RunWith(JUnit3RunnerWithInners::class)
 public class DeprecatedSymbolUsageFixSpecialTest : JetLightCodeInsightFixtureTestCase() {
     override fun getTestDataPath() = JetTestUtils.getHomeDirectory()
     override fun getProjectDescriptor() = ProjectDescriptorWithStdlibSources.INSTANCE
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 7354339270f..847f5adcfaf 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() }.toTypedArray() as Array<Any?>
                     javaClass<ExtractionOptions>().getConstructors().first { it.getParameterTypes().size() == args.size() }.newInstance(*args) as ExtractionOptions
                 } else ExtractionOptions.DEFAULT
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt b/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt
index aef7f690bb5..197cfba85c3 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt
@@ -46,7 +46,7 @@ fun<T> CodeBuilder.buildList(generators: Collection<() -> T>, separator: String,
     return this
 }
 
-platformName("appendElements")
+@JvmName("appendElements")
 fun CodeBuilder.append(elements: Collection<Element>, separator: String, prefix: String = "", suffix: String = ""): CodeBuilder {
     return buildList(elements.filter { !it.isEmpty }.map { { append(it) } }, separator, prefix, suffix)
 }
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt
index 0276a1665c0..97a89c990cc 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt
@@ -26,7 +26,6 @@ import org.jetbrains.jps.util.JpsPathUtil
 import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
 import java.io.File
 import java.util.ArrayList
-import kotlin.platform.platformStatic
 
 object JpsJsModuleUtils {
 
@@ -63,9 +62,9 @@ object JpsJsModuleUtils {
         })
     }
 
-    platformStatic
+    @JvmStatic
     fun getOutputFile(outputDir: File, moduleName: String) = File(outputDir, moduleName + KotlinJavascriptMetadataUtils.JS_EXT)
 
-    platformStatic
+    @JvmStatic
     fun getOutputMetaFile(outputDir: File, moduleName: String) = File(outputDir, moduleName + KotlinJavascriptMetadataUtils.META_JS_SUFFIX)
 }
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 c0b865d962a..2873e30f5ca 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
@@ -160,7 +160,7 @@ public class IncrementalCacheImpl(
         dependents.add(cache)
     }
 
-    TestOnly
+    @TestOnly
     public fun dump(): String {
         return maps.map { it.dump() }.join("\n\n")
     }
@@ -821,7 +821,7 @@ private object PathCollectionExternalizer : DataExternalizer<Collection<String>>
 private val File.normalizedPath: String
     get() = FileUtil.toSystemIndependentName(canonicalPath)
 
-TestOnly
+@TestOnly
 private fun <K : Comparable<K>, V> Map<K, V>.dumpMap(dumpValue: (V)->String): String =
         StringBuilder {
             append("{")
@@ -836,7 +836,7 @@ private fun <K : Comparable<K>, V> Map<K, V>.dumpMap(dumpValue: (V)->String): St
             append("}")
         }.toString()
 
-TestOnly
+@TestOnly
 public fun <T : Comparable<T>> Collection<T>.dumpCollection(): String =
         "[${sort().map(Any::toString).join(", ")}]"
 
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt
index c89fb8bc5ce..7ef01948a49 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt
@@ -64,7 +64,7 @@ public abstract class BasicMap<K : Comparable<K>, V>(
         storage.close()
     }
 
-    TestOnly
+    @TestOnly
     public fun dump(): String {
         return with(StringBuilder()) {
             with(Printer(this)) {
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 2ee2e68ebd0..eca21b76fbf 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -107,7 +107,7 @@ public abstract class AbstractIncrementalJpsTest(
 
     protected open fun createLookupTracker(): LookupTracker = LookupTracker.DO_NOTHING
 
-    protected open fun checkLookups(@suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) {}
+    protected open fun checkLookups(@Suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) {}
 
     fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult {
         val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath)
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 a7b67bb1e6e..96ea16c8762 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 43036629d6f..66571b4b30e 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<String, Any?> = hashMapOf()
 
     fun <T> 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 83c99099017..d8e66416652 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<JetSimpleNameExpression, VariableDescriptor>
 
         val variableDescriptor = diagnosticWithParameters.getA()
diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt
index fd5677e8f13..c29ccf3d747 100644
--- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt
+++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.resolve.BindingTrace
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.types.ErrorUtils
-import kotlin.platform.platformStatic
 
 public class JsAnalysisResult(
         public val bindingTrace: BindingTrace,
@@ -29,7 +28,8 @@ public class JsAnalysisResult(
 ) : AnalysisResult(bindingTrace.getBindingContext(), moduleDescriptor) {
 
     companion object {
-        platformStatic public fun success(trace: BindingTrace, module: ModuleDescriptor): JsAnalysisResult {
+        @JvmStatic
+        public fun success(trace: BindingTrace, module: ModuleDescriptor): JsAnalysisResult {
             return JsAnalysisResult(trace, module)
         }
     }
diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt
index 915a899537c..e235a739a2f 100644
--- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt
+++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt
@@ -45,7 +45,6 @@ import org.jetbrains.kotlin.resolve.constants.StringValue
 import org.jetbrains.kotlin.resolve.constants.TypedCompileTimeConstant
 import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator
 import org.jetbrains.kotlin.types.TypeUtils
-import kotlin.platform.platformStatic
 
 public class JsCallChecker(
         private val constantExpressionEvaluator: ConstantExpressionEvaluator
@@ -54,13 +53,13 @@ public class JsCallChecker(
     companion object {
         private val JS_PATTERN: DescriptorPredicate = PatternBuilder.pattern("kotlin.js.js(String)")
 
-        platformStatic
+        @JvmStatic
         public fun <F : CallableDescriptor?> ResolvedCall<F>.isJsCall(): Boolean {
             val descriptor = getResultingDescriptor()
             return descriptor is SimpleFunctionDescriptor && JS_PATTERN.apply(descriptor)
         }
 
-        platformStatic
+        @JvmStatic
         public fun extractStringValue(compileTimeConstant: CompileTimeConstant<*>?): String? {
             return ((compileTimeConstant as? TypedCompileTimeConstant<*>)?.constantValue as? StringValue)?.value
         }
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 93b56c47c75..9b4f7e64391 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<PsiElement>() {
     override fun markDiagnostic(diagnostic: ParametrizedDiagnostic<out PsiElement>): List<TextRange> {
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         val diagnosticWithParameters = diagnostic as DiagnosticWithParameters1<JetExpression, JsCallData>
         val textRange = diagnosticWithParameters.getA().reportRange
         return listOf(textRange)
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt
index ee754b8bc90..ec8abe9e344 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt
@@ -20,7 +20,6 @@ import com.google.dart.compiler.backend.js.ast.*
 import com.intellij.util.SmartList
 import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.*
 import org.jetbrains.kotlin.js.translate.utils.jsAstUtils.*
-import kotlin.platform.platformStatic
 
 /**
  * If inline function consists of multiple statements,
@@ -54,7 +53,7 @@ class ExpressionDecomposer private constructor(
     private var additionalStatements: MutableList<JsStatement> = SmartList()
 
     companion object {
-        platformStatic
+        @JvmStatic
         public fun preserveEvaluationOrder(
                 scope: JsScope, statement: JsStatement, canBeExtractedByInliner: (JsNode)->Boolean
         ): List<JsStatement> {
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt
index b77f5d82c33..820d8a4bd2e 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt
@@ -27,8 +27,6 @@ import org.jetbrains.kotlin.js.inline.util.rewriters.ReturnReplacingVisitor
 import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.newVar
 import org.jetbrains.kotlin.js.translate.utils.jsAstUtils.*
 
-import kotlin.platform.platformStatic
-
 class FunctionInlineMutator
 private constructor(
         private val call: JsInvocation,
@@ -230,7 +228,7 @@ private constructor(
 
     companion object {
 
-        platformStatic
+        @JvmStatic
         public fun getInlineableCallReplacement(call: JsInvocation, inliningContext: InliningContext): InlineableResult {
             val mutator = FunctionInlineMutator(call, inliningContext)
             mutator.process()
@@ -245,7 +243,7 @@ private constructor(
             return InlineableResult(inlineableBody, mutator.resultExpr)
         }
 
-        platformStatic
+        @JvmStatic
         private fun getThisReplacement(call: JsInvocation): JsExpression? {
             if (isCallInvocation(call)) {
                 return call.getArguments().get(0)
@@ -263,7 +261,7 @@ private constructor(
             return !thisRefs.isEmpty()
         }
 
-        platformStatic
+        @JvmStatic
         public fun canBeExpression(function: JsFunction): Boolean {
             return canBeExpression(function.getBody())
         }
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 5d7bdb0e6ba..dc93330935a 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
@@ -37,7 +37,6 @@ import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
 import org.jetbrains.kotlin.utils.LibraryUtils
 import org.jetbrains.kotlin.utils.sure
 import java.io.File
-import kotlin.platform.platformStatic
 
 // TODO: add hash checksum to defineModule?
 /**
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
index 9c573b257d5..86aeaf29b7b 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
@@ -33,7 +33,6 @@ import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
-import kotlin.platform.platformStatic
 
 public object KotlinJavascriptSerializationUtil {
     public val CLASS_METADATA_FILE_EXTENSION: String = "kjsm"
@@ -57,7 +56,7 @@ public object KotlinJavascriptSerializationUtil {
         nameStream.toByteArray()
     }
 
-    platformStatic
+    @JvmStatic
     public fun createPackageFragmentProvider(moduleDescriptor: ModuleDescriptor, metadata: ByteArray, storageManager: StorageManager): PackageFragmentProvider? {
         val contentMap = metadata.toContentMap()
 
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt
index 8400503a556..cabeba496c5 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt
@@ -32,11 +32,10 @@ import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
 import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind.NO_EXPLICIT_RECEIVER
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
-import kotlin.platform.platformStatic
 
 object CallTranslator {
-    jvmOverloads
-    platformStatic
+    @JvmOverloads
+    @JvmStatic
     fun translate(context: TranslationContext,
                   resolvedCall: ResolvedCall<out FunctionDescriptor>,
                   extensionOrDispatchReceiver: JsExpression? = null
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
index da897eda15e..2d55457acc5 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt
@@ -55,7 +55,6 @@ import org.jetbrains.kotlin.types.TypeUtils.topologicallySortSuperclassesAndReco
 import java.util.ArrayList
 import java.util.HashMap
 import java.util.HashSet
-import kotlin.platform.platformStatic
 
 /**
  * Generates a definition of a single class.
@@ -288,12 +287,12 @@ public class ClassTranslator private constructor(
             return result
         }
 
-        platformStatic
+        @JvmStatic
         public fun generateClassCreation(classDeclaration: JetClassOrObject, context: TranslationContext): JsInvocation {
             return ClassTranslator(classDeclaration, context).translate()
         }
 
-        platformStatic
+        @JvmStatic
         public fun generateObjectLiteral(objectDeclaration: JetObjectDeclaration, context: TranslationContext): JsExpression {
             return ClassTranslator(objectDeclaration, context).translateObjectLiteralExpression()
         }
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/InlineMetadata.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/InlineMetadata.kt
index a3c84767e5a..0e88c96a00a 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/InlineMetadata.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/InlineMetadata.kt
@@ -22,20 +22,18 @@ import org.jetbrains.kotlin.js.translate.context.Namer
 import org.jetbrains.kotlin.js.translate.context.TranslationContext
 import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.*
 
-import kotlin.platform.platformStatic
-
 private val METADATA_PROPERTIES_COUNT = 2
 
 public class InlineMetadata(val tag: JsStringLiteral, val function: JsFunction) {
     companion object {
-        platformStatic
+        @JvmStatic
         fun compose(function: JsFunction, descriptor: CallableDescriptor): InlineMetadata {
             val program = function.getScope().getProgram()
             val tag = program.getStringLiteral(Namer.getFunctionTag(descriptor))
             return InlineMetadata(tag, function)
         }
 
-        platformStatic
+        @JvmStatic
         fun decompose(expression: JsExpression?): InlineMetadata? =
                 when (expression) {
                     is JsInvocation -> decomposeCreateFunctionCall(expression)
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt
index 9a6a2a01d69..d595a805751 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt
@@ -36,7 +36,6 @@ import org.jetbrains.kotlin.types.JetType
 
 import java.util.ArrayList
 import java.util.Collections
-import kotlin.platform.platformStatic
 
 public class CallArgumentTranslator private constructor(
         private val resolvedCall: ResolvedCall<*>,
@@ -170,12 +169,12 @@ public class CallArgumentTranslator private constructor(
 
     companion object {
 
-        platformStatic
+        @JvmStatic
         public fun translate(resolvedCall: ResolvedCall<*>, receiver: JsExpression?, context: TranslationContext): ArgumentsInfo {
             return translate(resolvedCall, receiver, context, context.dynamicContext().jsBlock())
         }
 
-        platformStatic
+        @JvmStatic
         public fun translate(resolvedCall: ResolvedCall<*>, receiver: JsExpression?, context: TranslationContext, block: JsBlock): ArgumentsInfo {
             val innerContext = context.innerBlock(block)
             val argumentTranslator = CallArgumentTranslator(resolvedCall, receiver, innerContext)
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
index 8bc593e1699..257c9b63b64 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AbstractAndroidCompletionTest.kt
@@ -34,7 +34,7 @@ public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() {
         codeCompletionOldValue = settings.AUTOCOMPLETE_ON_CODE_COMPLETION
         smartTypeCompletionOldValue = settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION
 
-        @suppress("NON_EXHAUSTIVE_WHEN")
+        @Suppress("NON_EXHAUSTIVE_WHEN")
         when (completionType()) {
             CompletionType.SMART -> settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = false
             CompletionType.BASIC -> settings.AUTOCOMPLETE_ON_CODE_COMPLETION = false
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/SamePluginVersionsTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/SamePluginVersionsTest.kt
index f3db5943a42..3ea234dcf61 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/SamePluginVersionsTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/SamePluginVersionsTest.kt
@@ -40,7 +40,7 @@ public class SamePluginVersionsTest {
         return matcher.group(1)
     }
 
-    Test
+    @Test
     public fun sameIdeaVersionsTest() {
         val mainPluginXmlFile = File("idea/src/META-INF/plugin.xml")
         val androidExtensionsPluginXmlFile = File("plugins/android-idea-plugin/src/META-INF/plugin.xml")