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

PY-61639 Move PyPreFormatProcessor to python.syntax.core

Browse Source 
GitOrigin-RevId: 30d204206de9e09eae34baf0555fc9be5822ba68
This commit is contained in:
Petr
2024-02-12 13:16:53 +01:00
committed by intellij-monorepo-bot
parent d7630f0ef5
commit b9167aef8b
6 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/python-ast/src/com/jetbrains/python/psi/PyAstElementGenerator.java
View File

@@ -1,5 +1,6 @@
package com.jetbrains.python.psi;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
@@ -112,6 +113,13 @@ public class PyAstElementGenerator {
return psiFile;
}
public ASTNode createComma() {
final PsiFile dummyFile = createDummyFile(LanguageLevel.getDefault(), "[0,]");
final PyAstExpressionStatement expressionStatement = (PyAstExpressionStatement)dummyFile.getFirstChild();
ASTNode zero = expressionStatement.getFirstChild().getNode().getFirstChildNode().getTreeNext();
return zero.getTreeNext().copyElement();
}
public PyAstExpressionStatement createDocstring(String content) {
return createFromText(LanguageLevel.getDefault(),
PyAstExpressionStatement.class, content + "\n");

2
python/python-psi-api/src/com/jetbrains/python/psi/PyElementGenerator.java
View File

@@ -44,8 +44,6 @@ public abstract class PyElementGenerator extends PyAstElementGenerator {
public abstract PyListLiteralExpression createListLiteral();
public abstract ASTNode createComma();
public abstract ASTNode createDot();
public abstract PyBinaryExpression createBinaryExpression(String s, PyExpression expr, PyExpression listLiteral);

1
python/python-psi-impl/resources/META-INF/PythonPsiImpl.xml
View File

@@ -67,7 +67,6 @@
implementationClass="com.jetbrains.python.psi.impl.references.PyKeywordPatternManipulator"/>
<lang.parserDefinition language="Python" implementationClass="com.jetbrains.python.PythonParserDefinition"/>
<postFormatProcessor implementation="com.jetbrains.python.formatter.PyFromImportPostFormatProcessor"/>
<lang.lineWrapStrategy language="Python" implementationClass="com.jetbrains.python.formatter.PyLineWrapPositionStrategy"/>
<lang.commenter language="Python" implementationClass="com.jetbrains.python.PythonCommenter"/>

8
python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyElementGeneratorImpl.java
View File

@@ -146,14 +146,6 @@ public final class PyElementGeneratorImpl extends PyElementGenerator {
return (PyListLiteralExpression)expressionStatement.getFirstChild();
}
@Override
public ASTNode createComma() {
final PsiFile dummyFile = createDummyFile(LanguageLevel.getDefault(), "[0,]");
final PyExpressionStatement expressionStatement = (PyExpressionStatement)dummyFile.getFirstChild();
ASTNode zero = expressionStatement.getFirstChild().getNode().getFirstChildNode().getTreeNext();
return zero.getTreeNext().copyElement();
}
@Override
public ASTNode createDot() {
final PsiFile dummyFile = createDummyFile(LanguageLevel.getDefault(), "a.b");

1
python/python-syntax-core/resources/META-INF/PythonSyntaxCore.xml
View File

@@ -12,5 +12,6 @@
<lang.formatter language="Python" implementationClass="com.jetbrains.python.formatter.PythonFormattingModelBuilder"/>
<preFormatProcessor implementation="com.jetbrains.python.formatter.PyPreFormatProcessor"/>
<postFormatProcessor implementation="com.jetbrains.python.formatter.PyTrailingBlankLinesPostFormatProcessor"/>
<postFormatProcessor implementation="com.jetbrains.python.formatter.PyFromImportPostFormatProcessor"/>
</extensions>
</idea-plugin>

37
python/python-psi-impl/src/com/jetbrains/python/formatter/PyFromImportPostFormatProcessor.java → python/python-syntax-core/src/com/jetbrains/python/formatter/PyFromImportPostFormatProcessor.java
View File

@@ -13,8 +13,11 @@ import com.intellij.psi.impl.source.codeStyle.PostFormatProcessorHelper;
import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.PyTokenTypes;
import com.jetbrains.python.PythonLanguage;
import com.jetbrains.python.ast.PyAstFromImportStatement;
import com.jetbrains.python.ast.PyAstImportElement;
import com.jetbrains.python.ast.PyAstRecursiveElementVisitor;
import com.jetbrains.python.ast.impl.PyPsiUtilsCore;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyPsiUtils;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
@@ -34,9 +37,9 @@ final class PyFromImportPostFormatProcessor implements PostFormatProcessor {
return new Visitor(settings).processTextRange(source, rangeToReformat);
}
private static class Visitor extends PyRecursiveElementVisitor {
private static class Visitor extends PyAstRecursiveElementVisitor {
private final PostFormatProcessorHelper myHelper;
private final List<PyFromImportStatement> myImportStatements = new ArrayList<>();
private final List<PyAstFromImportStatement> myImportStatements = new ArrayList<>();
private PsiElement myRootElement;
Visitor(@NotNull CodeStyleSettings settings) {
@@ -44,18 +47,18 @@ final class PyFromImportPostFormatProcessor implements PostFormatProcessor {
}
@Override
public void visitPyFromImportStatement(@NotNull PyFromImportStatement node) {
public void visitPyFromImportStatement(@NotNull PyAstFromImportStatement node) {
if (myHelper.isElementFullyInRange(node)) {
// If non-parenthesized "from" import ends with one or more of trailing commas, the array returned by getImportElements()
// contains empty import elements at the end
final List<PyImportElement> importedNames = ContainerUtil.filter(node.getImportElements(), elem -> elem.getTextLength() != 0);
final List<PyAstImportElement> importedNames = ContainerUtil.filter(node.getImportElements(), elem -> elem.getTextLength() != 0);
if (importedNames.size() > 1) {
final PyCodeStyleSettings pySettings = myHelper.getSettings().getRootSettings().getCustomSettings(PyCodeStyleSettings.class);
final boolean forcedParens = pySettings.FROM_IMPORT_PARENTHESES_FORCE_IF_MULTILINE && PostFormatProcessorHelper.isMultiline(node);
final boolean forcedComma = pySettings.FROM_IMPORT_TRAILING_COMMA_IF_MULTILINE && PostFormatProcessorHelper.isMultiline(node);
final PyImportElement lastImportedName = importedNames.get(importedNames.size() - 1);
final PsiElement afterLastName = PyPsiUtils.getNextNonCommentSibling(lastImportedName, true);
final PyAstImportElement lastImportedName = importedNames.get(importedNames.size() - 1);
final PsiElement afterLastName = PyPsiUtilsCore.getNextNonCommentSibling(lastImportedName, true);
final PsiElement openingParen = node.getLeftParen();
final boolean missingComma = afterLastName == null || afterLastName.getNode().getElementType() != PyTokenTypes.COMMA;
// Trailing comma is allowed only in "from" imports wrapped in parentheses
@@ -86,8 +89,8 @@ final class PyFromImportPostFormatProcessor implements PostFormatProcessor {
if (element.getLanguage().isKindOf(PythonLanguage.INSTANCE)) {
element.accept(this);
Collections.reverse(myImportStatements);
for (PyFromImportStatement statement : myImportStatements) {
final PyFromImportStatement newStatement = replaceFromImport(statement);
for (PyAstFromImportStatement statement : myImportStatements) {
final PyAstFromImportStatement newStatement = replaceFromImport(statement);
if (myRootElement == statement) {
myRootElement = newStatement;
}
@@ -96,10 +99,10 @@ final class PyFromImportPostFormatProcessor implements PostFormatProcessor {
}
@NotNull
private PyFromImportStatement replaceFromImport(@NotNull PyFromImportStatement fromImport) {
final PyImportElement[] allNames = fromImport.getImportElements();
final PyImportElement firstName = allNames[0];
final PyElementGenerator generator = PyElementGenerator.getInstance(fromImport.getProject());
private PyAstFromImportStatement replaceFromImport(@NotNull PyAstFromImportStatement fromImport) {
final PyAstImportElement[] allNames = fromImport.getImportElements();
final PyAstImportElement firstName = allNames[0];
final PyAstElementGenerator generator = PyAstElementGenerator.getInstance(fromImport.getProject());
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(fromImport.getProject());
if (fromImport.getLeftParen() == null) {
@@ -116,7 +119,7 @@ final class PyFromImportPostFormatProcessor implements PostFormatProcessor {
else {
newStatementText.append(cur.getText());
}
if (cur instanceof PyImportElement && cur.getTextLength() != 0) {
if (cur instanceof PyAstImportElement && cur.getTextLength() != 0) {
lastVisibleNameCommaOffset = newStatementText.length();
}
else if (lastVisibleNameCommaOffset != -1 && cur.getNode().getElementType() == PyTokenTypes.COMMA) {
@@ -134,9 +137,9 @@ final class PyFromImportPostFormatProcessor implements PostFormatProcessor {
newStatementText.append(")");
final LanguageLevel level = LanguageLevel.forElement(fromImport);
PyFromImportStatement newFromImport = generator.createFromText(level, PyFromImportStatement.class, newStatementText.toString());
newFromImport = (PyFromImportStatement)fromImport.replace(newFromImport);
newFromImport = (PyFromImportStatement)codeStyleManager.reformat(newFromImport, true);
PyAstFromImportStatement newFromImport = generator.createFromText(level, PyAstFromImportStatement.class, newStatementText.toString());
newFromImport = (PyAstFromImportStatement)fromImport.replace(newFromImport);
newFromImport = (PyAstFromImportStatement)codeStyleManager.reformat(newFromImport, true);
myHelper.updateResultRange(fromImport.getTextLength(), newFromImport.getTextLength());
return newFromImport;
}