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-45459 Make f-string like completion available after "{" on explicit invocation

Browse Source 
GitOrigin-RevId: fe609b6a572f2ac971b2cf34eb92afe529708628
This commit is contained in:
Mikhail Golubev
2020-11-15 16:10:47 +00:00
committed by intellij-monorepo-bot
parent 04431f29bd
commit 9590c3643e
3 changed files with 20 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/PyFStringLikeCompletionContributor.java
+6 -1
View File
@@ -65,7 +65,12 @@ public class PyFStringLikeCompletionContributor extends CompletionContributor {
return;
}
String completionPrefix = stringElemText.substring(braceOffset + 1, relOffset);
if (!PyNames.isIdentifier(completionPrefix)) {
boolean autoPopupAfterOpeningBrace = completionPrefix.isEmpty() && parameters.isAutoPopup();
if (autoPopupAfterOpeningBrace) {
return;
}
boolean impossibleReferencePrefix = !completionPrefix.isEmpty() && !PyNames.isIdentifier(completionPrefix);
if (impossibleReferencePrefix) {
return;
}
PyExpression fString = PyUtil.createExpressionFromFragment("f" + stringElemText, stringLiteral.getParent());
python/testData/completion/fStringLikeCompletionAvailableRightAfterOpeningBrace.py
+2
View File
@@ -0,0 +1,2 @@
my_expr = 42
s = 'foo{<caret>'
python/testSrc/com/jetbrains/python/Py3CompletionTest.java
+12
View File
@@ -7,6 +7,7 @@ import com.intellij.openapi.module.Module;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.PsiTestUtil;
import com.intellij.testFramework.TestDataPath;
import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.fixtures.PyTestCase;
import com.jetbrains.python.inspections.PyMethodParametersInspection;
import com.jetbrains.python.psi.LanguageLevel;
@@ -477,6 +478,17 @@ public class Py3CompletionTest extends PyTestCase {
runWithLanguageLevel(LanguageLevel.getLatest(), this::doNegativeTest);
}
// PY-45459
public void testFStringLikeCompletionAvailableRightAfterOpeningBrace() {
runWithLanguageLevel(LanguageLevel.getLatest(), () -> {
myFixture.configureByFile(getTestName(true) + ".py");
LookupElement[] variants = myFixture.completeBasic();
assertNotNull(variants);
assertTrue(variants.length > 0);
assertTrue(ContainerUtil.exists(variants, v -> v.getLookupString().equals("my_expr")));
});
}
@Override
protected String getTestDataPath() {
return super.getTestDataPath() + "/completion";