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

PY-15075 Suggest "import" after dots in relative import only after additional whitespace

Browse Source
This commit is contained in:
Mikhail Golubev
2015-02-18 14:28:13 +03:00
parent e58f25677d
commit 7bf1fc88f6
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/completion/PyKeywordCompletionContributor.java
+7 -2
View File
@@ -254,8 +254,13 @@ public class PyKeywordCompletionContributor extends CompletionContributor {
public static final PsiElementPattern.Capture<PsiElement> IN_FROM_IMPORT_AFTER_REF =
psiElement().afterLeaf(
or(psiElement().withElementType(PyTokenTypes.IDENTIFIER).inside(PyReferenceExpression.class),
psiElement().withElementType(PyTokenTypes.DOT))
).inside(PyFromImportStatement.class);
psiElement().with(new PatternCondition<PsiElement>("dotFollowedByWhitespace") {
@Override
public boolean accepts(@NotNull PsiElement element, ProcessingContext context) {
return element.getNode().getElementType() == PyTokenTypes.DOT && element.getNextSibling() instanceof PsiWhiteSpace;
}
}))
).inside(PyFromImportStatement.class);
public static final ElementPattern<PsiElement> IN_WITH_AFTER_REF =
psiElement().afterLeaf(psiElement().inside(psiElement(PyWithItem.class).with(new PatternCondition<PyWithItem>("withoutAsKeyword") {
python/testSrc/com/jetbrains/python/PythonKeywordCompletionTest.java
+9
View File
@@ -227,4 +227,13 @@ public class PythonKeywordCompletionTest extends PyTestCase {
"finally:\n" +
" pass\n<caret>"), "except");
}
// PY-15075
public void testImportAfterWhitespaceInRelativeImport() {
List<String> variants = doTestByText("from ...<caret>");
assertDoesntContain(variants, "import");
variants = doTestByText("from ... <caret>");
assertContainsElements(variants, "import");
}
}