From 2152c276dcc5313e5328ceba2e298d36463c7154 Mon Sep 17 00:00:00 2001 From: Mikhail Pyltsin Date: Wed, 17 Apr 2024 17:53:21 +0200 Subject: [PATCH] [python] Pattern variable can be used mass cleanup GitOrigin-RevId: 04229dfd0912fbc846d4b1d5e3726ef6c9c005c6 --- .../jetbrains/python/codeInsight/imports/AddImportHelper.java | 2 +- .../inspections/quickfix/PyMoveAttributeToInitQuickFix.java | 2 +- .../com/jetbrains/python/psi/impl/PyCallExpressionHelper.java | 2 +- .../jetbrains/python/psi/impl/PyReferenceExpressionImpl.java | 2 +- .../python/refactoring/extractmethod/PyExtractMethodUtil.java | 2 +- .../run/sphinx/SphinxConfigurationProducer.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java index 1221a7d2dfa4..8e84309bb98e 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java @@ -342,7 +342,7 @@ public final class AddImportHelper { if (fromImportStatement.getRelativeLevel() > 0) { return new ImportPriorityChoice(ImportPriority.PROJECT, "explicit relative import"); } - resolveAnchor = ((PyFromImportStatement)importStatement).getImportSource(); + resolveAnchor = fromImportStatement.getImportSource(); resolved = fromImportStatement.resolveImportSource(); } else { diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyMoveAttributeToInitQuickFix.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyMoveAttributeToInitQuickFix.java index 1f63b7d14e2b..7da02e6361ab 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyMoveAttributeToInitQuickFix.java +++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/quickfix/PyMoveAttributeToInitQuickFix.java @@ -32,7 +32,7 @@ public class PyMoveAttributeToInitQuickFix extends PsiUpdateModCommandQuickFix { final PyAssignmentStatement assignment = PsiTreeUtil.getParentOfType(element, PyAssignmentStatement.class); if (containingClass == null || assignment == null) return; - AddFieldQuickFix.addFieldToInit(project, containingClass, ((PyTargetExpression)element).getName(), x -> assignment); + AddFieldQuickFix.addFieldToInit(project, containingClass, targetExpression.getName(), x -> assignment); removeDefinition(assignment); } diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java index 6fd55cc7f508..b722c18d4bcf 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyCallExpressionHelper.java @@ -685,7 +685,7 @@ public final class PyCallExpressionHelper { } } PsiElement possible_class = firstArgRef.getReference().resolve(); - if (possible_class instanceof PyClass first_class && ((PyClass)possible_class).isNewStyleClass(context)) { + if (possible_class instanceof PyClass first_class && first_class.isNewStyleClass(context)) { return new Maybe<>(getSuperCallTypeForArguments(context, first_class, args[1])); } } diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java index 05ad6b73bb0d..dc61ef1c3193 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java +++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java @@ -125,7 +125,7 @@ public class PyReferenceExpressionImpl extends PyElementImpl implements PyRefere for (ResolveResult resolveResult : node.myReferenceExpression.getReference(resolveContext).multiResolve(false)) { final PsiElement element = resolveResult.getElement(); - if (element instanceof PyTargetExpression target && follow.test((PyTargetExpression)element)) { + if (element instanceof PyTargetExpression target && follow.test(target)) { final List assignedFromElements = context.maySwitchToAST(target) ? Collections.singletonList(target.findAssignedValue()) diff --git a/python/python-psi-impl/src/com/jetbrains/python/refactoring/extractmethod/PyExtractMethodUtil.java b/python/python-psi-impl/src/com/jetbrains/python/refactoring/extractmethod/PyExtractMethodUtil.java index 96ef92af831c..adc0049dc0f6 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/refactoring/extractmethod/PyExtractMethodUtil.java +++ b/python/python-psi-impl/src/com/jetbrains/python/refactoring/extractmethod/PyExtractMethodUtil.java @@ -213,7 +213,7 @@ public final class PyExtractMethodUtil { final List scope = new ArrayList<>(); if (owner instanceof PyFunction pyFunction) { scope.add(pyFunction.getStatementList()); - final PyClass containingClass = ((PyFunction)owner).getContainingClass(); + final PyClass containingClass = pyFunction.getContainingClass(); if (containingClass != null) { for (PyFunction function : containingClass.getMethods()) { if (!function.equals(owner) && !function.equals(generatedMethod)) { diff --git a/python/python-rest/src/com/intellij/python/reStructuredText/run/sphinx/SphinxConfigurationProducer.java b/python/python-rest/src/com/intellij/python/reStructuredText/run/sphinx/SphinxConfigurationProducer.java index 44f5d0c9d699..0bb93a115286 100644 --- a/python/python-rest/src/com/intellij/python/reStructuredText/run/sphinx/SphinxConfigurationProducer.java +++ b/python/python-rest/src/com/intellij/python/reStructuredText/run/sphinx/SphinxConfigurationProducer.java @@ -12,9 +12,9 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; +import com.intellij.python.reStructuredText.RestFile; import com.intellij.python.reStructuredText.run.RestRunConfiguration; import com.intellij.python.reStructuredText.run.RestRunConfigurationType; -import com.intellij.python.reStructuredText.RestFile; import org.jetbrains.annotations.NotNull; public final class SphinxConfigurationProducer extends LazyRunConfigurationProducer { @@ -46,7 +46,7 @@ public final class SphinxConfigurationProducer extends LazyRunConfigurationProdu final VirtualFile vFile = directory.getVirtualFile(); configuration.setInputFile(vFile.getPath()); - configuration.setName(((PsiDirectory)element).getName()); + configuration.setName(directory.getName()); if (configuration.getTask().isEmpty()) { configuration.setTask("html"); }