Prohibit val/vars/modifiers on secondary constructor parameter

#KT-6962 Fixed

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java

@@ -587,6 +587,7 @@ public interface Errors {
     DiagnosticFactory1<PsiElement, JetKeywordToken> VAL_OR_VAR_ON_LOOP_PARAMETER = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory1<PsiElement, JetKeywordToken> VAL_OR_VAR_ON_FUN_PARAMETER = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory1<PsiElement, JetKeywordToken> VAL_OR_VAR_ON_CATCH_PARAMETER = DiagnosticFactory1.create(ERROR);
+    DiagnosticFactory1<PsiElement, JetKeywordToken> VAL_OR_VAR_ON_SECONDARY_CONSTRUCTOR_PARAMETER = DiagnosticFactory1.create(ERROR);
 
     // Backing fields
 

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java

@@ -265,6 +265,7 @@ public class DefaultErrorMessages {
         MAP.put(VAL_OR_VAR_ON_LOOP_PARAMETER, "''{0}'' on loop parameter is not allowed", TO_STRING);
         MAP.put(VAL_OR_VAR_ON_FUN_PARAMETER, "''{0}'' on function parameter is not allowed", TO_STRING);
         MAP.put(VAL_OR_VAR_ON_CATCH_PARAMETER, "''{0}'' on catch parameter is not allowed", TO_STRING);
+        MAP.put(VAL_OR_VAR_ON_SECONDARY_CONSTRUCTOR_PARAMETER, "''{0}'' on secondary constructor parameter is not allowed", TO_STRING);
 
         MAP.put(INITIALIZATION_USING_BACKING_FIELD_CUSTOM_SETTER,
                 "This property has a custom setter, so initialization using backing field required", NAME);

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

@@ -326,8 +326,12 @@ class FunctionDescriptorResolver(
                 }
             }
 
-            if (functionDescriptor !is ConstructorDescriptor) {
-                DescriptorResolver.checkParameterHasNoValOrVar(trace, valueParameter, VAL_OR_VAR_ON_FUN_PARAMETER)
+            if (functionDescriptor !is ConstructorDescriptor || !functionDescriptor.isPrimary()) {
+                val isConstructor = functionDescriptor is ConstructorDescriptor
+                DescriptorResolver.checkParameterHasNoValOrVar(
+                        trace, valueParameter,
+                        if (isConstructor) VAL_OR_VAR_ON_SECONDARY_CONSTRUCTOR_PARAMETER else VAL_OR_VAR_ON_FUN_PARAMETER
+                )
                 DescriptorResolver.checkParameterHasNoModifier(trace, valueParameter)
             }
             else {

compiler/testData/diagnostics/tests/secondaryConstructors/valOrValAndModifiersInCtr.kt

@@ -0,0 +1,7 @@
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+class A {
+    constructor(
+        <!VAL_OR_VAR_ON_SECONDARY_CONSTRUCTOR_PARAMETER!>val<!> x: Int, y: Int,
+        <!VAL_OR_VAR_ON_SECONDARY_CONSTRUCTOR_PARAMETER!>var<!> z: Int,
+        <!ILLEGAL_MODIFIER!>public<!> a: Int) {}
+}

compiler/testData/diagnostics/tests/secondaryConstructors/valOrValAndModifiersInCtr.txt

@@ -0,0 +1,8 @@
+package
+
+internal final class A {
+    public constructor A(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int, /*2*/ z: kotlin.Int, /*3*/ a: kotlin.Int)
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

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

@@ -10749,6 +10749,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("valOrValAndModifiersInCtr.kt")
+            public void testValOrValAndModifiersInCtr() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/valOrValAndModifiersInCtr.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("varargsInDelegationCallToPrimary.kt")
             public void testVarargsInDelegationCallToPrimary() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/varargsInDelegationCallToPrimary.kt");

idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java

@@ -159,6 +159,7 @@ public class QuickFixRegistrar {
         QuickFixes.factories.put(VAL_OR_VAR_ON_FUN_PARAMETER, removeValVarFromParameterFixFactory);
         QuickFixes.factories.put(VAL_OR_VAR_ON_LOOP_PARAMETER, removeValVarFromParameterFixFactory);
         QuickFixes.factories.put(VAL_OR_VAR_ON_CATCH_PARAMETER, removeValVarFromParameterFixFactory);
+        QuickFixes.factories.put(VAL_OR_VAR_ON_SECONDARY_CONSTRUCTOR_PARAMETER, removeValVarFromParameterFixFactory);
 
         QuickFixes.factories.put(VIRTUAL_MEMBER_HIDDEN, AddOverrideToEqualsHashCodeToStringFix.createFactory());
 

idea/testData/quickfix/variables/removeValVarFromParameter/afterSecondaryConstructorParameter.kt

@@ -0,0 +1,4 @@
+// "Remove 'val' from parameter" "true"
+class A {
+    constructor(<caret>x: Int)
+}

idea/testData/quickfix/variables/removeValVarFromParameter/beforeSecondaryConstructorParameter.kt

@@ -0,0 +1,4 @@
+// "Remove 'val' from parameter" "true"
+class A {
+    constructor(<caret>val x: Int)
+}

idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java

@@ -5121,6 +5121,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/beforeParameterWithComment.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("beforeSecondaryConstructorParameter.kt")
+            public void testSecondaryConstructorParameter() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/beforeSecondaryConstructorParameter.kt");
+                doTest(fileName);
+            }
         }
     }