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

Migrate PyConvertTripleQuotedStringIntention and PyDemorganIntention to ModCommand

Browse Source 
PY-65297

GitOrigin-RevId: 900c8ac1568a0d97e7365cf63e7c554d57a76708
This commit is contained in:
Georgii Ustinov
2024-01-11 16:36:31 +02:00
committed by intellij-monorepo-bot
parent 1ca8156c65
commit 16c24031a3
2 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyConvertTripleQuotedStringIntention.java
View File

@@ -1,19 +1,20 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
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.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.PyPsiBundle;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.PyUtil.StringNodeInfo;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
@@ -30,7 +31,10 @@ import java.util.List;
* "but \"this\" includes far too much" "\n"
* "whitespace at the start")
*/
public final class PyConvertTripleQuotedStringIntention extends PyBaseIntentionAction {
public final class PyConvertTripleQuotedStringIntention extends PsiUpdateModCommandAction<PsiElement> {
PyConvertTripleQuotedStringIntention() {
super(PsiElement.class);
}
@Override
@NotNull
@@ -38,39 +42,31 @@ public final class PyConvertTripleQuotedStringIntention extends PyBaseIntentionA
return PyPsiBundle.message("INTN.triple.quoted.string");
}
@NotNull
@Override
public String getText() {
return PyPsiBundle.message("INTN.triple.quoted.string");
}
@Override
public boolean isAvailable(@NotNull Project project, @NotNull Editor editor, @NotNull 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 int caretOffset = editor.getCaretModel().getOffset();
final PyStringLiteralExpression pyString = PsiTreeUtil.getParentOfType(file.findElementAt(caretOffset), PyStringLiteralExpression.class);
final PyStringLiteralExpression pyString = PsiTreeUtil.getParentOfType(element, PyStringLiteralExpression.class);
if (pyString != null) {
final PyDocStringOwner docStringOwner = PsiTreeUtil.getParentOfType(pyString, PyDocStringOwner.class);
if (docStringOwner != null) {
if (docStringOwner.getDocStringExpression() == pyString) return false;
if (docStringOwner.getDocStringExpression() == pyString) return null;
}
for (StringNodeInfo info : extractStringNodesInfo(pyString)) {
if (info.isTripleQuoted() && info.isTerminated() && info.getNode().getTextRange().contains(caretOffset)) {
return true;
if (info.isTripleQuoted() && info.isTerminated() && info.getNode().getTextRange().contains(context.offset())) {
return super.getPresentation(context, element);
}
}
}
return false;
return null;
}
@Override
public void doInvoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) throws IncorrectOperationException {
final PyStringLiteralExpression pyString = PsiTreeUtil.getParentOfType(file.findElementAt(editor.getCaretModel().getOffset()),
PyStringLiteralExpression.class);
final PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project);
protected void invoke(@NotNull ActionContext context, @NotNull PsiElement element, @NotNull ModPsiUpdater updater) {
final PyStringLiteralExpression pyString = PsiTreeUtil.getParentOfType(element, PyStringLiteralExpression.class);
final PyElementGenerator elementGenerator = PyElementGenerator.getInstance(context.project());
if (pyString != null) {
final StringBuilder result = new StringBuilder();
final List<StringNodeInfo> nodeInfos = extractStringNodesInfo(pyString);

36
python/python-psi-impl/src/com/jetbrains/python/codeInsight/intentions/PyDemorganIntention.java
View File

@@ -15,12 +15,12 @@
*/
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.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.psi.*;
@@ -28,40 +28,36 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public final class PyDemorganIntention extends PyBaseIntentionAction {
@NotNull
@Override
public String getText() {
return PyPsiBundle.message("INTN.NAME.demorgan.law");
public final class PyDemorganIntention extends PsiUpdateModCommandAction<PsiElement> {
PyDemorganIntention() {
super(PsiElement.class);
}
@NotNull
@Override
public String getFamilyName() {
return getText();
return PyPsiBundle.message("INTN.NAME.demorgan.law");
}
@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 PyBinaryExpression expression = PsiTreeUtil.getParentOfType(file.findElementAt(editor.getCaretModel().getOffset()),
PyBinaryExpression.class);
final PyBinaryExpression expression = PsiTreeUtil.getParentOfType(element, PyBinaryExpression.class);
if (expression != null) {
final PyElementType op = expression.getOperator();
if (op == PyTokenTypes.AND_KEYWORD || op == PyTokenTypes.OR_KEYWORD) {
return true;
return super.getPresentation(context, element);
}
}
return false;
return null;
}
@Override
public void doInvoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
final PyBinaryExpression expression = PsiTreeUtil.getParentOfType(file.findElementAt(editor.getCaretModel().getOffset()),
PyBinaryExpression.class);
protected void invoke(@NotNull ActionContext context, @NotNull PsiElement element, @NotNull ModPsiUpdater updater) {
final PyBinaryExpression expression = PsiTreeUtil.getParentOfType(element, PyBinaryExpression.class);
assert expression != null;
final PyElementType op = expression.getOperator();
assert op != null;