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

EA-56182

Browse Source
This commit is contained in:
Alexander Zolotov
2014-04-29 14:21:01 +04:00
parent 59454cda37
commit 7a06f6d100
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
+6
View File
@@ -27,9 +27,11 @@ import com.intellij.codeInsight.template.CustomLiveTemplate;
import com.intellij.codeInsight.template.CustomLiveTemplateBase;
import com.intellij.codeInsight.template.CustomTemplateCallback;
import com.intellij.codeInsight.template.TemplateManager;
import com.intellij.diagnostic.AttachmentFactory;
import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.ex.util.EditorUtil;
@@ -79,6 +81,10 @@ public class ListTemplatesHandler implements CodeInsightActionHandler {
public static Map<TemplateImpl, String> filterTemplatesByPrefix(@NotNull Collection<TemplateImpl> templates, @NotNull Editor editor,
int offset, boolean fullMatch, boolean searchInDescription) {
if (offset >= editor.getDocument().getTextLength()) {
Logger.getInstance(ListTemplatesHandler.class).error("Cannot filter templates, index out of bounds. Offset: " + offset,
AttachmentFactory.createAttachment(editor.getDocument()));
}
CharSequence documentText = editor.getDocument().getCharsSequence().subSequence(0, offset);
String prefixWithoutDots = computeDescriptionMatchingPrefix(editor.getDocument(), offset);
platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java
+2 -2
View File
@@ -65,9 +65,9 @@ public class LiveTemplateCompletionContributor extends CompletionContributor {
return;
}
int offset = parameters.getOffset();
final List<TemplateImpl> availableTemplates = TemplateManagerImpl.listApplicableTemplates(file, offset, false);
Editor editor = parameters.getEditor();
int offset = editor.getCaretModel().getOffset();
final List<TemplateImpl> availableTemplates = TemplateManagerImpl.listApplicableTemplates(file, offset, false);
final Map<TemplateImpl, String> templates = filterTemplatesByPrefix(availableTemplates, editor, offset, false, false);
if (showAllTemplates()) {
final AtomicBoolean templatesShown = new AtomicBoolean(false);