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

extract method: name suggestion to provide multiple initial name suggestions

Browse Source
This commit is contained in:
Anna Kozlova
2014-12-05 17:35:38 +01:00
parent 509431ae74
commit 8336b937ab
2 changed files with 54 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java
+14 -20
View File
@@ -19,9 +19,6 @@ import com.intellij.codeInsight.NullableNotNullManager;
import com.intellij.codeInspection.dataFlow.Nullness;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.openapi.editor.event.DocumentAdapter;
import com.intellij.openapi.editor.event.DocumentEvent;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.Splitter;
@@ -37,7 +34,6 @@ import com.intellij.refactoring.ui.*;
import com.intellij.refactoring.util.ConflictsUtil;
import com.intellij.refactoring.util.ParameterTablePanel;
import com.intellij.refactoring.util.VariableData;
import com.intellij.ui.EditorTextField;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.NonFocusableCheckBox;
import com.intellij.ui.SeparatorFactory;
@@ -75,7 +71,7 @@ public class ExtractMethodDialog extends DialogWrapper implements AbstractExtrac
private final PsiElement[] myElementsToExtract;
private final String myHelpId;
private final EditorTextField myNameField;
private final NameSuggestionsField myNameField;
private final MethodSignatureComponent mySignature;
private final JCheckBox myMakeStatic;
protected JCheckBox myMakeVarargs;
@@ -99,10 +95,9 @@ public class ExtractMethodDialog extends DialogWrapper implements AbstractExtrac
PsiClass targetClass, final InputVariables inputVariables, PsiType returnType,
PsiTypeParameterList typeParameterList, PsiType[] exceptions, boolean isStatic, boolean canBeStatic,
final boolean canBeChainedConstructor,
String initialMethodName,
String title,
String helpId,
Nullness nullness,
Nullness nullness,
final PsiElement[] elementsToExtract) {
super(project, true);
myProject = project;
@@ -121,7 +116,7 @@ public class ExtractMethodDialog extends DialogWrapper implements AbstractExtrac
mySignature.setMinimumSize(new Dimension(500, 100));
setTitle(title);
myNameField = createNameField(initialMethodName);
myNameField = new NameSuggestionsField(suggestMethodNames(), myProject);
myMakeStatic = new NonFocusableCheckBox();
myMakeStatic.setText(RefactoringBundle.message("declare.static.checkbox"));
@@ -132,12 +127,10 @@ public class ExtractMethodDialog extends DialogWrapper implements AbstractExtrac
init();
}
protected EditorTextField createNameField(String initialMethodName) {
EditorTextField field = new EditorTextField(initialMethodName, myProject, StdFileTypes.JAVA);
field.selectAll();
return field;
protected String[] suggestMethodNames() {
return ArrayUtil.EMPTY_STRING_ARRAY;
}
protected boolean areTypesDirected() {
return true;
}
@@ -161,7 +154,7 @@ public class ExtractMethodDialog extends DialogWrapper implements AbstractExtrac
}
public String getChosenMethodName() {
return myNameField.getText();
return myNameField.getEnteredName();
}
public VariableData[] getChosenParameters() {
@@ -214,8 +207,9 @@ public class ExtractMethodDialog extends DialogWrapper implements AbstractExtrac
namePanel.add(myNameField);
nameLabel.setLabelFor(myNameField);
myNameField.getDocument().addDocumentListener(new DocumentAdapter() {
public void documentChanged(DocumentEvent e) {
myNameField.addDataChangedListener(new NameSuggestionsField.DataChanged() {
@Override
public void dataChanged() {
update();
}
});
@@ -234,7 +228,7 @@ public class ExtractMethodDialog extends DialogWrapper implements AbstractExtrac
main.add(visibilityAndName, BorderLayout.CENTER);
setOKActionEnabled(false);
setOKActionEnabled(PsiNameHelper.getInstance(myProject).isIdentifier(myNameField.getText()));
setOKActionEnabled(PsiNameHelper.getInstance(myProject).isIdentifier(myNameField.getEnteredName()));
final JPanel options = new JPanel(new BorderLayout());
options.add(createOptionsPanel(), BorderLayout.WEST);
main.add(options, BorderLayout.SOUTH);
@@ -431,7 +425,7 @@ public class ExtractMethodDialog extends DialogWrapper implements AbstractExtrac
myMakeStatic.setEnabled(!myStaticFlag && myCanBeStatic && !isChainedConstructor());
}
updateSignature();
setOKActionEnabled(PsiNameHelper.getInstance(myProject).isIdentifier(myNameField.getText()) ||
setOKActionEnabled(PsiNameHelper.getInstance(myProject).isIdentifier(myNameField.getEnteredName()) ||
isChainedConstructor());
}
@@ -553,7 +547,7 @@ public class ExtractMethodDialog extends DialogWrapper implements AbstractExtrac
else {
buffer.append(PsiFormatUtil.formatType(mySelector != null ? mySelector.getSelectedType() : myReturnType, 0, PsiSubstitutor.EMPTY));
buffer.append(" ");
buffer.append(myNameField.getText());
buffer.append(myNameField.getEnteredName());
}
buffer.append("(");
@@ -604,7 +598,7 @@ public class ExtractMethodDialog extends DialogWrapper implements AbstractExtrac
PsiMethod prototype;
try {
PsiElementFactory factory = JavaPsiFacade.getInstance(myProject).getElementFactory();
prototype = factory.createMethod(myNameField.getText().trim(), myReturnType);
prototype = factory.createMethod(myNameField.getEnteredName().trim(), myReturnType);
if (myTypeParameterList != null) prototype.getTypeParameterList().replace(myTypeParameterList);
for (VariableData data : myInputVariables) {
if (data.passAsParameter) {
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
+40 -30
View File
@@ -47,10 +47,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.wm.WindowManager;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.codeStyle.VariableKind;
import com.intellij.psi.codeStyle.*;
import com.intellij.psi.controlFlow.ControlFlowUtil;
import com.intellij.psi.impl.source.codeStyle.JavaCodeStyleManagerImpl;
import com.intellij.psi.scope.processor.VariablesProcessor;
@@ -551,12 +548,16 @@ public class ExtractMethodProcessor implements MatchProvider {
final PsiType returnType = myArtificialOutputVariable != null ? myArtificialOutputVariable.getType() : myReturnType;
return new ExtractMethodDialog(myProject, myTargetClass, myInputVariables, returnType, getTypeParameterList(),
getThrownExceptions(), isStatic(), isCanBeStatic(), myCanBeChainedConstructor,
suggestInitialMethodName(),
myRefactoringName, myHelpId, myNullness, myElements) {
protected boolean areTypesDirected() {
return direct;
}
@Override
protected String[] suggestMethodNames() {
return suggestInitialMethodName();
}
@Override
protected PsiExpression[] findOccurrences() {
return ExtractMethodProcessor.this.findOccurrences();
@@ -640,39 +641,48 @@ public class ExtractMethodProcessor implements MatchProvider {
return null;
}
protected String suggestInitialMethodName() {
protected String[] suggestInitialMethodName() {
if (StringUtil.isEmpty(myInitialMethodName)) {
final String initialMethodName;
final Set<String> initialMethodNames = new LinkedHashSet<String>();
final JavaCodeStyleManagerImpl codeStyleManager = (JavaCodeStyleManagerImpl)JavaCodeStyleManager.getInstance(myProject);
final String[] names = codeStyleManager.suggestVariableName(VariableKind.FIELD, null, myExpression, myReturnType).names;
if (names.length > 0) {
initialMethodName = codeStyleManager.variableNameToPropertyName(names[0], VariableKind.FIELD);
} else {
return myInitialMethodName;
}
if (myReturnType != null && !(myReturnType instanceof PsiPrimitiveType)) {
return PropertyUtil.suggestGetterName(initialMethodName, myReturnType);
} else if (myExpression != null) {
if (myExpression instanceof PsiMethodCallExpression) {
PsiExpression qualifierExpression = ((PsiMethodCallExpression)myExpression).getMethodExpression().getQualifierExpression();
if (qualifierExpression != null && PsiUtil.resolveGenericsClassInType(qualifierExpression.getType()) != myTargetClass) {
return initialMethodName;
}
} else {
return initialMethodName;
if (myExpression != null || !(myReturnType instanceof PsiPrimitiveType)) {
final String[] names = codeStyleManager.suggestVariableName(VariableKind.FIELD, null, myExpression, myReturnType).names;
for (String name : names) {
initialMethodNames.add(codeStyleManager.variableNameToPropertyName(name, VariableKind.FIELD));
}
}
PsiElement prevSibling = PsiTreeUtil.skipSiblingsBackward(myElements[0], PsiWhiteSpace.class);
if (prevSibling instanceof PsiComment && ((PsiComment)prevSibling).getTokenType() == JavaTokenType.END_OF_LINE_COMMENT) {
final String text = StringUtil.decapitalize(StringUtil.capitalizeWords(prevSibling.getText().trim().substring(2), true)).replaceAll(" ", "");
if (PsiNameHelper.getInstance(myProject).isIdentifier(text) && text.length() < 20) {
return text;
if (myOutputVariable != null) {
final VariableKind outKind = codeStyleManager.getVariableKind(myOutputVariable);
final SuggestedNameInfo nameInfo = codeStyleManager
.suggestVariableName(VariableKind.FIELD, codeStyleManager.variableNameToPropertyName(myOutputVariable.getName(), outKind), null, myOutputVariable.getType());
for (String name : nameInfo.names) {
initialMethodNames.add(codeStyleManager.variableNameToPropertyName(name, VariableKind.FIELD));
}
}
final String nameByComment = getNameByComment();
final List<String> getters = new ArrayList<String>(ContainerUtil.map(initialMethodNames, new Function<String, String>() {
@Override
public String fun(String propertyName) {
return PropertyUtil.suggestGetterName(propertyName, myReturnType);
}
}));
ContainerUtil.addIfNotNull(nameByComment, getters);
return ArrayUtil.toStringArray(getters);
}
return new String[] {myInitialMethodName};
}
private String getNameByComment() {
PsiElement prevSibling = PsiTreeUtil.skipSiblingsBackward(myElements[0], PsiWhiteSpace.class);
if (prevSibling instanceof PsiComment && ((PsiComment)prevSibling).getTokenType() == JavaTokenType.END_OF_LINE_COMMENT) {
final String text = StringUtil.decapitalize(StringUtil.capitalizeWords(prevSibling.getText().trim().substring(2), true)).replaceAll(" ", "");
if (PsiNameHelper.getInstance(myProject).isIdentifier(text) && text.length() < 20) {
return text;
}
}
return myInitialMethodName;
return null;
}
public boolean isOutputVariable(PsiVariable var) {