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

take words from other files if there is no variants from current file at all (IDEA-117511)

Browse Source
This commit is contained in:
Maxim.Mossienko
2013-12-25 09:22:07 +01:00
parent fb7a33bcef
commit 64575f68e7
2 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/codeInsight/completion/HippieCompletionTest.groovy
+38
View File
@@ -61,6 +61,44 @@ $some_long_variable_name<caret>
}
public void testFromAnotherFile2() {
myFixture.configureByText "b.txt", '''
foo function foo2
'''
myFixture.configureByText "a.txt", '''
f<caret>
'''
complete()
myFixture.checkResult '''
foo2<caret>
'''
complete()
myFixture.checkResult '''
function<caret>
'''
complete()
myFixture.checkResult '''
foo<caret>
'''
myFixture.configureByText "a.txt", '''
f<caret>
'''
backComplete()
myFixture.checkResult '''
foo<caret>
'''
backComplete()
myFixture.checkResult '''
function<caret>
'''
backComplete()
myFixture.checkResult '''
foo2<caret>
'''
}
public void "test no middle matching"() {
myFixture.configureByText "a.txt", '''
fooExpression
platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieWordCompletionHandler.java
+16 -6
View File
@@ -76,7 +76,7 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
fromOtherFiles = false;
}
CompletionVariant nextVariant = computeNextVariant(editor, oldPrefix, lastProposedVariant, data, file, fromOtherFiles);
CompletionVariant nextVariant = computeNextVariant(editor, oldPrefix, lastProposedVariant, data, file, fromOtherFiles, false);
if (nextVariant == null) return;
int replacementEnd = data.startOffset + data.myWordUnderCursor.length();
@@ -110,16 +110,20 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
@Nullable CompletionVariant lastProposedVariant,
final CompletionData data,
PsiFile file,
boolean includeWordsFromOtherFiles
boolean includeWordsFromOtherFiles,
boolean weAlreadyDoBestAttempt
) {
final List<CompletionVariant> variants = computeVariants(editor, new CamelHumpMatcher(StringUtil.notNullize(prefix)), file, includeWordsFromOtherFiles);
if (variants.isEmpty()) return null;
if (variants.isEmpty()) {
return weAlreadyDoBestAttempt ? null:computeNextVariant(editor, prefix, null, data, file, !includeWordsFromOtherFiles, true);
}
if (lastProposedVariant != null) {
if (lastProposedVariant != null) { // intern lastProposedVariant
for (CompletionVariant variant : variants) {
if (variant.variant.equals(lastProposedVariant.variant)) {
if (lastProposedVariant.offset > data.startOffset && variant.offset > data.startOffset) lastProposedVariant = variant;
if (lastProposedVariant.offset < data.startOffset && variant.offset < data.startOffset) lastProposedVariant = variant;
if (includeWordsFromOtherFiles && lastProposedVariant.editor == variant.editor) lastProposedVariant = variant;
}
}
}
@@ -129,6 +133,9 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
CompletionVariant result = null;
if (myForward) {
if (includeWordsFromOtherFiles) {
return variants.get(variants.size() - 1);
}
for (CompletionVariant variant : variants) {
if (variant.offset < data.startOffset) {
result = variant;
@@ -140,6 +147,9 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
}
}
else {
if (includeWordsFromOtherFiles) {
return variants.get(0);
}
for (CompletionVariant variant : variants) {
if (variant.offset > data.startOffset) {
return variant;
@@ -158,7 +168,7 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
for (CompletionVariant variant : variants) {
if (variant == lastProposedVariant) {
if (result == null) {
return computeNextVariant(editor, prefix, null, data, file, !includeWordsFromOtherFiles);
return computeNextVariant(editor, prefix, null, data, file, !includeWordsFromOtherFiles, true);
}
return result;
}
@@ -175,7 +185,7 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
return i.next();
}
else {
return computeNextVariant(editor, prefix, null, data, file, !includeWordsFromOtherFiles);
return computeNextVariant(editor, prefix, null, data, file, !includeWordsFromOtherFiles, true);
}
}
}