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

Complete continue in finally block in Python 3.8+ (PY-36003)

Browse Source 
GitOrigin-RevId: 7c378fb7dcee5e78beed1421aaaaed985c7cc765
This commit is contained in:
Semyon Proshev
2019-08-15 22:02:02 +03:00
committed by intellij-monorepo-bot
parent d50b3ad7ea
commit bf2f4468b2
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/completion/PyKeywordCompletionContributor.java
+4 -4
View File
@@ -9,7 +9,6 @@ import com.intellij.openapi.editor.Document;
import com.intellij.patterns.ElementPattern;
import com.intellij.patterns.PatternCondition;
import com.intellij.patterns.PsiElementPattern;
import com.intellij.patterns.StandardPatterns;
import com.intellij.psi.*;
import com.intellij.psi.filters.ElementFilter;
import com.intellij.psi.filters.position.FilterPattern;
@@ -31,6 +30,7 @@ import org.jetbrains.annotations.Nullable;
import static com.intellij.patterns.PlatformPatterns.psiElement;
import static com.intellij.patterns.PlatformPatterns.psiFile;
import static com.intellij.patterns.StandardPatterns.not;
import static com.intellij.patterns.StandardPatterns.or;
/**
@@ -323,11 +323,11 @@ public class PyKeywordCompletionContributor extends CompletionContributor {
private static final PsiElementPattern.Capture<PsiElement> AFTER_TRY = afterStatement(psiElement(PyTryExceptStatement.class));
private static final PsiElementPattern.Capture<PsiElement> AFTER_LOOP_NO_ELSE =
afterStatement(psiElement(PyLoopStatement.class).withLastChild(StandardPatterns.not(psiElement(PyElsePart.class))));
afterStatement(psiElement(PyLoopStatement.class).withLastChild(not(psiElement(PyElsePart.class))));
private static final PsiElementPattern.Capture<PsiElement> AFTER_COND_STMT_NO_ELSE =
afterStatement(psiElement().withChild(psiElement(PyConditionalStatementPart.class))
.withLastChild(StandardPatterns.not(psiElement(PyElsePart.class))));
.withLastChild(not(psiElement(PyElsePart.class))));
private static <T extends PsiElement> PsiElementPattern.Capture<PsiElement> afterStatement(final PsiElementPattern.Capture<T> statementPattern) {
return psiElement().atStartOf(psiElement(PyExpressionStatement.class)
@@ -455,7 +455,7 @@ public class PyKeywordCompletionContributor extends CompletionContributor {
.andNot(AFTER_QUALIFIER)
.andNot(IN_PARAM_LIST)
.andNot(IN_ARG_LIST)
.andNot(IN_FINALLY_NO_LOOP)
.andOr(not(IN_FINALLY_NO_LOOP), new FilterPattern(new LanguageLevelAtLeastFilter(LanguageLevel.PYTHON38)))
.and(IN_LOOP)
,
new PyKeywordCompletionProvider(TailType.NONE, PyNames.CONTINUE)
python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+35
View File
@@ -1540,6 +1540,41 @@ public class PythonCompletionTest extends PyTestCase {
doTest();
}
// PY-36003
public void testContinueInFinallyBefore38() {
final String text = "for x in []:\n" +
" try:\n" +
" a = 1\n" +
" finally:\n" +
" cont";
runWithLanguageLevel(
LanguageLevel.PYTHON37,
() -> {
myFixture.configureByText(PythonFileType.INSTANCE, text + "<caret>");
myFixture.completeBasic();
myFixture.checkResult(text);
}
);
}
// PY-36003
public void testContinueInFinallyAfter38() {
final String text = "for x in []:\n" +
" try:\n" +
" a = 1\n" +
" finally:\n" +
" cont";
runWithLanguageLevel(
LanguageLevel.PYTHON38,
() -> {
myFixture.configureByText(PythonFileType.INSTANCE, text + "<caret>");
myFixture.completeBasic();
myFixture.checkResult(text + "inue");
}
);
}
private void assertNoVariantsInExtendedCompletion() {
myFixture.copyDirectoryToProject(getTestName(true), "");