greenify completion a bit

This commit is contained in:
peter
2019-03-25 19:12:18 +01:00
parent b81bf67d9f
commit 1f5f31223f
3 changed files with 8 additions and 9 deletions
@@ -581,13 +581,11 @@ public class CodeCompletionHandlerBase {
offsetMap.addOffset(CompletionInitializationContext.SELECTION_END_OFFSET, caretOffset);
offsetMap.addOffset(CompletionInitializationContext.IDENTIFIER_END_OFFSET, idEndOffset);
WatchingInsertionContext context = new WatchingInsertionContext(offsetMap, psiFile, completionChar,
lookup != null ? lookup.getItems() : Collections.emptyList(),
editor);
return context;
List<LookupElement> items = lookup != null ? lookup.getItems() : Collections.emptyList();
return new WatchingInsertionContext(offsetMap, psiFile, completionChar, items, editor);
}
private WatchingInsertionContext callHandleInsert(CompletionProgressIndicator indicator, LookupElement item, char completionChar) {
private static WatchingInsertionContext callHandleInsert(CompletionProgressIndicator indicator, LookupElement item, char completionChar) {
final Editor editor = indicator.getEditor();
final int caretOffset = indicator.getCaret().getOffset();
@@ -46,7 +46,7 @@ interface CompletionProcessEx extends CompletionProcess {
CompletionParameters getParameters();
void setParameters(CompletionParameters parameters);
void setParameters(@NotNull CompletionParameters parameters);
void scheduleRestart();
@@ -122,11 +122,11 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
private final List<CompletionResult> myDelayedMiddleMatches = ContainerUtil.newArrayList();
private final int myStartCaret;
private final CompletionThreadingBase myThreading;
private final Object myLock = new String("CompletionProgressIndicator");
private final Object myLock = ObjectUtils.sentinel("CompletionProgressIndicator");
CompletionProgressIndicator(Editor editor, @NotNull Caret caret, int invocationCount,
CodeCompletionHandlerBase handler, @NotNull OffsetMap offsetMap, @NotNull OffsetsInFile hostOffsets,
boolean hasModifiers, LookupImpl lookup) {
boolean hasModifiers, @NotNull LookupImpl lookup) {
myEditor = editor;
myCaret = caret;
myHandler = handler;
@@ -336,11 +336,12 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
}
@Override
public void setParameters(CompletionParameters parameters) {
public void setParameters(@NotNull CompletionParameters parameters) {
myParameters = parameters;
}
@Override
@NotNull
public LookupImpl getLookup() {
return myLookup;
}