MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-73246 Don't insert square brackets after classes not having free type parameters

Browse Source 
Even if they transitively extend typing.Generic, such as the builtin str.

GitOrigin-RevId: 9389ef5846e21ba5e0fed8b835beb2d458e42f13
This commit is contained in:
Mikhail Golubev
2024-06-14 18:26:10 +05:00
committed by intellij-monorepo-bot
parent ebba681c85
commit eb63148798
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/python-psi-impl/src/com/jetbrains/python/codeInsight/completion/PyParameterizedTypeInsertHandler.java
View File

@@ -19,7 +19,7 @@ public class PyParameterizedTypeInsertHandler extends ParenthesesInsertHandler<L
public static boolean isCompletingParameterizedType(@NotNull PsiElement definition,
@NotNull PsiElement completionPosition,
@NotNull TypeEvalContext context) {
return PyTypingTypeProvider.isInsideTypeHint(completionPosition, context) && isParameterizedType(definition, context);
return PyTypingTypeProvider.isInsideTypeHint(completionPosition, context) && isParameterizableType(definition, context);
}
public static final PyParameterizedTypeInsertHandler INSTANCE = new PyParameterizedTypeInsertHandler();
@@ -33,8 +33,8 @@ public class PyParameterizedTypeInsertHandler extends ParenthesesInsertHandler<L
return true;
}
private static boolean isParameterizedType(@NotNull PsiElement element, @NotNull TypeEvalContext typeEvalContext) {
private static boolean isParameterizableType(@NotNull PsiElement element, @NotNull TypeEvalContext typeEvalContext) {
return element instanceof PyQualifiedNameOwner qnOwner && PyTypingTypeProvider.GENERIC_CLASSES.contains(qnOwner.getQualifiedName()) ||
element instanceof PyClass pyClass && PyTypingTypeProvider.isGeneric(pyClass, typeEvalContext);
element instanceof PyClass pyClass && new PyTypingTypeProvider().getGenericType(pyClass, typeEvalContext) != null;
}
}

8
python/testData/completion/squareBracketsNotInsertedAfterAlreadyParameterizedGenericInsideTypeHints/a.after.py Normal file
View File

@@ -0,0 +1,8 @@
from typing import Iterable
class StrIterable(Iterable[str]):
pass
x: StrIterable

8
python/testData/completion/squareBracketsNotInsertedAfterAlreadyParameterizedGenericInsideTypeHints/a.py Normal file
View File

@@ -0,0 +1,8 @@
from typing import Iterable
class StrIterable(Iterable[str]):
pass
x: StrIter<caret>

5
python/testSrc/com/jetbrains/python/Py3CompletionTest.java
View File

@@ -743,6 +743,11 @@ public class Py3CompletionTest extends PyTestCase {
doMultiFileTest();
}
// PY-73246
public void testSquareBracketsNotInsertedAfterAlreadyParameterizedGenericInsideTypeHints() {
doMultiFileTest();
}
private void doTestVariants(String @NotNull ... expected) {
final String testName = getTestName(true);
myFixture.configureByFile(testName + ".py");