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

don't autopopup annoying name suggestions for fields

Browse Source
This commit is contained in:
peter
2011-04-20 19:17:00 +02:00
parent 6db0dbcebb
commit 325555e9da
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
+3 -2
View File
@@ -121,14 +121,15 @@ public class JavaCompletionUtil {
}
public static void completeVariableNameForRefactoring(Project project, Set<LookupElement> set, String prefix, PsiType varType, VariableKind varKind) {
JavaMemberNameCompletionContributor.completeVariableNameForRefactoring(project, set, new CamelHumpMatcher(prefix), varType, varKind);
JavaMemberNameCompletionContributor.completeVariableNameForRefactoring(project, set, new CamelHumpMatcher(prefix), varType, varKind,
true);
}
public static String[] completeVariableNameForRefactoring(JavaCodeStyleManager codeStyleManager, final PsiType varType,
final VariableKind varKind,
SuggestedNameInfo suggestedNameInfo) {
return JavaMemberNameCompletionContributor
.completeVariableNameForRefactoring(codeStyleManager, new CamelHumpMatcher(""), varType, varKind, suggestedNameInfo);
.completeVariableNameForRefactoring(codeStyleManager, new CamelHumpMatcher(""), varType, varKind, suggestedNameInfo, true);
}
public static PsiType eliminateWildcards(PsiType type) {
java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
+14 -7
View File
@@ -229,7 +229,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
if (PsiType.VOID.equals(var.getType()) || prefix.startsWith(JavaCompletionUtil.IS_PREFIX) ||
prefix.startsWith(JavaCompletionUtil.GET_PREFIX) ||
prefix.startsWith(JavaCompletionUtil.SET_PREFIX)) {
completeVariableNameForRefactoring(var.getProject(), set, matcher, var.getType(), variableKind);
completeVariableNameForRefactoring(var.getProject(), set, matcher, var.getType(), variableKind, includeOverlapped);
return;
}
@@ -261,16 +261,23 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
matcher), suggestedNameInfo);
}
public static void completeVariableNameForRefactoring(Project project, Set<LookupElement> set, PrefixMatcher matcher, PsiType varType, VariableKind varKind) {
public static void completeVariableNameForRefactoring(Project project,
Set<LookupElement> set,
PrefixMatcher matcher,
PsiType varType,
VariableKind varKind, final boolean includeOverlapped) {
JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(project);
SuggestedNameInfo suggestedNameInfo = codeStyleManager.suggestVariableName(varKind, null, null, varType);
final String[] strings = completeVariableNameForRefactoring(codeStyleManager, matcher, varType, varKind, suggestedNameInfo);
final String[] strings = completeVariableNameForRefactoring(codeStyleManager, matcher, varType, varKind, suggestedNameInfo,
includeOverlapped);
tunePreferencePolicy(LookupItemUtil.addLookupItems(set, strings, matcher), suggestedNameInfo);
}
public static String[] completeVariableNameForRefactoring(JavaCodeStyleManager codeStyleManager, final PrefixMatcher matcher, final PsiType varType,
final VariableKind varKind,
SuggestedNameInfo suggestedNameInfo) {
public static String[] completeVariableNameForRefactoring(JavaCodeStyleManager codeStyleManager,
final PrefixMatcher matcher,
final PsiType varType,
final VariableKind varKind,
SuggestedNameInfo suggestedNameInfo, final boolean includeOverlapped) {
Set<String> result = new LinkedHashSet<String>();
final String[] suggestedNames = suggestedNameInfo.names;
for (final String suggestedName : suggestedNames) {
@@ -279,7 +286,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
}
}
if (result.isEmpty() && PsiType.VOID != varType) {
if (result.isEmpty() && PsiType.VOID != varType && includeOverlapped) {
// use suggested names as suffixes
final String requiredSuffix = codeStyleManager.getSuffixByVariableKind(varKind);
final String prefix = matcher.getPrefix();
java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
+11
View File
@@ -723,5 +723,16 @@ class Foo {
assert !lookup
}
public void testMethodNameRestart() {
myFixture.configureByText "a.java", '''
public class Bar {
private static List<java.io.File> getS<caret>
}
'''
type 'ta'
assert !lookup
}
}