MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: respect "Make generated parameters final" setting when creating constructor parameters from field (IDEA-341545)

Browse Source 
GitOrigin-RevId: 3f12122ecf79a835e649425f2301b7fbda950afc
This commit is contained in:
Bas Leijdekkers
2024-01-03 00:24:56 +00:00
committed by intellij-monorepo-bot
parent e6c8afdc10
commit 415d6a8b56
5 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
+11 -14
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.application.options.CodeStyle;
@@ -51,8 +51,7 @@ public class CreateConstructorParameterFromFieldFix extends PsiBasedModCommandAc
@Override
protected @NotNull ModCommand perform(@NotNull ActionContext context, @NotNull PsiField field) {
PsiClass psiClass = Objects.requireNonNull(field.getContainingClass());
PsiMethod[] constructors = getNonSyntheticConstructors(psiClass);
final List<PsiMethod> filtered = getFilteredConstructors(constructors, field);
final List<PsiMethod> filtered = getFilteredConstructors(psiClass.getConstructors(), field);
if (filtered.size() <= 1) {
return performForConstructors(context, field, filtered);
}
@@ -80,10 +79,6 @@ public class CreateConstructorParameterFromFieldFix extends PsiBasedModCommandAc
constructors));
}
private static PsiMethod[] getNonSyntheticConstructors(@NotNull PsiClass psiClass) {
return ContainerUtil.filter(psiClass.getConstructors(), c -> !(c instanceof SyntheticElement)).toArray(PsiMethod[]::new);
}
@NotNull
private static List<PsiMethod> getFilteredConstructors(PsiMethod[] constructors, PsiField field) {
Arrays.sort(constructors, new Comparator<>() {
@@ -105,8 +100,7 @@ public class CreateConstructorParameterFromFieldFix extends PsiBasedModCommandAc
}
@NotNull
private static List<PsiField> getFieldsToFix(@NotNull PsiClass psiClass, @NotNull PsiField startField,
@NotNull List<PsiMethod> constructors) {
static List<PsiField> getFieldsToFix(@NotNull PsiClass psiClass, @NotNull PsiField startField, @NotNull List<PsiMethod> constructors) {
List<PsiField> fields = new ArrayList<>();
for (PsiField field : psiClass.getFields()) {
if (field == startField ||
@@ -144,7 +138,7 @@ public class CreateConstructorParameterFromFieldFix extends PsiBasedModCommandAc
}
private static boolean isFieldAssignedInConstructor(@NotNull PsiField field, @NotNull PsiMethod ctr) {
return VariableAccessUtils.variableIsAssigned(field, getTargetConstructor(ctr));
return ctr instanceof SyntheticElement || VariableAccessUtils.variableIsAssigned(field, getTargetConstructor(ctr));
}
@NotNull
@@ -195,9 +189,13 @@ public class CreateConstructorParameterFromFieldFix extends PsiBasedModCommandAc
CodeStyle.runWithLocalSettings(project, allSettings, () -> {
final String uniqueParameterName = getUniqueParameterName(parameterList.getParameters(), param, usedFields);
usedFields.put(field, uniqueParameterName);
PsiParameter parameter = factory
.createParameter(uniqueParameterName, AnnotationTargetUtil.keepStrictlyTypeUseAnnotations(param.getModifierList(), paramType),
parameterList);
PsiType type = AnnotationTargetUtil.keepStrictlyTypeUseAnnotations(param.getModifierList(), paramType);
PsiParameter parameter = factory.createParameter(uniqueParameterName, type, parameterList);
if (settings.GENERATE_FINAL_PARAMETERS) {
PsiModifierList modifierList = parameter.getModifierList();
assert modifierList != null;
modifierList.setModifierProperty(PsiModifier.FINAL, true);
}
if (prev.isNull()) {
prev.set(parameterList.isEmpty() ? parameterList.add(parameter) :
parameterList.addBefore(parameter, parameterList.getParameter(0)));
@@ -320,7 +318,6 @@ public class CreateConstructorParameterFromFieldFix extends PsiBasedModCommandAc
@Override
public int compare(PsiVariable o1, PsiVariable o2) {
if (o1 instanceof PsiParameter && ((PsiParameter)o1).isVarArgs()) return 1;
if (o2 instanceof PsiParameter && ((PsiParameter)o2).isVarArgs()) return -1;
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/afterSameParameterSameTypes.java
+1 -1
View File
@@ -4,7 +4,7 @@ class A {
private final String oldClass;
private final String newClass;
A(String oldClass, String newClass) {
A(final String oldClass, final String newClass) {
this.oldClass = oldClass;
this.newClass = newClass;
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/afterSameParameterSimpleNames.java
+1 -1
View File
@@ -2,7 +2,7 @@
class A {
private final int _field;
private final int field;
A(int field, int field1) {
A(final int field, final int field1) {
this._field = field;
this.field = field1;
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/afterSameParameterSimpleNamesDifferentTypes.java
+1 -1
View File
@@ -4,7 +4,7 @@ class A {
private final LibraryManager libraryManager;
private final DependencyManager dependencyManager;
A(LibraryManager manager, DependencyManager dependencyManager) {
A(final LibraryManager manager, final DependencyManager dependencyManager) {
this.libraryManager = manager;
this.dependencyManager = dependencyManager;
}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldTest.java
+2 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
@@ -19,6 +19,7 @@ public class CreateConstructorParameterFromFieldTest extends LightQuickFixParame
final JavaCodeStyleSettings settings = JavaCodeStyleSettings.getInstance(getProject());
if (getTestName(false).contains("SameParameter")) {
settings.PREFER_LONGER_NAMES = false;
settings.GENERATE_FINAL_PARAMETERS = true;
}
}