From 31c71642fdb37bed4d3d375277d59cbf566e9327 Mon Sep 17 00:00:00 2001 From: Petr Date: Wed, 11 Jun 2025 20:28:58 +0200 Subject: [PATCH] PY-81471 Move PyLineWrapPositionStrategy to python.syntax.core GitOrigin-RevId: 998a62f09ee1e2fed512c5ae8c8cfed8808c947f --- python/python-psi-impl/resources/intellij.python.psi.impl.xml | 2 -- .../resources/intellij.python.syntax.core.xml | 1 + .../python/formatter/PyLineWrapPositionStrategy.java | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) rename python/{python-psi-impl => python-syntax-core}/src/com/jetbrains/python/formatter/PyLineWrapPositionStrategy.java (95%) diff --git a/python/python-psi-impl/resources/intellij.python.psi.impl.xml b/python/python-psi-impl/resources/intellij.python.psi.impl.xml index 575200d5b680..6461db8e04d3 100644 --- a/python/python-psi-impl/resources/intellij.python.psi.impl.xml +++ b/python/python-psi-impl/resources/intellij.python.psi.impl.xml @@ -73,8 +73,6 @@ implementationClass="com.jetbrains.python.psi.impl.references.PyKeywordPatternManipulator"/> - - diff --git a/python/python-syntax-core/resources/intellij.python.syntax.core.xml b/python/python-syntax-core/resources/intellij.python.syntax.core.xml index 4bb3e1b1fc66..5ff16eb888ae 100644 --- a/python/python-syntax-core/resources/intellij.python.syntax.core.xml +++ b/python/python-syntax-core/resources/intellij.python.syntax.core.xml @@ -20,5 +20,6 @@ + \ No newline at end of file diff --git a/python/python-psi-impl/src/com/jetbrains/python/formatter/PyLineWrapPositionStrategy.java b/python/python-syntax-core/src/com/jetbrains/python/formatter/PyLineWrapPositionStrategy.java similarity index 95% rename from python/python-psi-impl/src/com/jetbrains/python/formatter/PyLineWrapPositionStrategy.java rename to python/python-syntax-core/src/com/jetbrains/python/formatter/PyLineWrapPositionStrategy.java index ff6b7b2403b9..b72d5295e1d9 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/formatter/PyLineWrapPositionStrategy.java +++ b/python/python-syntax-core/src/com/jetbrains/python/formatter/PyLineWrapPositionStrategy.java @@ -10,7 +10,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.text.CharArrayUtil; -import com.jetbrains.python.psi.PyFStringFragment; +import com.jetbrains.python.ast.PyAstFStringFragment; import com.jetbrains.python.psi.StringLiteralExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -76,7 +76,7 @@ public final class PyLineWrapPositionStrategy extends GenericLineWrapPositionStr final PsiElement element = psiFile.findElementAt(wrapPosition); final StringLiteralExpression string = PsiTreeUtil.getParentOfType(element, StringLiteralExpression.class); if (string != null) { - final PyFStringFragment fragment = PsiTreeUtil.getTopmostParentOfType(element, PyFStringFragment.class); + final PyAstFStringFragment fragment = PsiTreeUtil.getTopmostParentOfType(element, PyAstFStringFragment.class); if (fragment != null) { return Math.max(fragment.getTextOffset(), startOffset); }