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

next portion of LookupItem usage removal: LookupItemUtil.addLookupItem

Browse Source
This commit is contained in:
Peter Gromov
2009-09-08 11:24:53 +04:00
parent ae2886d800
commit 7edbf97d27
18 changed files with 70 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java
+4 -5
View File
@@ -38,12 +38,12 @@ public class BasicExpressionCompletionContributor extends ExpressionSmartComplet
result.addElement(createKeywordLookupItem(element, s));
}
public static LookupItem createKeywordLookupItem(final PsiElement element, final String s) {
public static LookupElement createKeywordLookupItem(final PsiElement element, final String s) {
return ApplicationManager.getApplication().runReadAction(new Computable<LookupItem>() {
public LookupItem compute() {
try {
final PsiKeyword keyword = JavaPsiFacade.getInstance(element.getProject()).getElementFactory().createKeyword(s);
return LookupItemUtil.objectToLookupItem(keyword).setAutoCompletionPolicy(AutoCompletionPolicy.GIVE_CHANCE_TO_OVERWRITE);
return ((LookupItem)LookupItemUtil.objectToLookupItem(keyword)).setAutoCompletionPolicy(AutoCompletionPolicy.GIVE_CHANCE_TO_OVERWRITE);
}
catch (IncorrectOperationException e) {
throw new RuntimeException(e);
@@ -96,8 +96,7 @@ public class BasicExpressionCompletionContributor extends ExpressionSmartComplet
isClassType(defaultType, baseClassName) || isClassType(defaultType, CommonClassNames.JAVA_UTIL_COLLECTION)) {
final PsiMethod[] methods = collectionsClass.findMethodsByName(method, false);
if (methods.length != 0) {
result.addElement(JavaCompletionUtil.qualify(
LookupItemUtil.objectToLookupItem(methods[0]).setAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE).setTailType(
result.addElement(JavaCompletionUtil.qualify(((LookupItem)LookupItemUtil.objectToLookupItem(methods[0])).setAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE).setTailType(
TailType.NONE)));
}
}
@@ -175,7 +174,7 @@ public class BasicExpressionCompletionContributor extends ExpressionSmartComplet
if (!refExpr.isQualified()) {
final PsiElement target = refExpr.resolve();
if (target instanceof PsiVariable) {
final LookupItem item = LookupItemUtil.objectToLookupItem(target);
final LookupItem item = (LookupItem)LookupItemUtil.objectToLookupItem(target);
item.setAttribute(LookupItem.SUBSTITUTOR, PsiSubstitutor.EMPTY);
return item;
}
java/java-impl/src/com/intellij/codeInsight/completion/JavaAwareCompletionData.java
+3 -2
View File
@@ -27,9 +27,10 @@ public class JavaAwareCompletionData extends CompletionData{
return;
}
LookupItem ret = LookupItemUtil.objectToLookupItem(completion);
if(ret == null) return;
LookupElement _ret = LookupItemUtil.objectToLookupItem(completion);
if(_ret == null || !(_ret instanceof LookupItem)) return;
LookupItem ret = (LookupItem)_ret;
final InsertHandler insertHandler = variant.getInsertHandler();
if(insertHandler != null && ret.getInsertHandler() == null) {
ret.setInsertHandler(insertHandler);
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
+1 -1
View File
@@ -546,7 +546,7 @@ public class JavaCompletionData extends JavaAwareCompletionData{
result.addElement(BasicExpressionCompletionContributor.createKeywordLookupItem(position, PsiKeyword.THIS));
final LookupItem superItem = BasicExpressionCompletionContributor.createKeywordLookupItem(position, PsiKeyword.SUPER);
final LookupItem superItem = (LookupItem)BasicExpressionCompletionContributor.createKeywordLookupItem(position, PsiKeyword.SUPER);
if (psiElement().afterLeaf(psiElement().withText("{").withSuperParent(2, psiMethod().constructor(true))).accepts(position)) {
final PsiMethod method = PsiTreeUtil.getParentOfType(position, PsiMethod.class, false, PsiClass.class);
assert method != null;
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
+13 -10
View File
@@ -89,7 +89,7 @@ public class JavaCompletionUtil {
});
public static final Key<List<PsiMethod>> ALL_METHODS_ATTRIBUTE = Key.create("allMethods");
public static void completeLocalVariableName(Set<LookupItem> set, PrefixMatcher matcher, PsiVariable var){
public static void completeLocalVariableName(Set<LookupElement> set, PrefixMatcher matcher, PsiVariable var){
FeatureUsageTracker.getInstance().triggerFeatureUsed("editing.completion.variable.name");
final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(var.getProject());
final VariableKind variableKind = codeStyleManager.getVariableKind(var);
@@ -129,7 +129,7 @@ public class JavaCompletionUtil {
tunePreferencePolicy(LookupItemUtil.addLookupItems(set, nameSuggestions, matcher), suggestedNameInfo);
}
public static void completeFieldName(Set<LookupItem> set, PsiVariable var, final PrefixMatcher matcher){
public static void completeFieldName(Set<LookupElement> set, PsiVariable var, final PrefixMatcher matcher){
FeatureUsageTracker.getInstance().triggerFeatureUsed("editing.completion.variable.name");
JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(var.getProject());
@@ -169,7 +169,7 @@ public class JavaCompletionUtil {
matcher), suggestedNameInfo);
}
public static void completeMethodName(Set<LookupItem> set, PsiElement element, final PrefixMatcher matcher){
public static void completeMethodName(Set<LookupElement> set, PsiElement element, final PrefixMatcher matcher){
if(element instanceof PsiMethod) {
final PsiMethod method = (PsiMethod)element;
if (method.isConstructor()) {
@@ -202,11 +202,11 @@ public class JavaCompletionUtil {
return item.getUserData(QUALIFIER_TYPE_ATTR);
}
public static void completeVariableNameForRefactoring(Project project, Set<LookupItem> set, String prefix, PsiType varType, VariableKind varKind) {
public static void completeVariableNameForRefactoring(Project project, Set<LookupElement> set, String prefix, PsiType varType, VariableKind varKind) {
completeVariableNameForRefactoring(project, set, new CamelHumpMatcher(prefix), varType, varKind);
}
public static void completeVariableNameForRefactoring(Project project, Set<LookupItem> set, PrefixMatcher matcher, PsiType varType, VariableKind varKind) {
public static void completeVariableNameForRefactoring(Project project, Set<LookupElement> set, PrefixMatcher matcher, PsiType varType, VariableKind varKind) {
JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(project);
SuggestedNameInfo suggestedNameInfo = codeStyleManager.suggestVariableName(varKind, null, null, varType);
final String[] strings = completeVariableNameForRefactoring(codeStyleManager, matcher, varType, varKind, suggestedNameInfo);
@@ -248,7 +248,7 @@ public class JavaCompletionUtil {
return result.toArray(new String[result.size()]);
}
private static void tunePreferencePolicy(final List<LookupItem> list, final SuggestedNameInfo suggestedNameInfo) {
private static void tunePreferencePolicy(final List<LookupElement> list, final SuggestedNameInfo suggestedNameInfo) {
final InsertHandler insertHandler = new InsertHandler() {
public void handleInsert(final InsertionContext context, final LookupElement item) {
suggestedNameInfo.nameChoosen(item.getLookupString());
@@ -256,8 +256,10 @@ public class JavaCompletionUtil {
};
for (int i = 0; i < list.size(); i++) {
LookupItem item = list.get(i);
item.setPriority(list.size() - i).setInsertHandler(insertHandler);
LookupElement item = list.get(i);
if (item instanceof LookupItem) {
((LookupItem)item).setPriority(list.size() - i).setInsertHandler(insertHandler);
}
}
}
@@ -948,9 +950,10 @@ public class JavaCompletionUtil {
assert !(completion instanceof LookupElement);
LookupItem<?> ret = LookupItemUtil.objectToLookupItem(completion);
if (ret == null) return null;
LookupElement _ret = LookupItemUtil.objectToLookupItem(completion);
if (_ret == null || !(_ret instanceof LookupItem)) return null;
LookupItem<?> ret = (LookupItem<?>)_ret;
final PsiSubstitutor substitutor = completionElement.getSubstitutor();
if (substitutor != null) {
ret.setAttribute(LookupItem.SUBSTITUTOR, substitutor);
java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java
+3 -6
View File
@@ -2,10 +2,7 @@ package com.intellij.codeInsight.completion;
import com.intellij.codeInsight.completion.scope.CompletionElement;
import com.intellij.codeInsight.completion.scope.JavaCompletionProcessor;
import com.intellij.codeInsight.lookup.AutoCompletionPolicy;
import com.intellij.codeInsight.lookup.Lookup;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.codeInsight.lookup.LookupItemUtil;
import com.intellij.codeInsight.lookup.*;
import com.intellij.codeInspection.InspectionProfile;
import com.intellij.codeInspection.InspectionProfileEntry;
import com.intellij.codeInspection.SuppressionUtil;
@@ -69,7 +66,7 @@ public class JavaDocCompletionContributor extends CompletionContributor {
((PsiJavaReference) ref).processVariants(processor);
for (final CompletionElement _item : processor.getResults()) {
LookupItem item = LookupItemUtil.objectToLookupItem(_item.getElement());
LookupItem item = (LookupItem)LookupItemUtil.objectToLookupItem(_item.getElement());
if (onlyConstants) {
Object o = item.getObject();
if (!(o instanceof PsiField)) continue;
@@ -123,7 +120,7 @@ public class JavaDocCompletionContributor extends CompletionContributor {
ret.add(tokenizer.nextToken());
}
for (final String s : ret) {
final LookupItem item = LookupItemUtil.objectToLookupItem(s);
final LookupItem item = (LookupItem)LookupItemUtil.objectToLookupItem(s);
if (isInline) {
item.setInsertHandler(new InlineInsertHandler());
}
java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
+12 -8
View File
@@ -4,8 +4,9 @@
*/
package com.intellij.codeInsight.completion;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.codeInsight.lookup.AutoCompletionPolicy;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.patterns.ElementPattern;
import static com.intellij.patterns.PlatformPatterns.psiElement;
@@ -32,14 +33,17 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
or(psiElement(PsiLocalVariable.class), psiElement(PsiParameter.class))),
new CompletionProvider<CompletionParameters>() {
public void addCompletions(@NotNull final CompletionParameters parameters, final ProcessingContext matchingContext, @NotNull final CompletionResultSet result) {
final Set<LookupItem> lookupSet = new THashSet<LookupItem>();
final Set<LookupElement> lookupSet = new THashSet<LookupElement>();
ApplicationManager.getApplication().runReadAction(new Runnable() {
public void run() {
JavaCompletionUtil.completeLocalVariableName(lookupSet, result.getPrefixMatcher(), (PsiVariable)parameters.getPosition().getParent());
}
});
for (final LookupItem item : lookupSet) {
result.addElement(item.setAutoCompletionPolicy(AutoCompletionPolicy.GIVE_CHANCE_TO_OVERWRITE));
for (final LookupElement item : lookupSet) {
if (item instanceof LookupItem) {
((LookupItem)item).setAutoCompletionPolicy(AutoCompletionPolicy.GIVE_CHANCE_TO_OVERWRITE);
}
result.addElement(item);
}
}
});
@@ -48,7 +52,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
psiElement(PsiIdentifier.class).withParent(PsiField.class).andNot(INSIDE_TYPE_PARAMS_PATTERN),
new CompletionProvider<CompletionParameters>() {
public void addCompletions(@NotNull final CompletionParameters parameters, final ProcessingContext matchingContext, @NotNull final CompletionResultSet result) {
final Set<LookupItem> lookupSet = new THashSet<LookupItem>();
final Set<LookupElement> lookupSet = new THashSet<LookupElement>();
ApplicationManager.getApplication().runReadAction(new Runnable() {
public void run() {
final PsiVariable variable = (PsiVariable)parameters.getPosition().getParent();
@@ -56,7 +60,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
JavaCompletionUtil.completeMethodName(lookupSet, variable, result.getPrefixMatcher());
}
});
for (final LookupItem item : lookupSet) {
for (final LookupElement item : lookupSet) {
result.addElement(item);
}
}
@@ -65,13 +69,13 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
CompletionType.BASIC, PsiJavaPatterns.psiElement().nameIdentifierOf(PsiJavaPatterns.psiMethod().withParent(PsiClass.class)),
new CompletionProvider<CompletionParameters>() {
public void addCompletions(@NotNull final CompletionParameters parameters, final ProcessingContext matchingContext, @NotNull final CompletionResultSet result) {
final Set<LookupItem> lookupSet = new THashSet<LookupItem>();
final Set<LookupElement> lookupSet = new THashSet<LookupElement>();
ApplicationManager.getApplication().runReadAction(new Runnable() {
public void run() {
JavaCompletionUtil.completeMethodName(lookupSet, parameters.getPosition().getParent(), result.getPrefixMatcher());
}
});
for (final LookupItem item : lookupSet) {
for (final LookupElement item : lookupSet) {
result.addElement(item);
}
}
java/java-impl/src/com/intellij/codeInsight/completion/NullSmartCompletionContributor.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class NullSmartCompletionContributor extends CompletionContributor{
if (empty.get().booleanValue() && prefix.startsWith("n")) {
for (final ExpectedTypeInfo info : infos) {
if (!(info.getType() instanceof PsiPrimitiveType)) {
final LookupItem item = BasicExpressionCompletionContributor.createKeywordLookupItem(parameters.getPosition(), PsiKeyword.NULL);
final LookupItem item = (LookupItem)BasicExpressionCompletionContributor.createKeywordLookupItem(parameters.getPosition(), PsiKeyword.NULL);
item.setAttribute(LookupItem.TYPE, PsiType.NULL);
result.addElement(JavaSmartCompletionContributor.decorate(item, infos));
return;
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
+1 -1
View File
@@ -899,7 +899,7 @@ public class CreateFromUsageUtils {
}
HashSet<String> names = new HashSet<String>();
Set<LookupItem> set = new LinkedHashSet<LookupItem>();
Set<LookupElement> set = new LinkedHashSet<LookupElement>();
for (String name : myNames) {
if (parameterNames.contains(name)) {
java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java
+9 -9
View File
@@ -35,15 +35,15 @@ public class LookupItemUtil{
}
@Nullable
public static LookupItem addLookupItem(Collection<LookupItem> set, @NotNull Object object) {
public static LookupElement addLookupItem(Collection<LookupElement> set, @NotNull Object object) {
return addLookupItem(set, object, new CamelHumpMatcher(""));
}
@Nullable
public static LookupItem addLookupItem(Collection<LookupItem> set, @NotNull Object object, PrefixMatcher matcher) {
public static LookupElement addLookupItem(Collection<LookupElement> set, @NotNull Object object, PrefixMatcher matcher) {
if (object instanceof PsiType) {
PsiType psiType = (PsiType)object;
for (final LookupItem lookupItem : set) {
for (final LookupElement lookupItem : set) {
Object o = lookupItem.getObject();
if (o.equals(psiType)) {
return lookupItem;
@@ -51,18 +51,18 @@ public class LookupItemUtil{
}
}
for (LookupItem lookupItem : set) {
for (LookupElement lookupItem : set) {
if(lookupItem.getObject().equals(lookupItem)) return null;
}
LookupItem item = objectToLookupItem(object);
LookupElement item = objectToLookupItem(object);
if (matcher.prefixMatches(item)) {
return set.add(item) ? item : null;
}
return null;
}
public static List<LookupItem> addLookupItems(Set<LookupItem> set, Object[] objects, PrefixMatcher matcher) {
final ArrayList<LookupItem> list = new ArrayList<LookupItem>(objects.length);
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);
@@ -74,8 +74,8 @@ public class LookupItemUtil{
* @deprecated
* @see LookupElementBuilder
*/
public static LookupItem objectToLookupItem(Object object) {
if (object instanceof LookupItem) return (LookupItem)object;
public static LookupElement objectToLookupItem(Object object) {
if (object instanceof LookupElement) return (LookupElement)object;
if (object instanceof PsiClass) {
return new JavaPsiClassReferenceElement((PsiClass)object).setTailType(TailType.NONE);
}
java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java
+7 -6
View File
@@ -2,6 +2,7 @@ package com.intellij.codeInsight.template.impl;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.codeInsight.lookup.LookupItemUtil;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.template.TemplateLookupSelectionHandler;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
@@ -95,18 +96,18 @@ public class JavaTemplateUtil {
}
}
public static LookupItem addElementLookupItem(Set<LookupItem> items, PsiElement element) {
public static LookupElement addElementLookupItem(Set<LookupElement> items, PsiElement element) {
return addJavaLookupItem(items, element);
}
public static LookupItem addTypeLookupItem(Set<LookupItem> items, PsiType type) {
public static LookupElement addTypeLookupItem(Set<LookupElement> items, PsiType type) {
return addJavaLookupItem(items, type);
}
private static LookupItem addJavaLookupItem(final Set<LookupItem> items, final Object element) {
final LookupItem item = LookupItemUtil.addLookupItem(items, element);
if (item != null) {
item.setAttribute(TemplateLookupSelectionHandler.KEY_IN_LOOKUP_ITEM, new JavaTemplateLookupSelectionHandler());
private static LookupElement addJavaLookupItem(final Set<LookupElement> items, final Object element) {
final LookupElement item = LookupItemUtil.addLookupItem(items, element);
if (item instanceof LookupItem) {
((LookupItem)item).setAttribute(TemplateLookupSelectionHandler.KEY_IN_LOOKUP_ITEM, new JavaTemplateLookupSelectionHandler());
}
return item;
}
java/java-impl/src/com/intellij/codeInsight/template/macro/ExpectedTypeMacro.java
+1 -2
View File
@@ -5,7 +5,6 @@ import com.intellij.codeInsight.ExpectedTypeInfo;
import com.intellij.codeInsight.ExpectedTypesProvider;
import com.intellij.codeInsight.completion.CompletionUtil;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.codeInsight.template.*;
import com.intellij.codeInsight.template.impl.JavaTemplateUtil;
import com.intellij.openapi.command.WriteCommandAction;
@@ -46,7 +45,7 @@ public class ExpectedTypeMacro implements Macro{
public LookupElement[] calculateLookupItems(@NotNull Expression[] params, ExpressionContext context) {
PsiType[] types = getExpectedTypes(params, context);
if (types == null || types.length < 2) return null;
Set<LookupItem> set = new LinkedHashSet<LookupItem>();
Set<LookupElement> set = new LinkedHashSet<LookupElement>();
for (PsiType type : types) {
JavaTemplateUtil.addTypeLookupItem(set, type);
}
java/java-impl/src/com/intellij/codeInsight/template/macro/GuessElementTypeMacro.java
+1 -2
View File
@@ -3,7 +3,6 @@ package com.intellij.codeInsight.template.macro;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.guess.GuessManager;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.template.*;
import com.intellij.codeInsight.template.impl.JavaTemplateUtil;
@@ -45,7 +44,7 @@ public class GuessElementTypeMacro implements Macro {
public LookupElement[] calculateLookupItems(@NotNull Expression[] params, ExpressionContext context) {
PsiType[] types = guessTypes(params, context);
if (types == null || types.length < 2) return null;
Set<LookupItem> set = new LinkedHashSet<LookupItem>();
Set<LookupElement> set = new LinkedHashSet<LookupElement>();
for (PsiType type : types) {
JavaTemplateUtil.addTypeLookupItem(set, type);
}
java/java-impl/src/com/intellij/codeInsight/template/macro/SubtypesMacro.java
+1 -2
View File
@@ -2,7 +2,6 @@ package com.intellij.codeInsight.template.macro;
import com.intellij.codeInsight.CodeInsightUtil;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.codeInsight.template.*;
import com.intellij.codeInsight.template.impl.JavaTemplateUtil;
import com.intellij.openapi.util.Condition;
@@ -48,7 +47,7 @@ public class SubtypesMacro implements Macro {
final PsiFile file = PsiDocumentManager.getInstance(context.getProject()).getPsiFile(context.getEditor().getDocument());
final PsiElement element = file.findElementAt(context.getStartOffset());
types.addAll(CodeInsightUtil.addSubtypes(type, element, false, Condition.TRUE));
final Set<LookupItem> set = new LinkedHashSet<LookupItem>();
final Set<LookupElement> set = new LinkedHashSet<LookupElement>();
for (PsiType t: types) {
JavaTemplateUtil.addTypeLookupItem(set, t);
}
java/java-impl/src/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java
+1 -2
View File
@@ -1,7 +1,6 @@
package com.intellij.codeInsight.template.macro;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.template.*;
import com.intellij.codeInsight.template.impl.JavaTemplateUtil;
@@ -44,7 +43,7 @@ public class VariableOfTypeMacro implements Macro {
public LookupElement[] calculateLookupItems(@NotNull Expression[] params, final ExpressionContext context) {
final PsiElement[] vars = getVariables(params, context);
if (vars == null || vars.length < 2) return null;
final Set<LookupItem> set = new LinkedHashSet<LookupItem>();
final Set<LookupElement> set = new LinkedHashSet<LookupElement>();
for (PsiElement var : vars) {
JavaTemplateUtil.addElementLookupItem(set, var);
}
java/java-impl/src/com/intellij/codeInsight/template/macro/VariableTypeMacroBase.java
+1 -2
View File
@@ -1,6 +1,5 @@
package com.intellij.codeInsight.template.macro;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.template.*;
import com.intellij.codeInsight.template.impl.JavaTemplateUtil;
@@ -21,7 +20,7 @@ public abstract class VariableTypeMacroBase implements Macro {
public LookupElement[] calculateLookupItems(@NotNull Expression[] params, final ExpressionContext context) {
final PsiElement[] vars = getVariables(params, context);
if (vars == null || vars.length < 2) return null;
Set<LookupItem> set = new LinkedHashSet<LookupItem>();
Set<LookupElement> set = new LinkedHashSet<LookupElement>();
for (PsiElement element : vars) {
JavaTemplateUtil.addElementLookupItem(set, element);
}
java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class MembersGetter {
resolveHelper.isAccessible(member, context, null)) {
if (result instanceof PsiField && !member.hasModifierProperty(PsiModifier.FINAL)) continue;
if (result instanceof PsiMethod && acceptMethods) continue;
final LookupItem item = LookupItemUtil.objectToLookupItem(result);
final LookupItem item = (LookupItem)LookupItemUtil.objectToLookupItem(result);
item.setAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE);
JavaCompletionUtil.qualify(item);
if (member instanceof PsiMethod) {
java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java
+7 -5
View File
@@ -1,9 +1,8 @@
package com.intellij.refactoring.changeSignature;
import com.intellij.codeInsight.completion.JavaCompletionUtil;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Logger;
@@ -24,13 +23,16 @@ import com.intellij.refactoring.HelpID;
import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.changeSignature.inCallers.CallerChooser;
import com.intellij.refactoring.ui.*;
import com.intellij.refactoring.util.*;
import com.intellij.refactoring.util.CanonicalTypes;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.refactoring.util.RefactoringMessageUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.ui.*;
import com.intellij.ui.treeStructure.Tree;
import com.intellij.util.Alarm;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.VisibilityUtil;
import com.intellij.util.ui.Table;
import com.intellij.ui.treeStructure.Tree;
import org.jetbrains.annotations.NonNls;
import javax.swing.*;
@@ -366,7 +368,7 @@ public class ChangeSignatureDialog extends RefactoringDialog {
Editor editor = editorTextField.getEditor();
String prefix = editorTextField.getText();
if (prefix == null) prefix = "";
Set<LookupItem> set = new LinkedHashSet<LookupItem>();
Set<LookupElement> set = new LinkedHashSet<LookupElement>();
JavaCompletionUtil.completeVariableNameForRefactoring(myProject, set, prefix, type, VariableKind.PARAMETER);
LookupElement[] lookupItems = set.toArray(new LookupElement[set.size()]);
java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java
+3 -4
View File
@@ -1,16 +1,15 @@
package com.intellij.refactoring.rename;
import com.intellij.codeInsight.completion.JavaCompletionUtil;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.codeInsight.lookup.LookupItemUtil;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupItemUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.codeStyle.NameUtil;
import com.intellij.psi.codeStyle.SuggestedNameInfo;
import com.intellij.psi.codeStyle.VariableKind;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.usageView.UsageViewUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
@@ -107,7 +106,7 @@ public class JavaNameSuggestionProvider implements NameSuggestionProvider {
if (element instanceof PsiVariable) {
PsiVariable var = (PsiVariable)element;
VariableKind kind = JavaCodeStyleManager.getInstance(element.getProject()).getVariableKind(var);
Set<LookupItem> set = new LinkedHashSet<LookupItem>();
Set<LookupElement> set = new LinkedHashSet<LookupElement>();
JavaCompletionUtil.completeVariableNameForRefactoring(element.getProject(), set, prefix, var.getType(), kind);
if (prefix.length() == 0) {