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

don't count completion char

Browse Source
This commit is contained in:
peter
2012-06-20 20:14:16 +02:00
parent dbc04b50c0
commit a7b4a61ef8
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+1 -1
View File
@@ -766,7 +766,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
}
});
update.addSparedChars(indicator, item, context);
update.addSparedChars(indicator, item, context, completionChar);
return context;
}
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java
+10 -3
View File
@@ -387,15 +387,22 @@ public class CompletionLookupArranger extends LookupArranger {
public void dispose() {
}
public void addSparedChars(CompletionProgressIndicator indicator, LookupElement item, InsertionContext context) {
public void addSparedChars(CompletionProgressIndicator indicator, LookupElement item, InsertionContext context, char completionChar) {
String textInserted;
if (context.getStartOffset() >= 0 && context.getTailOffset() >= context.getStartOffset()) {
textInserted = context.getDocument().getText().substring(context.getStartOffset(), context.getTailOffset());
} else {
textInserted = item.getLookupString();
}
textInserted = StringUtil.replace(textInserted, new String[]{" ", "\t", "\n"}, new String[]{"", "", ""});
int spared = textInserted.length() - indicator.getLookup().itemPattern(item).length();
String withoutSpaces = StringUtil.replace(textInserted, new String[]{" ", "\t", "\n"}, new String[]{"", "", ""});
int spared = withoutSpaces.length() - indicator.getLookup().itemPattern(item).length();
if (completionChar != Lookup.NORMAL_SELECT_CHAR &&
completionChar != Lookup.REPLACE_SELECT_CHAR &&
completionChar != Lookup.AUTO_INSERT_SELECT_CHAR &&
completionChar != Lookup.COMPLETE_STATEMENT_SELECT_CHAR &&
withoutSpaces.contains(String.valueOf(completionChar))) {
spared--;
}
if (spared > 0) {
mySpared += spared;
}