MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 21:11:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Migrate PyBaseConvertCollectionLiteralIntention to ModCommand

Browse Source 
PY-65297

GitOrigin-RevId: 992f7104f83136b1bb2c47d29a83dc482bcf15b2
This commit is contained in:
Georgii Ustinov
2024-01-12 15:38:00 +02:00
committed by intellij-monorepo-bot
parent 0377ff5800
commit 1ee87451b8
1 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyBaseConvertCollectionLiteralIntention.java
View File

@@ -15,13 +15,13 @@
*/
package com.jetbrains.python.codeInsight.intentions;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.modcommand.ActionContext;
import com.intellij.modcommand.ModPsiUpdater;
import com.intellij.modcommand.Presentation;
import com.intellij.modcommand.PsiUpdateModCommandAction;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import com.jetbrains.python.PyPsiBundle;
import com.jetbrains.python.PyTokenTypes;
import com.jetbrains.python.codeInsight.typing.PyTypingTypeProvider;
@@ -37,7 +37,7 @@ import static com.jetbrains.python.psi.PyUtil.as;
/**
* @author Mikhail Golubev
*/
public abstract class PyBaseConvertCollectionLiteralIntention extends PyBaseIntentionAction {
public abstract class PyBaseConvertCollectionLiteralIntention extends PsiUpdateModCommandAction<PsiElement> {
private final Class<? extends PySequenceExpression> myTargetCollectionClass;
private final String myTargetCollectionName;
private final String myRightBrace;
@@ -46,6 +46,7 @@ public abstract class PyBaseConvertCollectionLiteralIntention extends PyBaseInte
public PyBaseConvertCollectionLiteralIntention(@NotNull Class<? extends PySequenceExpression> targetCollectionClass,
@NotNull String targetCollectionName,
@NotNull String leftBrace, @NotNull String rightBrace) {
super(PsiElement.class);
myTargetCollectionClass = targetCollectionClass;
myTargetCollectionName = targetCollectionName;
myLeftBrace = leftBrace;
@@ -60,28 +61,27 @@ public abstract class PyBaseConvertCollectionLiteralIntention extends PyBaseInte
}
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
if (!(file instanceof PyFile)) {
return false;
protected @Nullable Presentation getPresentation(@NotNull ActionContext context, @NotNull PsiElement element) {
if (!(context.file() instanceof PyFile)) {
return null;
}
final PySequenceExpression literal = findCollectionLiteralUnderCaret(editor, file);
final PySequenceExpression literal = findCollectionLiteralUnderElement(element);
if (myTargetCollectionClass.isInstance(literal)) {
return false;
return null;
}
if (literal instanceof PyTupleExpression) {
if (PyTypingTypeProvider.isInsideTypeHint(literal, TypeEvalContext.codeAnalysis(literal.getProject(), file))) return false;
setText(PyPsiBundle.message("INTN.convert.collection.literal", "tuple", myTargetCollectionName));
if (literal != null && isAvailableForCollection(literal)) {
if (literal instanceof PyTupleExpression) {
if (PyTypingTypeProvider.isInsideTypeHint(literal, TypeEvalContext.codeAnalysis(context.project(), context.file()))) return null;
return Presentation.of(PyPsiBundle.message("INTN.convert.collection.literal", "tuple", myTargetCollectionName));
}
else if (literal instanceof PyListLiteralExpression) {
return Presentation.of(PyPsiBundle.message("INTN.convert.collection.literal", "list", myTargetCollectionName));
}
else if (literal instanceof PySetLiteralExpression) {
return Presentation.of(PyPsiBundle.message("INTN.convert.collection.literal", "set", myTargetCollectionName));
}
}
else if (literal instanceof PyListLiteralExpression) {
setText(PyPsiBundle.message("INTN.convert.collection.literal", "list", myTargetCollectionName));
}
else if (literal instanceof PySetLiteralExpression) {
setText(PyPsiBundle.message("INTN.convert.collection.literal", "set", myTargetCollectionName));
}
else {
return false;
}
return isAvailableForCollection(literal);
return null;
}
protected boolean isAvailableForCollection(@NotNull PySequenceExpression literal) {
@@ -89,8 +89,8 @@ public abstract class PyBaseConvertCollectionLiteralIntention extends PyBaseInte
}
@Override
public void doInvoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
final PySequenceExpression literal = findCollectionLiteralUnderCaret(editor, file);
protected void invoke(@NotNull ActionContext context, @NotNull PsiElement element, @NotNull ModPsiUpdater updater) {
final PySequenceExpression literal = findCollectionLiteralUnderElement(element);
assert literal != null;
final PsiElement replacedElement = wrapCollection(literal);
@@ -98,8 +98,8 @@ public abstract class PyBaseConvertCollectionLiteralIntention extends PyBaseInte
final TextRange contentRange = getRangeOfContentWithoutBraces(copy);
final String contentToWrap = contentRange.substring(copy.getText());
final PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project);
final PyExpression newLiteral = elementGenerator.createExpressionFromText(LanguageLevel.forElement(file),
final PyElementGenerator elementGenerator = PyElementGenerator.getInstance(context.project());
final PyExpression newLiteral = elementGenerator.createExpressionFromText(LanguageLevel.forElement(context.file()),
myLeftBrace + contentToWrap + myRightBrace);
replacedElement.replace(newLiteral);
}
@@ -169,9 +169,7 @@ public abstract class PyBaseConvertCollectionLiteralIntention extends PyBaseInte
}
@Nullable
private static PySequenceExpression findCollectionLiteralUnderCaret(@NotNull Editor editor, @NotNull PsiFile psiFile) {
final int caretOffset = editor.getCaretModel().getOffset();
final PsiElement curElem = psiFile.findElementAt(caretOffset);
private static PySequenceExpression findCollectionLiteralUnderElement(PsiElement curElem) {
final PySequenceExpression seqExpr = PsiTreeUtil.getParentOfType(curElem, PySequenceExpression.class);
if (seqExpr != null) {
return seqExpr;