MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 14:01:44 +07:00
Code Issues Packages Projects Releases Wiki Activity

change variable type from assignment: change method signature when variable is a parameter (IDEA-71674)

Browse Source
This commit is contained in:
anna
2011-12-15 19:13:08 +01:00
parent 52e77034d2
commit 44ecd52b97
3 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java
View File

@@ -18,6 +18,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.codeInsight.CodeInsightUtilBase;
import com.intellij.codeInsight.daemon.QuickFixBundle;
import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement;
import com.intellij.ide.util.SuperMethodWarningUtil;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.undo.UndoUtil;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
@@ -25,10 +27,16 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.changeSignature.ChangeSignatureProcessor;
import com.intellij.refactoring.changeSignature.JavaChangeSignatureDialog;
import com.intellij.refactoring.changeSignature.ParameterInfoImpl;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
public class VariableTypeFix extends LocalQuickFixAndIntentionActionOnPsiElement {
static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.VariableTypeFix");
@@ -76,6 +84,7 @@ public class VariableTypeFix extends LocalQuickFixAndIntentionActionOnPsiElement
@NotNull PsiElement startElement,
@NotNull PsiElement endElement) {
final PsiVariable myVariable = (PsiVariable)startElement;
if (changeMethodSignatureIfNeeded(myVariable)) return;
if (!CodeInsightUtilBase.prepareFileForWrite(myVariable.getContainingFile())) return;
try {
myVariable.normalizeDeclaration();
@@ -88,6 +97,42 @@ public class VariableTypeFix extends LocalQuickFixAndIntentionActionOnPsiElement
}
}
private boolean changeMethodSignatureIfNeeded(PsiVariable myVariable) {
if (myVariable instanceof PsiParameter) {
final PsiElement scope = ((PsiParameter)myVariable).getDeclarationScope();
if (scope instanceof PsiMethod) {
final PsiMethod method = (PsiMethod)scope;
final PsiMethod psiMethod = SuperMethodWarningUtil.checkSuperMethod(method, RefactoringBundle.message("to.refactor"));
if (psiMethod == null) return true;
final int parameterIndex = method.getParameterList().getParameterIndex((PsiParameter)myVariable);
if (!CodeInsightUtilBase.prepareFileForWrite(psiMethod.getContainingFile())) return true;
final ArrayList<ParameterInfoImpl> infos = new ArrayList<ParameterInfoImpl>();
int i = 0;
for (PsiParameter parameter : psiMethod.getParameterList().getParameters()) {
final boolean changeType = i == parameterIndex;
infos.add(new ParameterInfoImpl(i++, parameter.getName(), changeType ? getReturnType() : parameter.getType()));
}
if (!ApplicationManager.getApplication().isUnitTestMode()) {
final JavaChangeSignatureDialog dialog = new JavaChangeSignatureDialog(psiMethod.getProject(), psiMethod, false, myVariable);
dialog.setParameterInfos(infos);
dialog.show();
}
else {
ChangeSignatureProcessor processor = new ChangeSignatureProcessor(psiMethod.getProject(),
psiMethod,
false, null,
psiMethod.getName(),
psiMethod.getReturnType(),
infos.toArray(new ParameterInfoImpl[infos.size()]));
processor.run();
}
return true;
}
}
return false;
}
protected PsiType getReturnType() {
return myReturnType;
}

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/after5.java Normal file
View File

@@ -0,0 +1,12 @@
// "Change 'i' type to 'java.lang.String'" "true"
class Base {
void foo(String i) {}
}
class Ex extends Base {
@Override
void foo(String i) {
i = "abc"; // when I invoke "Change type of 'i' to 'String'", base method is ignored so method overriding is lost
}
}

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/variableType/before5.java Normal file
View File

@@ -0,0 +1,12 @@
// "Change 'i' type to 'java.lang.String'" "true"
class Base {
void foo(int i) {}
}
class Ex extends Base {
@Override
void foo(int i) {
i = <caret>"abc"; // when I invoke "Change type of 'i' to 'String'", base method is ignored so method overriding is lost
}
}