Make multiplatform expect/actual implicitly actualizing declarations with java classes on jvm

Author: serjsysoev

multiplatform-annotations/build.gradle.kts

@@ -1,4 +1,5 @@
 import org.gradle.jvm.tasks.Jar
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -60,17 +61,21 @@ kotlin {
                 compileOnly("org.jetbrains.kotlin:kotlin-stdlib")
             }
         }
+
+        val nonJvmMain by creating {}
+    }
+
+    targets.onEach {
+        if (it.platformType != KotlinPlatformType.jvm) {
+            it.compilations.getByName("main").source(sourceSets.getByName("nonJvmMain"))
+        }
     }
 
-    /**
-     * @Nls contains enum class. Kotlin automatically generates
-     * `.entries` method for every enum and adds @NotNull to it.
-     * This disables `.entries` generation.
-     */
     targets.all {
         compilations.all {
             compilerOptions.configure {
-                freeCompilerArgs.add("-XXLanguage:-EnumEntries")
+                optIn.add("kotlin.ExperimentalMultiplatform")
+                freeCompilerArgs.add("-Xexpect-actual-classes")
             }
         }
     }

multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/Identifier.kt

@@ -16,4 +16,5 @@
 package org.intellij.lang.annotations
 
 @Pattern("\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*")
-annotation class Identifier
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class Identifier()

multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/Language.kt

@@ -47,7 +47,8 @@ import org.jetbrains.annotations.NonNls
     AnnotationTarget.LOCAL_VARIABLE,
     AnnotationTarget.ANNOTATION_CLASS
 )
-annotation class Language(
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class Language(
     /**
      * Language name like "JAVA", "HTML", "XML", "RegExp", etc.
      * The complete list of supported languages is not specified. However, at least the following languages should be

multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/Pattern.kt

@@ -49,7 +49,8 @@ import org.jetbrains.annotations.NonNls
     AnnotationTarget.LOCAL_VARIABLE,
     AnnotationTarget.ANNOTATION_CLASS
 )
-annotation class Pattern(
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class Pattern(
     /**
      * A regular expression that matches all the valid string literals that assigned to the annotated variables,
      * passed as arguments to the annotated parameters, or returned from the annotated methods.

multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/RegExp.kt

@@ -38,7 +38,8 @@ import org.jetbrains.annotations.NonNls
     AnnotationTarget.ANNOTATION_CLASS
 )
 @Language("RegExp")
-annotation class RegExp(
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class RegExp(
     /**
      * A constant prefix that is assumed to be implicitly added before the regular expression.
      */

multiplatform-annotations/src/commonMain/kotlin/org/intellij/lang/annotations/Subst.kt

@@ -49,4 +49,5 @@ package org.intellij.lang.annotations
     AnnotationTarget.LOCAL_VARIABLE,
     AnnotationTarget.VALUE_PARAMETER
 )
-annotation class Subst(val value: String)
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class Subst(val value: String)

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/ApiStatus.kt

@@ -20,14 +20,8 @@ package org.jetbrains.annotations
  *
  * @since 18.0.0
  */
-class ApiStatus private constructor() {
-    /**
-     * Prohibited default constructor.
-     */
-    init {
-        throw AssertionError("ApiStatus should not be instantiated")
-    }
-
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect class ApiStatus private constructor() {
     /**
      *
      * Indicates that a public API of the annotated element (class, method or field) is not in stable state yet. It may be renamed, changed or
@@ -60,7 +54,8 @@ class ApiStatus private constructor() {
         AnnotationTarget.FIELD,
         AnnotationTarget.FILE
     )
-    annotation class Experimental
+    @kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+    annotation class Experimental()
 
     /**
      * Indicates that the annotated element (class, method, field, etc) must not be considered as a public API. It's made visible to allow
@@ -89,7 +84,8 @@ class ApiStatus private constructor() {
         AnnotationTarget.FIELD,
         AnnotationTarget.FILE
     )
-    annotation class Internal
+    @kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+    annotation class Internal()
 
     /**
      *
@@ -111,6 +107,7 @@ class ApiStatus private constructor() {
         AnnotationTarget.FIELD,
         AnnotationTarget.FILE
     )
+    @kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
     annotation class Obsolete(
         /**
          * Specifies in which version the API became obsolete.
@@ -139,6 +136,7 @@ class ApiStatus private constructor() {
         AnnotationTarget.FIELD,
         AnnotationTarget.FILE
     )
+    @kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
     annotation class ScheduledForRemoval(
         /**
          * Specifies in which version the API will be removed.
@@ -165,6 +163,7 @@ class ApiStatus private constructor() {
         AnnotationTarget.FIELD,
         AnnotationTarget.FILE
     )
+    @kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
     annotation class AvailableSince(
         /**
          * Specifies a version where the annotation API firstly appeared.
@@ -194,7 +193,8 @@ class ApiStatus private constructor() {
         AnnotationTarget.PROPERTY_GETTER,
         AnnotationTarget.PROPERTY_SETTER
     )
-    annotation class NonExtendable
+    @kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+    annotation class NonExtendable()
 
     /**
      *
@@ -219,5 +219,6 @@ class ApiStatus private constructor() {
         AnnotationTarget.PROPERTY_GETTER,
         AnnotationTarget.PROPERTY_SETTER
     )
-    annotation class OverrideOnly
+    @kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+    annotation class OverrideOnly()
 }

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Async.kt

@@ -21,14 +21,8 @@ package org.jetbrains.annotations
  *
  * @author egor
  */
-class Async private constructor() {
-    /**
-     * Prohibited default constructor.
-     */
-    init {
-        throw AssertionError("Async should not be instantiated")
-    }
-
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect class Async private constructor() {
     /**
      * Indicates that the marked method schedules async computation.
      * Scheduled object is either `this`, or the annotated parameter value.
@@ -41,7 +35,8 @@ class Async private constructor() {
         AnnotationTarget.CONSTRUCTOR,
         AnnotationTarget.VALUE_PARAMETER
     )
-    annotation class Schedule
+    @kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+    annotation class Schedule()
 
     /**
      * Indicates that the marked method executes async computation.
@@ -56,5 +51,6 @@ class Async private constructor() {
         AnnotationTarget.CONSTRUCTOR,
         AnnotationTarget.VALUE_PARAMETER
     )
-    annotation class Execute
+    @kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+    annotation class Execute()
 }

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Blocking.kt

@@ -37,4 +37,5 @@ package org.jetbrains.annotations
     AnnotationTarget.CONSTRUCTOR,
     AnnotationTarget.CLASS
 )
-annotation class Blocking
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class Blocking()

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/BlockingExecutor.kt

@@ -65,4 +65,5 @@ package org.jetbrains.annotations
 @MustBeDocumented
 @Retention(AnnotationRetention.BINARY)
 @Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
-annotation class BlockingExecutor
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class BlockingExecutor()

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/CheckReturnValue.kt

@@ -38,4 +38,5 @@ package org.jetbrains.annotations
     AnnotationTarget.CLASS,
     AnnotationTarget.FILE
 )
-annotation class CheckReturnValue
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class CheckReturnValue()

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Contract.kt

@@ -68,7 +68,8 @@ package org.jetbrains.annotations
     AnnotationTarget.PROPERTY_SETTER,
     AnnotationTarget.CONSTRUCTOR
 )
-annotation class Contract(
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class Contract(
     /**
      * Contains the contract clauses describing causal relations between call arguments and the returned value
      */

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Debug.kt

@@ -20,19 +20,14 @@ import org.intellij.lang.annotations.Language
 /**
  * @since 18.0.0
  */
-class Debug private constructor() {
-    /**
-     * Prohibited default constructor.
-     */
-    init {
-        throw AssertionError("Debug should not be instantiated")
-    }
-
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect class Debug private constructor() {
     /**
      * Allows to change the presentation of an object in debuggers
      */
     @Target(AnnotationTarget.CLASS)
     @Retention(AnnotationRetention.BINARY)
+    @kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
     annotation class Renderer(
         /**
          * Expression to be evaluated and used as the textual representation of the object.<br></br>

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/MustBeInvokedByOverriders.kt

@@ -28,4 +28,5 @@ package org.jetbrains.annotations
 @Retention(
     AnnotationRetention.BINARY
 )
-annotation class MustBeInvokedByOverriders
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class MustBeInvokedByOverriders()

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Nls.kt

@@ -49,7 +49,9 @@ package org.jetbrains.annotations
     AnnotationTarget.TYPE,
     AnnotationTarget.FILE
 )
-annotation class Nls(val capitalization: Capitalization = Capitalization.NotSpecified) {
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class Nls(val capitalization: Capitalization = Capitalization.NotSpecified) {
+    @kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
     enum class Capitalization {
         NotSpecified,
 

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonBlocking.kt

@@ -37,4 +37,5 @@ package org.jetbrains.annotations
     AnnotationTarget.CONSTRUCTOR,
     AnnotationTarget.CLASS
 )
-annotation class NonBlocking
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class NonBlocking()

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonBlockingExecutor.kt

@@ -65,4 +65,5 @@ package org.jetbrains.annotations
 @MustBeDocumented
 @Retention(AnnotationRetention.BINARY)
 @Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
-annotation class NonBlockingExecutor
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class NonBlockingExecutor()

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NonNls.kt

@@ -70,4 +70,5 @@ package org.jetbrains.annotations
     AnnotationTarget.TYPE,
     AnnotationTarget.FILE
 )
-annotation class NonNls
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class NonNls()

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/PropertyKey.kt

@@ -30,7 +30,8 @@ package org.jetbrains.annotations
     AnnotationTarget.FIELD,
     AnnotationTarget.TYPE,
 )
-annotation class PropertyKey(
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class PropertyKey(
     /**
      * The full-qualified name of the resource bundle in which the property keys must
      * be present. Consists of a full-qualified name of the package corresponding to the

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Range.kt

@@ -30,7 +30,8 @@ package org.jetbrains.annotations
 @MustBeDocumented
 @Retention(AnnotationRetention.BINARY)
 @Target(AnnotationTarget.TYPE)
-annotation class Range(
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class Range(
     /**
      * @return minimal allowed value (inclusive)
      */

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/TestOnly.kt

@@ -38,4 +38,5 @@ package org.jetbrains.annotations
     AnnotationTarget.FIELD,
     AnnotationTarget.CLASS
 )
-annotation class TestOnly 
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class TestOnly()

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/Unmodifiable.kt

@@ -30,4 +30,5 @@ package org.jetbrains.annotations
 @MustBeDocumented
 @Retention(AnnotationRetention.BINARY)
 @Target(AnnotationTarget.TYPE)
-annotation class Unmodifiable 
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class Unmodifiable()

multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/VisibleForTesting.kt

@@ -44,4 +44,5 @@ package org.jetbrains.annotations
     AnnotationTarget.FIELD,
     AnnotationTarget.CLASS
 )
-annotation class VisibleForTesting 
+@kotlin.jvm.ImplicitlyActualizedByJvmDeclaration
+expect annotation class VisibleForTesting()

multiplatform-annotations/src/nonJvmMain/kotlin/org/intellij/lang/annotations/Identifier.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2000-2021 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.intellij.lang.annotations
+
+@Pattern("\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*")
+actual annotation class Identifier