create constructor parameter should consider context (e.g.: type parameter name == some class name from java.lang)

java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java

@@ -950,7 +950,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
     for (PsiSubstitutor psiSubstitutor : substitutor) {
       type = psiSubstitutor.substitute(type);
     }
-    return factory.createParameter(newParm.getName(), type);
+    return factory.createParameter(newParm.getName(), type, list);
   }
 
   private static void resolveParameterVsFieldsConflicts(final PsiParameter[] newParms,
@@ -1149,7 +1149,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
             parameterType =
               JavaPsiFacade.getElementFactory(method.getProject()).createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, method);
           }
-          PsiParameter param = factory.createParameter(info.getName(), parameterType);
+          PsiParameter param = factory.createParameter(info.getName(), parameterType, method);
           prototype.getParameterList().add(param);
         }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/afterTypeParameterWithNameSameAsClassFromJavaLang.java

@@ -0,0 +1,8 @@
+// "Add constructor parameter" "true"
+class Test<Math> {
+  final Math math;
+
+    Test(Math math) {
+        this.math = math;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/beforeTypeParameterWithNameSameAsClassFromJavaLang.java

@@ -0,0 +1,4 @@
+// "Add constructor parameter" "true"
+class Test<Math> {
+  final Math ma<caret>th;
+}