From 1f5f31223fd4e15a940bde5616b0eb4fde9c003f Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 25 Mar 2019 18:29:30 +0100
Subject: [PATCH] greenify completion a bit

---
 .../codeInsight/completion/CodeCompletionHandlerBase.java | 8 +++-----
 .../codeInsight/completion/CompletionProcessEx.java       | 2 +-
 .../completion/CompletionProgressIndicator.java           | 7 ++++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
index 6b7e593fbc58..b222209f684d 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
@@ -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();
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProcessEx.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProcessEx.java
index 0c123e7c2d04..75708c2ff20e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProcessEx.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProcessEx.java
@@ -46,7 +46,7 @@ interface CompletionProcessEx extends CompletionProcess {
 
   CompletionParameters getParameters();
 
-  void setParameters(CompletionParameters parameters);
+  void setParameters(@NotNull CompletionParameters parameters);
 
   void scheduleRestart();
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
index 33aa735a55c7..580387d7778d 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
@@ -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;
   }