MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Java. Code Formatting] Split option to add blank lines for fields with/without annotations

Browse Source 
IDEA-110857

GitOrigin-RevId: 6ee23199e686c649439833df1223a12494be9d00
This commit is contained in:
Georgii Ustinov
2024-07-03 12:08:33 +03:00
committed by intellij-monorepo-bot
parent ac26958873
commit 93b6c3ccc2
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/java-frontback-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
View File

@@ -123,6 +123,7 @@ public class JavaCodeStyleSettings extends CustomCodeStyleSettings implements Im
public boolean ALIGN_MULTILINE_TEXT_BLOCKS = false; public boolean ALIGN_MULTILINE_TEXT_BLOCKS = false;
public int BLANK_LINES_AROUND_INITIALIZER = 1; public int BLANK_LINES_AROUND_INITIALIZER = 1;
public int BLANK_LINES_AROUND_FIELD_WITH_ANNOTATIONS = 0;
public static final int FULLY_QUALIFY_NAMES_IF_NOT_IMPORTED = 1; public static final int FULLY_QUALIFY_NAMES_IF_NOT_IMPORTED = 1;
public static final int FULLY_QUALIFY_NAMES_ALWAYS = 2; public static final int FULLY_QUALIFY_NAMES_ALWAYS = 2;

9
java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
View File

@@ -305,6 +305,15 @@ public final class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeSty
consumer.showCustomOption(JavaCodeStyleSettings.class, "BLANK_LINES_AROUND_INITIALIZER", consumer.showCustomOption(JavaCodeStyleSettings.class, "BLANK_LINES_AROUND_INITIALIZER",
JavaBundle.message("editbox.blanklines.around.initializer"), JavaBundle.message("editbox.blanklines.around.initializer"),
getInstance().BLANK_LINES); getInstance().BLANK_LINES);
consumer.renameStandardOption(
"BLANK_LINES_AROUND_FIELD",
JavaBundle.message("editbox.blank.lines.field.without.annotations"));
consumer.showCustomOption(JavaCodeStyleSettings.class,
"BLANK_LINES_AROUND_FIELD_WITH_ANNOTATIONS",
JavaBundle.message("editbox.blank.lines.field.with.annotations"),
getInstance().BLANK_LINES);
} }
else if (settingsType == SettingsType.COMMENTER_SETTINGS) { else if (settingsType == SettingsType.COMMENTER_SETTINGS) {
consumer.showAllStandardOptions(); consumer.showAllStandardOptions();

2
java/openapi/resources/messages/JavaBundle.properties
View File

@@ -220,6 +220,8 @@ dialog.title.testdatapath.file.generate=Generate files from class to @TestDataPa
do.not.import.inner.classes.for=Exclude inner classes by short name: do.not.import.inner.classes.for=Exclude inner classes by short name:
do.not.import.inner.classes.no.classes=No inner classes defined do.not.import.inner.classes.no.classes=No inner classes defined
editbox.blanklines.around.initializer=Around initializer: editbox.blanklines.around.initializer=Around initializer:
editbox.blank.lines.field.without.annotations=Around field without annotations:
editbox.blank.lines.field.with.annotations=Around field with annotations:
editbox.class.count.to.use.import.with.star=Class count to use import with '*': editbox.class.count.to.use.import.with.star=Class count to use import with '*':
editbox.names.count.to.use.static.import.with.star=Names count to use static import with '*': editbox.names.count.to.use.static.import.with.star=Names count to use static import with '*':
enum.not.allowed=Enum is not allowed enum.not.allowed=Enum is not allowed