fixed identifiers completion for plain docstring

python/src/com/jetbrains/python/codeInsight/completion/PyDocstringCompletionContributor.java

@@ -1,49 +1,54 @@
 package com.jetbrains.python.codeInsight.completion;
 
-import com.intellij.codeInsight.completion.*;
+import com.intellij.codeInsight.completion.CompletionContributor;
+import com.intellij.codeInsight.completion.CompletionParameters;
+import com.intellij.codeInsight.completion.CompletionResultSet;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtilCore;
+import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.ProcessingContext;
-import com.jetbrains.python.PyTokenTypes;
+import com.jetbrains.python.documentation.PyDocumentationSettings;
 import com.jetbrains.python.psi.PyDocStringOwner;
-import com.jetbrains.python.psi.PyStringLiteralExpression;
 import com.jetbrains.python.refactoring.PyRefactoringUtil;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 
-import static com.intellij.patterns.PlatformPatterns.psiElement;
-
 /**
  * User : ktisha
  */
 public class PyDocstringCompletionContributor extends CompletionContributor {
-  public PyDocstringCompletionContributor() {
-    extend(CompletionType.BASIC,
-           psiElement().inside(PyStringLiteralExpression.class).withElementType(PyTokenTypes.DOCSTRING),
-           new IdentifierCompletionProvider());
-  }
 
-  private static class IdentifierCompletionProvider extends CompletionProvider<CompletionParameters> {
-
-    private IdentifierCompletionProvider() {
-    }
-
-    @Override
-    protected void addCompletions(@NotNull CompletionParameters parameters,
-                                  ProcessingContext context,
-                                  @NotNull CompletionResultSet result) {
-      final PyDocStringOwner docStringOwner = PsiTreeUtil.getParentOfType(parameters.getOriginalPosition(), PyDocStringOwner.class);
-      if (docStringOwner != null) {
+  public void fillCompletionVariants(final CompletionParameters parameters, CompletionResultSet result) {
+    final PyDocStringOwner docStringOwner = PsiTreeUtil.getParentOfType(parameters.getOriginalPosition(), PyDocStringOwner.class);
+    if (docStringOwner != null) {
+      final Module module = ModuleUtilCore.findModuleForPsiElement(docStringOwner);
+      if (module != null) {
+        final PsiFile file = docStringOwner.getContainingFile();
+        result = result.withPrefixMatcher(getPrefix(parameters.getOffset(), file));
+        final PyDocumentationSettings settings = PyDocumentationSettings.getInstance(module);
+        if (!settings.isPlain(file)) return;
         final Collection<String> identifiers = PyRefactoringUtil.collectUsedNames(docStringOwner);
         for (String identifier : identifiers)
           result.addElement(LookupElementBuilder.create(identifier));
+
+        final Collection<String> fileIdentifiers = PyRefactoringUtil.collectUsedNames(parameters.getOriginalFile());
+        for (String identifier : fileIdentifiers)
+          result.addElement(LookupElementBuilder.create(identifier));
       }
-
-
-      final Collection<String> fileIdentifiers = PyRefactoringUtil.collectUsedNames(parameters.getOriginalFile());
-      for (String identifier : fileIdentifiers)
-        result.addElement(LookupElementBuilder.create(identifier));
     }
   }
+
+  private static String getPrefix(int offset, PsiFile file) {
+    if (offset > 0) {
+      offset--;
+    }
+    final String text = file.getText();
+    StringBuilder prefixBuilder = new StringBuilder();
+    while(offset > 0 && Character.isLetterOrDigit(text.charAt(offset))) {
+      prefixBuilder.insert(0, text.charAt(offset));
+      offset--;
+    }
+    return prefixBuilder.toString();
+  }
 }

python/testData/completion/identifiersInPlainDocstring.after.py

@@ -0,0 +1,2 @@
+def foo(bar):
+    """ Variable bar """

python/testData/completion/identifiersInPlainDocstring.py

@@ -0,0 +1,2 @@
+def foo(bar):
+    """ Variable b<caret> """

python/testData/inspections/StatementEffectPrint.py

@@ -1,2 +1,3 @@
 <warning descr="Statement seems to have no effect and can be replaced with function call to have effect">print</warning><error descr="End of statement expected"> </error>\
    <warning descr="Statement seems to have no effect">"foo"</warning>
+a = 1

python/testData/inspections/StatementEffectPrint_after.py

@@ -1 +1,2 @@
 print("foo")
+a = 1

python/testSrc/com/jetbrains/python/PythonCompletionTest.java

@@ -437,6 +437,14 @@ public class PythonCompletionTest extends PyTestCase {
     }
   }
 
+  public void testIdentifiersInPlainDocstring() {
+    final PyDocumentationSettings settings = PyDocumentationSettings.getInstance(myFixture.getModule());
+    settings.setFormat(DocStringFormat.PLAIN);
+    myFixture.configureByFile("completion/identifiersInPlainDocstring.py");
+    myFixture.completeBasic();
+    myFixture.checkResultByFile("completion/identifiersInPlainDocstring.after.py");
+  }
+
   public void testNoneInArgList() {  // PY-3464
     doTest3K();
   }