From c9f5024a9b6740f60696eb22aad227a010acba32 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 20 May 2019 17:21:16 +0200
Subject: [PATCH] IDEA-205205 Import static class in java should complete with
 a period

GitOrigin-RevId: bea7cd80c3828de999a671b160444462e6c508a5
---
 .../completion/JavaClassNameInsertHandler.java            | 8 +++++++-
 .../nameCompletion/java/InStaticImport-result.java        | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
index 3dd27f56b623..82fd9aa384c6 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
@@ -7,6 +7,7 @@ import com.intellij.codeInsight.lookup.Lookup;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.PsiTypeLookupItem;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.EditorModificationUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
@@ -33,12 +34,17 @@ class JavaClassNameInsertHandler implements InsertHandler<JavaPsiClassReferenceE
   public void handleInsert(@NotNull final InsertionContext context, @NotNull final JavaPsiClassReferenceElement item) {
     int offset = context.getTailOffset() - 1;
     final PsiFile file = context.getFile();
-    if (PsiTreeUtil.findElementOfClassAtOffset(file, offset, PsiImportStatementBase.class, false) != null) {
+    PsiImportStatementBase importStatement = PsiTreeUtil.findElementOfClassAtOffset(file, offset, PsiImportStatementBase.class, false);
+    if (importStatement != null) {
       PsiJavaCodeReferenceElement ref = findJavaReference(file, offset);
       String qname = item.getQualifiedName();
       if (qname != null && (ref == null || !qname.equals(ref.getCanonicalText()))) {
         AllClassesGetter.INSERT_FQN.handleInsert(context, item);
       }
+      if (importStatement instanceof PsiImportStaticStatement) {
+        context.setAddCompletionChar(false);
+        EditorModificationUtil.insertStringAtCaret(context.getEditor(), ".");
+      }
       return;
     }
 
diff --git a/java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/InStaticImport-result.java b/java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/InStaticImport-result.java
index bb90de193bd8..e2e00e49a139 100644
--- a/java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/InStaticImport-result.java
+++ b/java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/InStaticImport-result.java
@@ -1,4 +1,4 @@
-import static java.io.FileInputStream<caret>
+import static java.io.FileInputStream.<caret>
 
 class Main {