MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 06:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

templates: show custom templates after regular code completion

Browse Source
This commit is contained in:
Andrey Starovoyt
2016-10-28 20:49:46 +03:00
parent 8900e8a1cd
commit 9fabc8cc55
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java
+15 -12
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ import static com.intellij.codeInsight.template.impl.ListTemplatesHandler.filter
*/
public class LiveTemplateCompletionContributor extends CompletionContributor {
private static boolean ourShowTemplatesInTests = false;
@TestOnly
public static void setShowTemplatesInTests(boolean show, @NotNull Disposable parentDisposable) {
ourShowTemplatesInTests = show;
@@ -88,11 +88,12 @@ public class LiveTemplateCompletionContributor extends CompletionContributor {
result.runRemainingContributors(parameters, completionResult -> {
finalResult.passResult(completionResult);
if (completionResult.isStartMatch()) {
ensureTemplatesShown(templatesShown, templates, parameters, finalResult);
ensureTemplatesShown(templatesShown, templates, finalResult);
}
});
ensureTemplatesShown(templatesShown, templates, parameters, result);
ensureTemplatesShown(templatesShown, templates, result);
showCustomLiveTemplates(parameters, result);
return;
}
@@ -107,7 +108,7 @@ public class LiveTemplateCompletionContributor extends CompletionContributor {
.addElement(new LiveTemplateLookupElementImpl(template, true));
}
}
for (Map.Entry<TemplateImpl, String> possible : templates.entrySet()) {
String templateKey = possible.getKey().getKey();
String currentPrefix = possible.getValue();
@@ -137,19 +138,21 @@ public class LiveTemplateCompletionContributor extends CompletionContributor {
}
private static void ensureTemplatesShown(AtomicBoolean templatesShown, Map<TemplateImpl, String> templates,
CompletionParameters parameters, CompletionResultSet result) {
CompletionResultSet result) {
if (!templatesShown.getAndSet(true)) {
for (final Map.Entry<TemplateImpl, String> entry : templates.entrySet()) {
result.withPrefixMatcher(result.getPrefixMatcher().cloneWithPrefix(StringUtil.notNullize(entry.getValue())))
.addElement(new LiveTemplateLookupElementImpl(entry.getKey(), false));
}
}
}
PsiFile file = parameters.getPosition().getContainingFile();
Editor editor = parameters.getEditor();
for (CustomLiveTemplate customLiveTemplate : TemplateManagerImpl.listApplicableCustomTemplates(editor, file, false)) {
if (customLiveTemplate instanceof CustomLiveTemplateBase) {
((CustomLiveTemplateBase)customLiveTemplate).addCompletions(parameters, result);
}
private static void showCustomLiveTemplates(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result) {
PsiFile file = parameters.getPosition().getContainingFile();
Editor editor = parameters.getEditor();
for (CustomLiveTemplate customLiveTemplate : TemplateManagerImpl.listApplicableCustomTemplates(editor, file, false)) {
if (customLiveTemplate instanceof CustomLiveTemplateBase) {
((CustomLiveTemplateBase)customLiveTemplate).addCompletions(parameters, result);
}
}
}
platform/platform-resources/src/META-INF/LangExtensions.xml
+1 -1
View File
@@ -941,7 +941,7 @@
<editorOptionsProvider instance="com.intellij.codeInsight.template.postfix.settings.PostfixTemplatesConfigurable"
id="reference.settingsdialog.IDE.editor.postfix.templates"
displayName="Postfix Completion"/>
<completion.contributor language="any" implementationClass="com.intellij.codeInsight.template.postfix.completion.PostfixTemplateCompletionContributor"/>
<completion.contributor language="any" implementationClass="com.intellij.codeInsight.template.postfix.completion.PostfixTemplateCompletionContributor" order="last"/>
<projectService serviceInterface="com.intellij.execution.ExecutionManager" serviceImplementation="com.intellij.execution.impl.ExecutionManagerImpl"/>
<projectService serviceInterface="com.intellij.execution.ExecutionTargetManager" serviceImplementation="com.intellij.execution.ExecutionTargetManagerImpl"/>