MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-60790 Variables names completition suggests already used names

Browse Source
This commit is contained in:
peter
2011-10-12 13:44:00 +02:00
parent bb50390b58
commit 744cc3c5ed
9 changed files with 75 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
View File

@@ -138,7 +138,7 @@ public class JavaCompletionContributor extends CompletionContributor {
}
if (JavaCompletionData.START_FOR.accepts(position)) {
return ElementClassFilter.VARIABLE;
return new OrFilter(ElementClassFilter.CLASS, ElementClassFilter.VARIABLE);
}
if (IN_CATCH_TYPE.accepts(position) || IN_MULTI_CATCH_TYPE.accepts(position)) {

70
java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
View File

@@ -114,8 +114,9 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
final PsiType type = var.getType();
SuggestedNameInfo suggestedNameInfo = codeStyleManager.suggestVariableName(variableKind, propertyName, null, type, StringUtil.isEmpty(matcher.getPrefix()));
suggestedNameInfo = codeStyleManager.suggestUniqueVariableName(suggestedNameInfo, var, false);
final String[] suggestedNames = suggestedNameInfo.names;
tunePreferencePolicy(LookupItemUtil.addLookupItems(set, suggestedNames, matcher), suggestedNameInfo);
addLookupItems(set, suggestedNameInfo, matcher, suggestedNames);
if (set.isEmpty()) {
if (type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) && matcher.prefixMatches("object")) {
set.add(LookupElementBuilder.create("object"));
@@ -126,36 +127,16 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
}
if (set.isEmpty() && includeOverlapped) {
suggestedNameInfo = new SuggestedNameInfo(getOverlappedNameVersions(matcher.getPrefix(), suggestedNames, "")) {
public void nameChoosen(String name) {
}
};
tunePreferencePolicy(LookupItemUtil.addLookupItems(set, suggestedNameInfo.names, matcher), suggestedNameInfo);
addLookupItems(set, null, matcher, getOverlappedNameVersions(matcher.getPrefix(), suggestedNames, ""));
}
PsiElement parent = PsiTreeUtil.getParentOfType(var, PsiCodeBlock.class);
if(parent == null) parent = PsiTreeUtil.getParentOfType(var, PsiMethod.class);
tunePreferencePolicy(LookupItemUtil.addLookupItems(set, getUnresolvedReferences(parent, false), matcher), suggestedNameInfo);
addLookupItems(set, suggestedNameInfo, matcher, getUnresolvedReferences(parent, false));
PsiExpression initializer = var.getInitializer();
if (initializer != null) {
SuggestedNameInfo initializerSuggestions = IntroduceVariableBase.getSuggestedName(type, initializer);
tunePreferencePolicy(LookupItemUtil.addLookupItems(set, initializerSuggestions.names, matcher), initializerSuggestions);
}
}
private static void tunePreferencePolicy(final List<LookupElement> list, final SuggestedNameInfo suggestedNameInfo) {
final InsertHandler<LookupElement> insertHandler = new InsertHandler<LookupElement>() {
public void handleInsert(final InsertionContext context, final LookupElement item) {
suggestedNameInfo.nameChoosen(item.getLookupString());
}
};
for (int i = 0; i < list.size(); i++) {
LookupElement item = list.get(i);
if (item instanceof LookupItem) {
((LookupItem)item).setPriority(list.size() - i).setInsertHandler(insertHandler);
}
addLookupItems(set, initializerSuggestions, matcher, initializerSuggestions.names);
}
}
@@ -241,7 +222,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
SuggestedNameInfo suggestedNameInfo = codeStyleManager.suggestVariableName(variableKind, null, null, var.getType());
final String[] suggestedNames = suggestedNameInfo.names;
tunePreferencePolicy(LookupItemUtil.addLookupItems(set, suggestedNames, matcher), suggestedNameInfo);
addLookupItems(set, suggestedNameInfo, matcher, suggestedNames);
if (set.isEmpty() && includeOverlapped) {
// use suggested names as suffixes
@@ -252,22 +233,17 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
}
suggestedNameInfo = new SuggestedNameInfo(getOverlappedNameVersions(prefix, suggestedNames, requiredSuffix)) {
public void nameChoosen(String name) {
}
};
tunePreferencePolicy(LookupItemUtil.addLookupItems(set, suggestedNameInfo.names, matcher), suggestedNameInfo);
addLookupItems(set, null, matcher, getOverlappedNameVersions(prefix, suggestedNames, requiredSuffix));
}
tunePreferencePolicy(LookupItemUtil.addLookupItems(set, getUnresolvedReferences(var.getParent(), false), matcher), suggestedNameInfo);
addLookupItems(set, suggestedNameInfo, matcher, getUnresolvedReferences(var.getParent(), false));
PsiExpression initializer = var.getInitializer();
PsiClass containingClass = var.getContainingClass();
if (initializer != null && containingClass != null) {
SuggestedNameInfo initializerSuggestions = InplaceIntroduceFieldPopup.
suggestFieldName(var.getType(), null, initializer, var.hasModifierProperty(PsiModifier.STATIC), containingClass);
tunePreferencePolicy(LookupItemUtil.addLookupItems(set, initializerSuggestions.names, matcher), initializerSuggestions);
addLookupItems(set, initializerSuggestions, matcher, initializerSuggestions.names);
}
}
@@ -280,7 +256,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
SuggestedNameInfo suggestedNameInfo = codeStyleManager.suggestVariableName(varKind, null, null, varType);
final String[] strings = completeVariableNameForRefactoring(codeStyleManager, matcher, varType, varKind, suggestedNameInfo,
includeOverlapped, methodPrefix);
tunePreferencePolicy(LookupItemUtil.addLookupItems(set, strings, matcher), suggestedNameInfo);
addLookupItems(set, suggestedNameInfo, matcher, strings);
}
public static String[] completeVariableNameForRefactoring(JavaCodeStyleManager codeStyleManager,
@@ -331,12 +307,12 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
PsiClass ourClassParent = PsiTreeUtil.getParentOfType(element, PsiClass.class);
if (ourClassParent == null) return;
LookupItemUtil.addLookupItems(set, getUnresolvedReferences(ourClassParent, true), matcher);
addLookupItems(set, null, matcher, getUnresolvedReferences(ourClassParent, true));
LookupItemUtil.addLookupItems(set, getPropertiesHandlersNames(
addLookupItems(set, null, matcher, getPropertiesHandlersNames(
ourClassParent,
((PsiModifierListOwner)element).hasModifierProperty(PsiModifier.STATIC),
PsiUtil.getTypeByPsiElement(element), element), matcher);
PsiUtil.getTypeByPsiElement(element), element));
}
private static String[] getPropertiesHandlersNames(final PsiClass psiClass,
@@ -378,4 +354,24 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
CodeStyleManager.getInstance(element.getProject()).performActionWithFormatterDisabled(result);
return result.result;
}
private static void addLookupItems(Set<LookupElement> lookupElements, @Nullable final SuggestedNameInfo callback, PrefixMatcher matcher, String[] strings) {
for (int i = 0; i < strings.length; i++) {
String name = strings[i];
if (!matcher.prefixMatches(name)) {
continue;
}
LookupElement element = PrioritizedLookupElement.withPriority(LookupElementBuilder.create(name).withAutoCompletionPolicy(AutoCompletionPolicy.GIVE_CHANCE_TO_OVERWRITE), -i);
if (callback != null) {
element = LookupElementDecorator.withInsertHandler(element, new InsertHandler<LookupElementDecorator<LookupElement>>() {
@Override
public void handleInsert(InsertionContext context, LookupElementDecorator<LookupElement> item) {
callback.nameChoosen(item.getLookupString());
}
});
}
lookupElements.add(element);
}
}
}

13
java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java
View File

@@ -25,14 +25,10 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.*;
import com.intellij.psi.meta.PsiMetaData;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
/**
* Created by IntelliJ IDEA.
@@ -74,15 +70,6 @@ public class LookupItemUtil{
return null;
}
public static List<LookupElement> addLookupItems(Set<LookupElement> set, Object[] objects, PrefixMatcher matcher) {
final ArrayList<LookupElement> list = new ArrayList<LookupElement>(objects.length);
for (Object object : objects) {
LOG.assertTrue(object != null, "Lookup item can't be null!");
ContainerUtil.addIfNotNull(addLookupItem(set, object, matcher), list);
}
return list;
}
/**
* @deprecated
* @see LookupElementBuilder

6
java/java-tests/testData/codeInsight/completion/normal/ClassReferenceInFor3.java Normal file
View File

@@ -0,0 +1,6 @@
public class Zoo2 {
{
String string;
for (Stri<caret>)
}
}

6
java/java-tests/testData/codeInsight/completion/normal/ClassReferenceInFor3_after.java Normal file
View File

@@ -0,0 +1,6 @@
public class Zoo2 {
{
String string;
for (String <caret>)
}
}

8
java/java-tests/testData/codeInsight/completion/variables/locals/UniqueNameInFor.java Normal file
View File

@@ -0,0 +1,8 @@
public class TestSource7 {
public void foo(){
List<Model> models;
Model model;
for(Model m<caret>)
}
}
class Model{}

8
java/java-tests/testData/codeInsight/completion/variables/locals/UniqueNameInFor_after.java Normal file
View File

@@ -0,0 +1,8 @@
public class TestSource7 {
public void foo(){
List<Model> models;
Model model;
for(Model model1<caret>)
}
}
class Model{}

9
java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
View File

@@ -868,6 +868,15 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
public void testPrimitiveCastOverwrite() throws Throwable { doTest '\t' }
public void testClassReferenceInFor() throws Throwable { doTest ' ' }
public void testClassReferenceInFor2() throws Throwable { doTest ' ' }
public void testClassReferenceInFor3() throws Throwable {
CodeInsightSettings.instance.COMPLETION_CASE_SENSITIVE = CodeInsightSettings.NONE
try {
doTest ' '
}
finally {
CodeInsightSettings.instance.COMPLETION_CASE_SENSITIVE = CodeInsightSettings.FIRST_LETTER
}
}
public void testVoidMethodsInNonVoidContext() throws Throwable {
configure()

4
java/java-tests/testSrc/com/intellij/codeInsight/completion/VariablesCompletionTest.java
View File

@@ -75,6 +75,10 @@ public class VariablesCompletionTest extends CompletionTestCase {
doTest("LocalReserved.java", "LocalReserved_after.java");
}
public void testUniqueNameInFor() throws Exception {
doTest(getTestName(false) + ".java", getTestName(false) + "_after.java");
}
private void doTest(String before, String after) throws Exception {
configureByFile(FILE_PREFIX + "locals/" + before);
checkResultByFile(FILE_PREFIX + "locals/" + after);