MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Python] Refactor the old DictAlignment enum which prevented dynamic syntax bundle loading

Browse Source 
Unfortunately, we need to keep the old int values logic to preserve compatibility with old user settings

GitOrigin-RevId: 59fba8bd53e3d89d31897ed675b54827bbf9b15f
This commit is contained in:
Daniil Kalinin
2025-02-13 10:45:38 +00:00
committed by intellij-monorepo-bot
parent a4f9be714a
commit f8a57f7367
2 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python-syntax-core/src/com/jetbrains/python/formatter/PyCodeStyleSettings.java
+14 -8
View File
@@ -4,6 +4,7 @@ package com.jetbrains.python.formatter;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
import com.intellij.util.ui.PresentableEnum;
import com.jetbrains.python.PySyntaxCoreBundle;
import org.intellij.lang.annotations.MagicConstant;
import org.jetbrains.annotations.NotNull;
@@ -13,24 +14,29 @@ import static com.intellij.psi.codeStyle.CommonCodeStyleSettings.WRAP_AS_NEEDED;
public class PyCodeStyleSettings extends CustomCodeStyleSettings {
public enum DictAlignment {
NONE(PySyntaxCoreBundle.message("formatter.panel.dict.alignment.do.not.align")),
ON_VALUE(PySyntaxCoreBundle.message("formatter.panel.dict.alignment.align.on.value")),
ON_COLON(PySyntaxCoreBundle.message("formatter.panel.dict.alignment.align.on.colon"));
public enum DictAlignment implements PresentableEnum {
NONE("formatter.panel.dict.alignment.do.not.align"),
ON_VALUE("formatter.panel.dict.alignment.align.on.value"),
ON_COLON("formatter.panel.dict.alignment.align.on.colon");
String description;
private final String key;
DictAlignment(String description) {
this.description = description;
DictAlignment(String key) {
this.key = key;
}
public int asInt() {
return ordinal();
}
@Override
public String getPresentableText() {
return PySyntaxCoreBundle.message(key);
}
@Override
public String toString() {
return description;
return getPresentableText();
}
}
python/python-syntax/src/com/jetbrains/python/formatter/PyOtherCodeStylePanel.java
+3 -16
View File
@@ -9,6 +9,7 @@ import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.ui.ComboBox;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.ui.components.JBCheckBox;
import com.intellij.util.ui.PresentableEnumUtil;
import com.jetbrains.python.PythonFileType;
import com.jetbrains.python.PythonLanguage;
import com.jetbrains.python.formatter.PyCodeStyleSettings.DictAlignment;
@@ -19,8 +20,6 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
public class PyOtherCodeStylePanel extends CodeStyleAbstractPanel {
@@ -30,7 +29,7 @@ public class PyOtherCodeStylePanel extends CodeStyleAbstractPanel {
private JBCheckBox myUseContinuationIndentForParameters;
private JBCheckBox myUseContinuationIndentForArguments;
private JBCheckBox myUseContinuationIndentForCollectionsAndComprehensions;
private ComboBox myDictAlignmentCombo;
private ComboBox<DictAlignment> myDictAlignmentCombo;
private JPanel myPreviewPanel;
private JBCheckBox myFormatInjectedFragments;
private JBCheckBox myAddIndentInsideInjections;
@@ -40,19 +39,7 @@ public class PyOtherCodeStylePanel extends CodeStyleAbstractPanel {
addPanelToWatch(myPanel);
installPreviewPanel(myPreviewPanel);
for (DictAlignment alignment : DictAlignment.values()) {
//noinspection unchecked
myDictAlignmentCombo.addItem(alignment);
}
myDictAlignmentCombo.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
somethingChanged();
}
}
});
PresentableEnumUtil.fill(myDictAlignmentCombo, DictAlignment.class);
myAddTrailingBlankLineCheckbox.addActionListener(new ActionListener() {
@Override