MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 23:31:05 +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

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"/>

155
python/python-psi-impl/src/com/jetbrains/python/formatter/PyFromImportPostFormatProcessor.java
View File

@@ -1,155 +0,0 @@
// Copyright 2000-2019 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.formatter;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiComment;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiWhiteSpace;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.impl.source.codeStyle.PostFormatProcessor;
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.psi.*;
import com.jetbrains.python.psi.impl.PyPsiUtils;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
final class PyFromImportPostFormatProcessor implements PostFormatProcessor {
@NotNull
@Override
public PsiElement processElement(@NotNull PsiElement source, @NotNull CodeStyleSettings settings) {
return new Visitor(settings).processElement(source);
}
@NotNull
@Override
public TextRange processText(@NotNull PsiFile source, @NotNull TextRange rangeToReformat, @NotNull CodeStyleSettings settings) {
return new Visitor(settings).processTextRange(source, rangeToReformat);
}
private static class Visitor extends PyRecursiveElementVisitor {
private final PostFormatProcessorHelper myHelper;
private final List<PyFromImportStatement> myImportStatements = new ArrayList<>();
private PsiElement myRootElement;
Visitor(@NotNull CodeStyleSettings settings) {
myHelper = new PostFormatProcessorHelper(settings.getCommonSettings(PythonLanguage.getInstance()));
}
@Override
public void visitPyFromImportStatement(@NotNull PyFromImportStatement 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);
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 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
if (forcedParens && openingParen == null || forcedComma && missingComma && openingParen != null) {
myImportStatements.add(node);
}
}
}
}
@NotNull
public PsiElement processElement(@NotNull PsiElement element) {
// For some reason smart pointers don't work for non-physical (in particular, generated) elements
myRootElement = element;
findAndReplaceFromImports(element);
return myRootElement;
}
@NotNull
public TextRange processTextRange(@NotNull PsiFile file, @NotNull TextRange range) {
myHelper.setResultTextRange(range);
findAndReplaceFromImports(file);
return myHelper.getResultTextRange();
}
private void findAndReplaceFromImports(@NotNull PsiElement element) {
// Copied/generated elements are stored in DummyHolder files, not PyFiles
if (element.getLanguage().isKindOf(PythonLanguage.INSTANCE)) {
element.accept(this);
Collections.reverse(myImportStatements);
for (PyFromImportStatement statement : myImportStatements) {
final PyFromImportStatement newStatement = replaceFromImport(statement);
if (myRootElement == statement) {
myRootElement = newStatement;
}
}
}
}
@NotNull
private PyFromImportStatement replaceFromImport(@NotNull PyFromImportStatement fromImport) {
final PyImportElement[] allNames = fromImport.getImportElements();
final PyImportElement firstName = allNames[0];
final PyElementGenerator generator = PyElementGenerator.getInstance(fromImport.getProject());
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(fromImport.getProject());
if (fromImport.getLeftParen() == null) {
// Surround with parentheses stripping obsolete continuation backslashes and added trailing comma if necessary
final String beforeFirstName = fromImport.getText().substring(0, firstName.getStartOffsetInParent());
final StringBuilder newStatementText = new StringBuilder(beforeFirstName);
newStatementText.append("(");
boolean lastElementWasComment = false;
int lastVisibleNameCommaOffset = -1;
for (PsiElement cur = firstName; cur != null; cur = cur.getNextSibling()) {
if (cur instanceof PsiWhiteSpace) {
newStatementText.append(cur.getText().replace("\\", ""));
}
else {
newStatementText.append(cur.getText());
}
if (cur instanceof PyImportElement && cur.getTextLength() != 0) {
lastVisibleNameCommaOffset = newStatementText.length();
}
else if (lastVisibleNameCommaOffset != -1 && cur.getNode().getElementType() == PyTokenTypes.COMMA) {
lastVisibleNameCommaOffset = -1;
}
lastElementWasComment = cur instanceof PsiComment;
}
final PyCodeStyleSettings pySettings = myHelper.getSettings().getRootSettings().getCustomSettings(PyCodeStyleSettings.class);
if (lastVisibleNameCommaOffset != -1 && pySettings.FROM_IMPORT_TRAILING_COMMA_IF_MULTILINE) {
newStatementText.insert(lastVisibleNameCommaOffset, ",");
}
if (lastElementWasComment) {
newStatementText.append("\n");
}
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);
myHelper.updateResultRange(fromImport.getTextLength(), newFromImport.getTextLength());
return newFromImport;
}
else {
final int oldLength = fromImport.getTextLength();
// Add only trailing comma
fromImport.addAfter(generator.createComma().getPsi(), allNames[allNames.length - 1]);
// Adjust spaces around the comma if necessary
codeStyleManager.reformat(fromImport, true);
myHelper.updateResultRange(oldLength, fromImport.getTextLength());
return fromImport;
}
}
}
}

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");