Refine deprecation diagnostics for mod depending on api version

#KT-25217 Fixed
 #KT-26654 Open

compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt

@@ -18,9 +18,7 @@ package org.jetbrains.kotlin.resolve
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.config.*
-import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.config.MavenComparableVersion
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.descriptors.impl.DescriptorDerivedFromTypeAlias
@@ -113,6 +111,30 @@ private data class DeprecatedExperimentalCoroutine(
             "Experimental coroutine cannot be used with API version 1.3"
 }
 
+private data class DeprecatedOperatorMod(
+    val languageVersionSettings: LanguageVersionSettings,
+    val currentDeprecation: Deprecation
+) : Deprecation {
+    init {
+        assert(shouldWarnAboutDeprecatedModFromBuiltIns(languageVersionSettings)) {
+            "Deprecation created for mod that shouldn't have any deprecations; languageVersionSettings: $languageVersionSettings"
+        }
+    }
+
+    override val deprecationLevel: DeprecationLevelValue
+        get() = when (languageVersionSettings.apiVersion) {
+            ApiVersion.KOTLIN_1_1, ApiVersion.KOTLIN_1_2 -> WARNING
+            ApiVersion.KOTLIN_1_3 -> ERROR
+            else -> ERROR
+        }
+
+    override val message: String?
+        get() = currentDeprecation.message
+
+    override val target: DeclarationDescriptor
+        get() = currentDeprecation.target
+}
+
 private data class DeprecatedByVersionRequirement(
     val versionRequirement: VersionRequirement,
     override val target: DeclarationDescriptor
@@ -293,10 +315,9 @@ class DeprecationResolver(
 
     private fun DeclarationDescriptor.getOwnDeprecations(): List<Deprecation> {
         // The problem is that declaration `mod` in built-ins has @Deprecated annotation but actually it was deprecated only in version 1.1
-        if (this is FunctionDescriptor && this.isOperatorMod() && KotlinBuiltIns.isUnderKotlinPackage(this)) {
+        val isBuiltInOperatorMod = this is FunctionDescriptor && this.isOperatorMod() && KotlinBuiltIns.isUnderKotlinPackage(this)
-            if (!shouldWarnAboutDeprecatedModFromBuiltIns(languageVersionSettings)) {
+        if (isBuiltInOperatorMod && !shouldWarnAboutDeprecatedModFromBuiltIns(languageVersionSettings)) {
-                return emptyList()
+            return emptyList()
-            }
         }
 
         val result = SmartList<Deprecation>()
@@ -306,8 +327,13 @@ class DeprecationResolver(
                 ?: target.annotations.findAnnotation(JAVA_DEPRECATED)
             if (annotation != null) {
                 val deprecatedByAnnotation = DeprecatedByAnnotation(annotation, target)
-                val deprecation = when (target) {
+                val deprecation = when {
-                    is TypeAliasConstructorDescriptor -> DeprecatedTypealiasByAnnotation(target.typeAliasDescriptor, deprecatedByAnnotation)
+                    target is TypeAliasConstructorDescriptor ->
+                        DeprecatedTypealiasByAnnotation(target.typeAliasDescriptor, deprecatedByAnnotation)
+
+                    isBuiltInOperatorMod ->
+                        DeprecatedOperatorMod(languageVersionSettings, deprecatedByAnnotation)
+
                     else -> deprecatedByAnnotation
                 }
                 result.add(deprecation)

compiler/testData/diagnostics/tests/operatorRem/warningOnExplicitModCall1_1.kt

@@ -0,0 +1,5 @@
+// !API_VERSION: 1.1
+
+fun test() {
+    1.<!DEPRECATION!>mod<!>(3)
+}

compiler/testData/diagnostics/tests/operatorRem/warningOnExplicitModCall1_1.txt

@@ -0,0 +1,3 @@
+package
+
+public fun test(): kotlin.Unit

compiler/testData/diagnostics/tests/operatorRem/warningOnExplicitModCall1_2.kt

@@ -0,0 +1,5 @@
+// !API_VERSION: 1.2
+
+fun test() {
+    1.<!DEPRECATION!>mod<!>(3)
+}

compiler/testData/diagnostics/tests/operatorRem/warningOnExplicitModCall1_2.txt

@@ -0,0 +1,3 @@
+package
+
+public fun test(): kotlin.Unit

compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java

@@ -14156,6 +14156,16 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
             public void testResolveToModWhenNoOperatorRemFeature() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/operatorRem/resolveToModWhenNoOperatorRemFeature.kt");
             }
+
+            @TestMetadata("warningOnExplicitModCall1_1.kt")
+            public void testWarningOnExplicitModCall1_1() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/operatorRem/warningOnExplicitModCall1_1.kt");
+            }
+
+            @TestMetadata("warningOnExplicitModCall1_2.kt")
+            public void testWarningOnExplicitModCall1_2() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/operatorRem/warningOnExplicitModCall1_2.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/diagnostics/tests/operatorsOverloading")

compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java

@@ -14156,6 +14156,16 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
             public void testResolveToModWhenNoOperatorRemFeature() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/operatorRem/resolveToModWhenNoOperatorRemFeature.kt");
             }
+
+            @TestMetadata("warningOnExplicitModCall1_1.kt")
+            public void testWarningOnExplicitModCall1_1() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/operatorRem/warningOnExplicitModCall1_1.kt");
+            }
+
+            @TestMetadata("warningOnExplicitModCall1_2.kt")
+            public void testWarningOnExplicitModCall1_2() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/operatorRem/warningOnExplicitModCall1_2.kt");
+            }
         }
 
         @TestMetadata("compiler/testData/diagnostics/tests/operatorsOverloading")