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

IDEA-90201 Commit message code completion (Ctrl+Space) - works incorrectly if applied after '-'

Browse Source
This commit is contained in:
Dmitry Avdeev
2012-08-27 18:03:46 +04:00
parent d47b38852b
commit 52351a7006
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/vcs/CommitCompletionContributor.java
+7 -3
View File
@@ -18,6 +18,7 @@ package com.intellij.openapi.vcs;
import com.intellij.codeInsight.completion.CompletionContributor;
import com.intellij.codeInsight.completion.CompletionParameters;
import com.intellij.codeInsight.completion.CompletionResultSet;
import com.intellij.codeInsight.completion.impl.CamelHumpMatcher;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.ide.presentation.VirtualFilePresentation;
import com.intellij.openapi.actionSystem.DataContext;
@@ -28,6 +29,7 @@ import com.intellij.openapi.vcs.ui.CommitMessage;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.ui.TextFieldWithAutoCompletionListProvider;
/**
* @author Dmitry Avdeev
@@ -45,13 +47,15 @@ public class CommitCompletionContributor extends CompletionContributor {
if (parameters.getInvocationCount() > 0) {
ChangeList[] lists = VcsDataKeys.CHANGE_LISTS.getData(dataContext);
if (lists != null) {
CompletionResultSet insensitive = result.caseInsensitive();
String prefix = TextFieldWithAutoCompletionListProvider.getCompletionPrefix(parameters);
CompletionResultSet insensitive = result.caseInsensitive().withPrefixMatcher(new CamelHumpMatcher(prefix));
for (ChangeList list : lists) {
for (Change change : list.getChanges()) {
VirtualFile virtualFile = change.getVirtualFile();
if (virtualFile != null) {
insensitive.addElement(LookupElementBuilder.create(virtualFile.getName()).
withIcon(VirtualFilePresentation.getIcon(virtualFile)));
LookupElementBuilder element = LookupElementBuilder.create(virtualFile.getName()).
withIcon(VirtualFilePresentation.getIcon(virtualFile));
insensitive.addElement(element);
}
}
}
platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletionListProvider.java
+4
View File
@@ -129,6 +129,10 @@ public abstract class TextFieldWithAutoCompletionListProvider<T> implements Comp
@Nullable
public String getPrefix(@NotNull final CompletionParameters parameters) {
return getCompletionPrefix(parameters);
}
public static String getCompletionPrefix(CompletionParameters parameters) {
String text = parameters.getOriginalFile().getText();
int i = text.lastIndexOf(' ', parameters.getOffset() - 1) + 1;
return text.substring(i, parameters.getOffset());