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

Fix PY-7018

Browse Source 
GitOrigin-RevId: 56344326c46ce29b03fd3733cff0c989b357e594
This commit is contained in:
andrey.matveev
2019-09-30 10:32:59 +00:00
committed by intellij-monorepo-bot
parent c48d303998
commit e62d70bc56
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python-psi-impl/src/com/jetbrains/python/codeInsight/completion/PyKeywordCompletionContributor.java
+7 -1
View File
@@ -247,6 +247,9 @@ public class PyKeywordCompletionContributor extends CompletionContributor {
public static final PsiElementPattern.Capture<PsiElement> AFTER_QUALIFIER =
psiElement().afterLeaf(psiElement().withText(".").inside(PyReferenceExpression.class));
public static final PsiElementPattern.Capture<PsiElement> TARGET_AFTER_QUALIFIER =
psiElement().afterLeaf(psiElement().withText(".").inside(PyTargetExpression.class));
public static final FilterPattern FIRST_ON_LINE = new FilterPattern(new StartOfLineFilter());
private static final PsiElementPattern.Capture<PsiElement> IN_IMPORT_AFTER_REF =
@@ -592,6 +595,7 @@ public class PyKeywordCompletionContributor extends CompletionContributor {
.andNot(IN_PARAM_LIST)
.andNot(IN_FUNCTION_HEADER)
.andNot(AFTER_QUALIFIER).andNot(IN_STRING_LITERAL)
.andNot(AFTER_QUALIFIER).andNot(IN_STRING_LITERAL).andNot(TARGET_AFTER_QUALIFIER)
,
new PyKeywordCompletionProvider(PyNames.NOT, PyNames.LAMBDA)
);
@@ -607,6 +611,7 @@ public class PyKeywordCompletionContributor extends CompletionContributor {
.andNot(AFTER_QUALIFIER)
.andNot(IN_FUNCTION_HEADER)
.andNot(IN_STRING_LITERAL)
.andNot(TARGET_AFTER_QUALIFIER)
,
new PyKeywordCompletionProvider(TailType.NONE, PyNames.TRUE, PyNames.FALSE, PyNames.NONE));
extend(CompletionType.BASIC,
@@ -617,7 +622,8 @@ public class PyKeywordCompletionContributor extends CompletionContributor {
.andNot(IN_IMPORT_STMT)
.andNot(IN_PARAM_LIST)
.andNot(AFTER_QUALIFIER)
.andNot(IN_STRING_LITERAL),
.andNot(IN_STRING_LITERAL)
.andNot(TARGET_AFTER_QUALIFIER),
new PyKeywordCompletionProvider(PyNames.ASYNC));
extend(CompletionType.BASIC,
psiElement()
python/testData/keywordCompletion/noNotAndLambdaAfterTargetQualifier.py
+4
View File
@@ -0,0 +1,4 @@
class A:
def __init__(self):
self.dct1 = []
self.dct1.<caret> = None #here "lambda" and "not" must not be in completion list
python/testSrc/com/jetbrains/python/PythonKeywordCompletionTest.java
+5
View File
@@ -236,6 +236,11 @@ public class PythonKeywordCompletionTest extends PyTestCase {
myFixture.checkResult("from ... import ");
}
// PY-7018
public void testNoNotAndLambdaAfterTargetQualifier() {
assertDoesntContain(doTestByTestName(), "not", "lambda");
}
// PY-13111
public void testNoForAndYieldInCommentContext() {
assertDoesntContain(doTestByTestName(), "for", "yield");