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

IDEA-114256 Completion popup should prefer option without prefix

Browse Source
This commit is contained in:
peter
2013-10-01 13:16:17 +02:00
parent f21968a832
commit 3a1ab0f858
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/completion/normalSorting/UnderscoresDontMakeMatchMiddle.java
+1 -1
View File
@@ -1,5 +1,5 @@
class FooBar {
void foo(FooBar _fooBar) {
void foo(FooBar _fooBar, FooBar fooBar) {
fb<caret>
}
}
java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
+1 -1
View File
@@ -457,7 +457,7 @@ interface TxANotAnno {}
public void testUnderscoresDontMakeMatchMiddle() {
CodeInsightSettings.getInstance().COMPLETION_CASE_SENSITIVE = CodeInsightSettings.NONE;
checkPreferredItems(0, '_fooBar', 'FooBar')
checkPreferredItems(0, 'fooBar', '_fooBar', 'FooBar')
}
public void testStatisticsMattersOnNextCompletion() {
platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java
+13 -8
View File
@@ -12,6 +12,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.codeStyle.MinusculeMatcher;
import com.intellij.psi.codeStyle.NameUtil;
import com.intellij.util.containers.FList;
import com.intellij.util.text.CharArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.TestOnly;
@@ -46,7 +47,7 @@ public class CamelHumpMatcher extends PrefixMatcher {
for (String s : element.getAllLookupStrings()) {
FList<TextRange> ranges = myCaseInsensitiveMatcher.matchingFragments(s);
if (ranges == null) continue;
if (ranges.isEmpty() || isStartMatchModuloUnderscores(s, ranges.get(0).getStartOffset())) {
if (ranges.isEmpty() || skipUnderscores(s) >= ranges.get(0).getStartOffset()) {
return true;
}
}
@@ -54,13 +55,8 @@ public class CamelHumpMatcher extends PrefixMatcher {
return false;
}
private static boolean isStartMatchModuloUnderscores(@NotNull String name, int startIndex) {
for (int i = 0; i < startIndex; i++) {
if (name.charAt(i) != '_') {
return false;
}
}
return true;
private static int skipUnderscores(@NotNull String name) {
return CharArrayUtil.shiftForward(name, 0, "_");
}
@Override
@@ -142,6 +138,15 @@ public class CamelHumpMatcher extends PrefixMatcher {
@Override
public int matchingDegree(String string) {
FList<TextRange> ranges = myCaseInsensitiveMatcher.matchingFragments(string);
if (ranges != null && !ranges.isEmpty()) {
int matchStart = ranges.get(0).getStartOffset();
int underscoreEnd = skipUnderscores(string);
if (matchStart > 0 && matchStart <= underscoreEnd) {
return myMatcher.matchingDegree(string.substring(matchStart)) - 1;
}
}
return myMatcher.matchingDegree(string);
}
}