MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-81471 Move PyJoinLinesHandler to python.syntax

Browse Source 
GitOrigin-RevId: b6dc592a7eb09ee52547c591b4e5494eca4683ed
This commit is contained in:
Petr
2025-06-11 20:13:00 +02:00
committed by intellij-monorepo-bot
parent e33aae05fc
commit a977877a92
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/pluginResources/intellij.python.community.impl.xml
View File

@@ -208,8 +208,6 @@
<callHierarchyProvider language="Python" implementationClass="com.jetbrains.python.hierarchy.call.PyCallHierarchyProvider"/>
<highlightUsagesHandlerFactory implementation="com.jetbrains.python.codeInsight.highlighting.PyHighlightExitPointsHandlerFactory"/>
<joinLinesHandler implementation="com.jetbrains.python.editor.PyJoinLinesHandler"/>
<testFinder implementation="com.jetbrains.python.codeInsight.testIntegration.PyTestFinder"/>
<testCreator language="Python" implementationClass="com.jetbrains.python.codeInsight.testIntegration.PyTestCreator"/>

1
python/python-syntax/resources/intellij.python.syntax.xml
View File

@@ -23,6 +23,7 @@
<colorSettingsPage implementation="com.jetbrains.python.highlighting.PythonColorsPage"/>
<statementUpDownMover implementation="com.jetbrains.python.codeInsight.editorActions.moveUpDown.PyStatementMover" id="pyStatementMover"
order="before line"/>
<joinLinesHandler implementation="com.jetbrains.python.editor.PyJoinLinesHandler"/>
</extensions>
<extensions defaultExtensionNs="Pythonid">
<pyAnnotator implementation="com.jetbrains.python.validation.PyHighlightingAnnotator"/>

40
python/src/com/jetbrains/python/editor/PyJoinLinesHandler.java → python/python-syntax/src/com/jetbrains/python/editor/PyJoinLinesHandler.java
View File

@@ -12,7 +12,7 @@ import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.util.PsiTreeUtil;
import com.jetbrains.python.PyTokenTypes;
import com.jetbrains.python.PythonLanguage;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.ast.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -47,7 +47,7 @@ public final class PyJoinLinesHandler implements JoinRawLinesHandlerDelegate {
@Override
public int tryJoinRawLines(@NotNull Document document, @NotNull PsiFile file, int start, int end) {
if (!(file instanceof PyFile)) return CANNOT_JOIN;
if (!(file instanceof PyAstFile)) return CANNOT_JOIN;
// step back the probable "\" and space before it.
final CharSequence text = document.getCharsSequence();
@@ -64,8 +64,8 @@ public final class PyJoinLinesHandler implements JoinRawLinesHandlerDelegate {
final PsiElement leftElement = file.findElementAt(start);
final PsiElement rightElement = file.findElementAt(end);
if (leftElement != null && rightElement != null) {
final PyExpression leftExpr = PsiTreeUtil.getParentOfType(leftElement, PyExpression.class);
final PyExpression rightExpr = PsiTreeUtil.getParentOfType(rightElement, PyExpression.class);
final PyAstExpression leftExpr = PsiTreeUtil.getParentOfType(leftElement, PyAstExpression.class);
final PyAstExpression rightExpr = PsiTreeUtil.getParentOfType(rightElement, PyAstExpression.class);
final Request request = new Request(document, start, end, leftElement, leftExpr, rightElement, rightExpr);
@@ -119,8 +119,8 @@ public final class PyJoinLinesHandler implements JoinRawLinesHandlerDelegate {
final Document document;
final PsiElement leftElem;
final PsiElement rightElem;
final PyExpression leftExpr;
final PyExpression rightExpr;
final PyAstExpression leftExpr;
final PyAstExpression rightExpr;
final int secondLineStartOffset;
final int firstLineEndOffset;
@@ -128,9 +128,9 @@ public final class PyJoinLinesHandler implements JoinRawLinesHandlerDelegate {
int firstLineEndOffset,
int secondLineStartOffset,
@NotNull PsiElement leftElem,
@Nullable PyExpression leftExpr,
@Nullable PyAstExpression leftExpr,
@NotNull PsiElement rightElem,
@Nullable PyExpression rightExpr) {
@Nullable PyAstExpression rightExpr) {
this.document = document;
this.firstLineEndOffset = firstLineEndOffset;
this.secondLineStartOffset = secondLineStartOffset;
@@ -180,7 +180,7 @@ public final class PyJoinLinesHandler implements JoinRawLinesHandlerDelegate {
private static class BinaryExprJoiner implements Joiner {
@Override
public Result join(@NotNull Request req) {
if (req.leftExpr instanceof PyBinaryExpression || req.rightExpr instanceof PyBinaryExpression) {
if (req.leftExpr instanceof PyAstBinaryExpression || req.rightExpr instanceof PyAstBinaryExpression) {
// TODO: look at settings for space around binary exprs
return new Result(" ", 1);
}
@@ -191,9 +191,9 @@ public final class PyJoinLinesHandler implements JoinRawLinesHandlerDelegate {
private static class StmtJoiner implements Joiner {
@Override
public Result join(@NotNull Request req) {
final PyStatement leftStmt = PsiTreeUtil.getParentOfType(req.leftExpr, PyStatement.class);
final PyAstStatement leftStmt = PsiTreeUtil.getParentOfType(req.leftExpr, PyAstStatement.class);
if (leftStmt != null) {
final PyStatement rightStmt = PsiTreeUtil.getParentOfType(req.rightExpr, PyStatement.class);
final PyAstStatement rightStmt = PsiTreeUtil.getParentOfType(req.rightExpr, PyAstStatement.class);
if (rightStmt != null && rightStmt != leftStmt) {
// TODO: look at settings for space after semicolon
return new Result("; ", 1); // cursor after semicolon
@@ -206,12 +206,12 @@ public final class PyJoinLinesHandler implements JoinRawLinesHandlerDelegate {
private static class StringLiteralJoiner implements Joiner {
@Override
public Result join(@NotNull Request req) {
final PyStringElement leftStringElem = PsiTreeUtil.getParentOfType(req.leftElem, PyStringElement.class, false);
final PyStringElement rightStringElem = PsiTreeUtil.getParentOfType(req.rightElem, PyStringElement.class, false);
final PyAstStringElement leftStringElem = PsiTreeUtil.getParentOfType(req.leftElem, PyAstStringElement.class, false);
final PyAstStringElement rightStringElem = PsiTreeUtil.getParentOfType(req.rightElem, PyAstStringElement.class, false);
if (leftStringElem != null && rightStringElem != null && leftStringElem != rightStringElem) {
final PsiElement parent = rightStringElem.getParent();
if ((leftStringElem.getParent() == parent && parent instanceof PyStringLiteralExpression) ||
(req.leftExpr instanceof PyStringLiteralExpression && req.rightExpr instanceof PyStringLiteralExpression)) {
if ((leftStringElem.getParent() == parent && parent instanceof PyAstStringLiteralExpression) ||
(req.leftExpr instanceof PyAstStringLiteralExpression && req.rightExpr instanceof PyAstStringLiteralExpression)) {
if (leftStringElem.isTerminated() && rightStringElem.isTerminated() && haveSamePrefixes(leftStringElem, rightStringElem)) {
final String leftElemQuotes = leftStringElem.getQuote();
@@ -233,8 +233,8 @@ public final class PyJoinLinesHandler implements JoinRawLinesHandlerDelegate {
private static @Nullable Result processStringsWithDifferentQuotes(final @NotNull Request req,
final @NotNull PyStringElement leftElem,
final @NotNull PyStringElement rightElem,
final @NotNull PyAstStringElement leftElem,
final @NotNull PyAstStringElement rightElem,
final @NotNull String replacement) {
if (!leftElem.isTripleQuoted() && !rightElem.isTripleQuoted()) {
if (!rightElem.getContent().contains(leftElem.getQuote())) {
@@ -254,8 +254,8 @@ public final class PyJoinLinesHandler implements JoinRawLinesHandlerDelegate {
}
private static @NotNull Result getResultAndSplitStringIfTooLong(final @NotNull Request req,
final @NotNull PyStringElement leftElem,
final @NotNull PyStringElement rightElem,
final @NotNull PyAstStringElement leftElem,
final @NotNull PyAstStringElement rightElem,
final @NotNull String replacement,
final @NotNull String quote) {
int cutIntoRight = rightElem.getContentRange().getStartOffset();
@@ -271,7 +271,7 @@ public final class PyJoinLinesHandler implements JoinRawLinesHandlerDelegate {
return new Result(replacement + lineEnd, 0, leftElem.getQuote().length(), cutIntoRight);
}
private static boolean haveSamePrefixes(@NotNull PyStringElement leftNodeInfo, @NotNull PyStringElement rightNodeInfo) {
private static boolean haveSamePrefixes(@NotNull PyAstStringElement leftNodeInfo, @NotNull PyAstStringElement rightNodeInfo) {
return leftNodeInfo.isUnicode() == rightNodeInfo.isUnicode() &&
leftNodeInfo.isRaw() == rightNodeInfo.isRaw() &&
leftNodeInfo.isBytes() == rightNodeInfo.isBytes() &&