Get rid of deprecated annotations and modifiers in project code

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
     }
 

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()

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

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)

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!!
             }