IDEA-77003 No autocomplete anymore for YouTrack tickets

This commit is contained in:
Dmitry Avdeev
2011-11-16 10:44:57 +04:00
parent dec9093d28
commit 9f0bb93aac
5 changed files with 13 additions and 4 deletions
@@ -440,7 +440,7 @@
<completion.skip implementation="com.intellij.codeInsight.template.impl.LiveTemplateCompletionContributor$Skipper" id="skipLiveTemplate"/>
<completion.contributor language="TEXT" implementationClass="com.intellij.openapi.vcs.CommitCompletionContributor" order="first, before liveTemplates"/>
<completion.contributor language="TEXT" implementationClass="com.intellij.openapi.vcs.CommitCompletionContributor" id="commitCompletion" order="first, before liveTemplates"/>
<applicationService serviceInterface="com.intellij.execution.console.ConsoleFoldingSettings" serviceImplementation="com.intellij.execution.console.ConsoleFoldingSettings"/>
<console.folding implementation="com.intellij.execution.console.SubstringConsoleFolding"/>
@@ -87,7 +87,7 @@
<editChangelistSupport implementation="com.intellij.tasks.impl.TaskChangelistSupport"/>
<completion.contributor language="TEXT" implementationClass="com.intellij.tasks.impl.TaskCompletionContributor"/>
<completion.contributor language="TEXT" implementationClass="com.intellij.tasks.impl.TaskCompletionContributor" order="first, before commitCompletion"/>
<projectService serviceInterface="com.intellij.tasks.impl.TaskProjectConfiguration"
serviceImplementation="com.intellij.tasks.impl.TaskProjectConfiguration"/>
@@ -16,6 +16,7 @@ import com.intellij.psi.PsiFile;
import com.intellij.tasks.Task;
import com.intellij.tasks.actions.TaskSearchSupport;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.concurrent.Callable;
@@ -30,7 +31,7 @@ public class TaskCompletionContributor extends CompletionContributor {
private static final Key<Consumer<Task>> KEY = Key.create("task completion available");
private static final Key<Boolean> AUTO_POPUP_KEY = Key.create("task completion auto-popup");
public static void installCompletion(Document document, Project project, Consumer<Task> consumer, boolean autoPopup) {
public static void installCompletion(Document document, Project project, @Nullable Consumer<Task> consumer, boolean autoPopup) {
PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document);
if (psiFile != null) {
//noinspection unchecked
@@ -13,6 +13,8 @@
<orderEntry type="module" module-name="jira-connector" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
<orderEntry type="module" module-name="testFramework-java" scope="TEST" />
<orderEntry type="module" module-name="vcs-impl" />
<orderEntry type="module" module-name="idea" />
</component>
</module>
@@ -2,10 +2,13 @@ package com.intellij.tasks;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.vcs.ui.CommitMessage;
import com.intellij.psi.PsiFile;
import com.intellij.tasks.impl.LocalTaskImpl;
import com.intellij.tasks.impl.TaskCompletionContributor;
import com.intellij.tasks.impl.TaskManagerImpl;
import com.intellij.testFramework.MapDataContext;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import java.util.Arrays;
@@ -55,7 +58,10 @@ public class TaskCompletionTest extends LightCodeInsightFixtureTestCase {
private void configureFile(String text) {
PsiFile psiFile = myFixture.configureByText("test.txt", text);
TaskCompletionContributor.installCompletion(myFixture.getDocument(psiFile), getProject(), null, false);
Document document = myFixture.getDocument(psiFile);
TaskCompletionContributor.installCompletion(document, getProject(), null, false);
document.putUserData(CommitMessage.DATA_CONTEXT_KEY, new MapDataContext());
}
private void configureRepository(LocalTaskImpl... tasks) {