From 8c6ed5f606c34e35acd7c40b6bfa3b6bf0a0eb60 Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Wed, 19 Aug 2020 10:26:20 +0300 Subject: [PATCH] Revert "IDEA-247635 Adjusted language implementations to use suppliers and getters from CodeStyleSettingsCustomizableOptions" This reverts commit 05084502 GitOrigin-RevId: 3409ca5cb939d9ddd3b0712a15a0f3dda5a3df44 --- ...JavaLanguageCodeStyleSettingsProvider.java | 44 ++++++++------ ...JsonLanguageCodeStyleSettingsProvider.java | 18 +++--- ...oovyLanguageCodeStyleSettingsProvider.java | 38 ++++-------- .../MarkdownCodeStyleSettingsProvider.kt | 12 ++-- ...YAMLLanguageCodeStyleSettingsProvider.java | 8 ++- .../PyLanguageCodeStyleSettingsProvider.java | 59 ++++++++++--------- 6 files changed, 88 insertions(+), 91 deletions(-) diff --git a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java index dbd5e37cade7..46da675b1843 100644 --- a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java +++ b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java @@ -1,4 +1,18 @@ -// Copyright 2000-2020 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. +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.ide; import com.intellij.application.options.*; @@ -25,7 +39,6 @@ import java.util.Collections; import java.util.List; import static com.intellij.application.options.JavaDocFormattingPanel.*; -import static com.intellij.psi.codeStyle.CodeStyleSettingsCustomizableOptions.getWrapOptions; /** * @author rvishnyakov @@ -77,24 +90,19 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett public void customizeSettings(@NotNull CodeStyleSettingsCustomizable consumer, @NotNull SettingsType settingsType) { if (settingsType == SettingsType.SPACING_SETTINGS) { consumer.showAllStandardOptions(); - consumer.showCustomOption(JavaCodeStyleSettings.class, "SPACES_WITHIN_ANGLE_BRACKETS", "Angle brackets", - CodeStyleSettingsCustomizableOptions.SPACES_WITHIN.get()); + consumer.showCustomOption(JavaCodeStyleSettings.class, "SPACES_WITHIN_ANGLE_BRACKETS", "Angle brackets",CodeStyleSettingsCustomizable.SPACES_WITHIN); consumer.showCustomOption(JavaCodeStyleSettings.class, "SPACE_WITHIN_RECORD_HEADER", - JavaBundle.message("checkbox.spaces.record.header"), - CodeStyleSettingsCustomizableOptions.SPACES_WITHIN.get()); + JavaBundle.message("checkbox.spaces.record.header"),CodeStyleSettingsCustomizable.SPACES_WITHIN); - String groupName = CodeStyleSettingsCustomizableOptions.SPACES_IN_TYPE_ARGUMENTS.get(); + String groupName = CodeStyleSettingsCustomizable.SPACES_IN_TYPE_ARGUMENTS; consumer.moveStandardOption("SPACE_AFTER_COMMA_IN_TYPE_ARGUMENTS", groupName); - consumer - .showCustomOption(JavaCodeStyleSettings.class, "SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENT", "After closing angle bracket", - groupName); + consumer.showCustomOption(JavaCodeStyleSettings.class, "SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENT", "After closing angle bracket", groupName); - groupName = CodeStyleSettingsCustomizableOptions.SPACES_IN_TYPE_PARAMETERS.get(); - consumer.showCustomOption(JavaCodeStyleSettings.class, "SPACE_BEFORE_OPENING_ANGLE_BRACKET_IN_TYPE_PARAMETER", - ApplicationBundle.message("checkbox.spaces.before.opening.angle.bracket"), groupName); + groupName = CodeStyleSettingsCustomizable.SPACES_IN_TYPE_PARAMETERS; + consumer.showCustomOption(JavaCodeStyleSettings.class, "SPACE_BEFORE_OPENING_ANGLE_BRACKET_IN_TYPE_PARAMETER", ApplicationBundle.message("checkbox.spaces.before.opening.angle.bracket"), groupName); consumer.showCustomOption(JavaCodeStyleSettings.class, "SPACE_AROUND_TYPE_BOUNDS_IN_TYPE_PARAMETERS", "Around type bounds", groupName); - groupName = CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get(); + groupName = CodeStyleSettingsCustomizable.SPACES_OTHER; consumer.showCustomOption(JavaCodeStyleSettings.class, "SPACE_BEFORE_COLON_IN_FOREACH", JavaBundle.message( "checkbox.spaces.before.colon.in.foreach"), groupName); consumer.showCustomOption(JavaCodeStyleSettings.class, "SPACE_INSIDE_ONE_LINE_ENUM_BRACES", JavaBundle.message( @@ -195,7 +203,7 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett "ANNOTATION_PARAMETER_WRAP", JavaBundle.message("wrapping.annotation.parameters"), null, - getWrapOptions(), CodeStyleSettingsCustomizable.WRAP_VALUES); + CodeStyleSettingsCustomizable.WRAP_OPTIONS, CodeStyleSettingsCustomizable.WRAP_VALUES); consumer.showCustomOption(JavaCodeStyleSettings.class, "ALIGN_MULTILINE_ANNOTATION_PARAMETERS", @@ -216,7 +224,7 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett "RECORD_COMPONENTS_WRAP", recordComponentsGroup, null, - getWrapOptions(), CodeStyleSettingsCustomizable.WRAP_VALUES); + CodeStyleSettingsCustomizable.WRAP_OPTIONS, CodeStyleSettingsCustomizable.WRAP_VALUES); consumer.showCustomOption(JavaCodeStyleSettings.class, "ALIGN_MULTILINE_RECORDS", ApplicationBundle.message("wrapping.align.when.multiline"), @@ -232,9 +240,7 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett } else if (settingsType == SettingsType.BLANK_LINES_SETTINGS) { consumer.showAllStandardOptions(); - consumer.showCustomOption(JavaCodeStyleSettings.class, "BLANK_LINES_AROUND_INITIALIZER", - JavaBundle.message("editbox.blanklines.around.initializer"), - CodeStyleSettingsCustomizableOptions.BLANK_LINES.get()); + consumer.showCustomOption(JavaCodeStyleSettings.class, "BLANK_LINES_AROUND_INITIALIZER", JavaBundle.message("editbox.blanklines.around.initializer"), CodeStyleSettingsCustomizable.BLANK_LINES); } else if (settingsType == SettingsType.COMMENTER_SETTINGS) { consumer.showAllStandardOptions(); diff --git a/json/src/com/intellij/json/formatter/JsonLanguageCodeStyleSettingsProvider.java b/json/src/com/intellij/json/formatter/JsonLanguageCodeStyleSettingsProvider.java index 3374b8a2e705..a0f136abe7a1 100644 --- a/json/src/com/intellij/json/formatter/JsonLanguageCodeStyleSettingsProvider.java +++ b/json/src/com/intellij/json/formatter/JsonLanguageCodeStyleSettingsProvider.java @@ -1,4 +1,3 @@ -// Copyright 2000-2020 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.intellij.json.formatter; import com.intellij.application.options.IndentOptionsEditor; @@ -7,7 +6,6 @@ import com.intellij.json.JsonBundle; import com.intellij.json.JsonLanguage; import com.intellij.lang.Language; import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable; -import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizableOptions; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; import com.intellij.util.ArrayUtil; @@ -17,7 +15,7 @@ import org.jetbrains.annotations.Nullable; import java.util.Arrays; -import static com.intellij.psi.codeStyle.CodeStyleSettingsCustomizableOptions.getWrapOptions; +import static com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable.SPACES_OTHER; /** * @author Mikhail Golubev @@ -49,10 +47,8 @@ public class JsonLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett "SPACE_AFTER_COMMA", "SPACE_BEFORE_COMMA"); consumer.renameStandardOption("SPACE_WITHIN_BRACES", "Braces"); - consumer.showCustomOption(JsonCodeStyleSettings.class, "SPACE_BEFORE_COLON", "Before ':'", - CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get()); - consumer.showCustomOption(JsonCodeStyleSettings.class, "SPACE_AFTER_COLON", "After ':'", - CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get()); + consumer.showCustomOption(JsonCodeStyleSettings.class, "SPACE_BEFORE_COLON", "Before ':'", SPACES_OTHER); + consumer.showCustomOption(JsonCodeStyleSettings.class, "SPACE_AFTER_COLON", "After ':'", SPACES_OTHER); } else if (settingsType == SettingsType.BLANK_LINES_SETTINGS) { consumer.showStandardOptions("KEEP_BLANK_LINES_IN_CODE"); @@ -62,24 +58,24 @@ public class JsonLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett "WRAP_ON_TYPING", "KEEP_LINE_BREAKS", "WRAP_LONG_LINES"); - + consumer.showCustomOption(JsonCodeStyleSettings.class, "KEEP_TRAILING_COMMA", "Trailing comma", - CodeStyleSettingsCustomizableOptions.WRAPPING_KEEP.get()); + CodeStyleSettingsCustomizable.WRAPPING_KEEP); consumer.showCustomOption(JsonCodeStyleSettings.class, "ARRAY_WRAPPING", "Arrays", null, - getWrapOptions(), + CodeStyleSettingsCustomizable.WRAP_OPTIONS, CodeStyleSettingsCustomizable.WRAP_VALUES); consumer.showCustomOption(JsonCodeStyleSettings.class, "OBJECT_WRAPPING", "Objects", null, - getWrapOptions(), + CodeStyleSettingsCustomizable.WRAP_OPTIONS, CodeStyleSettingsCustomizable.WRAP_VALUES); consumer.showCustomOption(JsonCodeStyleSettings.class, diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GroovyLanguageCodeStyleSettingsProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GroovyLanguageCodeStyleSettingsProvider.java index 0f2655cce94d..bf6524ec86e3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GroovyLanguageCodeStyleSettingsProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GroovyLanguageCodeStyleSettingsProvider.java @@ -26,7 +26,6 @@ import java.io.Reader; import java.lang.reflect.Field; import static com.intellij.openapi.util.io.StreamUtil.readText; -import static com.intellij.psi.codeStyle.CodeStyleSettingsCustomizableOptions.getWrapOptions; import static com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider.SettingsType.*; import static java.nio.charset.StandardCharsets.UTF_8; @@ -170,14 +169,12 @@ public class GroovyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSe "ENUM_CONSTANTS_WRAP" ); consumer.showCustomOption(GroovyCodeStyleSettings.class, "USE_FLYING_GEESE_BRACES", "Use flying geese braces", - CodeStyleSettingsCustomizableOptions.WRAPPING_BRACES.get()); - consumer - .showCustomOption(GroovyCodeStyleSettings.class, "ALIGN_MULTILINE_LIST_OR_MAP", "Align when multiple", "List and map literals"); - consumer.showCustomOption(GroovyCodeStyleSettings.class, "ALIGN_NAMED_ARGS_IN_MAP", "Align multiline named arguments", - "List and map literals"); + CodeStyleSettingsCustomizable.WRAPPING_BRACES); + consumer.showCustomOption(GroovyCodeStyleSettings.class, "ALIGN_MULTILINE_LIST_OR_MAP", "Align when multiple", "List and map literals"); + consumer.showCustomOption(GroovyCodeStyleSettings.class, "ALIGN_NAMED_ARGS_IN_MAP", "Align multiline named arguments", "List and map literals"); consumer.showCustomOption(GroovyCodeStyleSettings.class, "IMPORT_ANNOTATION_WRAP", "Import annotations", null, CodeStyleSettingsCustomizable.OptionAnchor.AFTER, "VARIABLE_ANNOTATION_WRAP", - getWrapOptions(), CodeStyleSettingsCustomizable.WRAP_VALUES); + CodeStyleSettingsCustomizable.WRAP_OPTIONS, CodeStyleSettingsCustomizable.WRAP_VALUES); consumer.renameStandardOption("KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE", "Simple lambdas/closures in one line"); @@ -254,24 +251,15 @@ public class GroovyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSe consumer.renameStandardOption("SPACE_AROUND_RELATIONAL_OPERATORS", "Relational operators (<, >, <=, >=, <=>)"); consumer.renameStandardOption("SPACE_AROUND_UNARY_OPERATOR", "Unary operators (!, -, +, ++, --, *)"); - consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_IN_NAMED_ARGUMENT_BEFORE_COLON", "In named argument before ':'", - CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get()); - consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_IN_NAMED_ARGUMENT", "In named argument after ':'", - CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get()); - consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_WITHIN_LIST_OR_MAP", "List and maps literals", - CodeStyleSettingsCustomizableOptions.SPACES_WITHIN.get()); - consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_BEFORE_CLOSURE_LBRACE", "Closure left brace in method calls", - CodeStyleSettingsCustomizableOptions.SPACES_BEFORE_LEFT_BRACE.get()); - consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_WITHIN_GSTRING_INJECTION_BRACES", "GString injection braces", - CodeStyleSettingsCustomizableOptions.SPACES_WITHIN.get()); - consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_WITHIN_TUPLE_EXPRESSION", "Tuple assignment expression", - CodeStyleSettingsCustomizableOptions.SPACES_WITHIN.get()); - consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_AROUND_REGEX_OPERATORS", "Regexp expression (==~, =~)", - CodeStyleSettingsCustomizableOptions.SPACES_AROUND_OPERATORS.get()); - consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_BEFORE_ASSERT_SEPARATOR", "Before 'assert' separator", - CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get()); - consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_AFTER_ASSERT_SEPARATOR", "After 'assert' separator", - CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get()); + consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_IN_NAMED_ARGUMENT_BEFORE_COLON" , "In named argument before ':'", CodeStyleSettingsCustomizable.SPACES_OTHER); + consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_IN_NAMED_ARGUMENT", "In named argument after ':'", CodeStyleSettingsCustomizable.SPACES_OTHER); + consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_WITHIN_LIST_OR_MAP", "List and maps literals", CodeStyleSettingsCustomizable.SPACES_WITHIN); + consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_BEFORE_CLOSURE_LBRACE", "Closure left brace in method calls", CodeStyleSettingsCustomizable.SPACES_BEFORE_LEFT_BRACE); + consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_WITHIN_GSTRING_INJECTION_BRACES", "GString injection braces", CodeStyleSettingsCustomizable.SPACES_WITHIN); + consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_WITHIN_TUPLE_EXPRESSION", "Tuple assignment expression", CodeStyleSettingsCustomizable.SPACES_WITHIN); + consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_AROUND_REGEX_OPERATORS", "Regexp expression (==~, =~)", CodeStyleSettingsCustomizable.SPACES_AROUND_OPERATORS); + consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_BEFORE_ASSERT_SEPARATOR", "Before 'assert' separator", CodeStyleSettingsCustomizable.SPACES_OTHER); + consumer.showCustomOption(GroovyCodeStyleSettings.class, "SPACE_AFTER_ASSERT_SEPARATOR", "After 'assert' separator", CodeStyleSettingsCustomizable.SPACES_OTHER); return; } if (settingsType == BLANK_LINES_SETTINGS) { diff --git a/plugins/markdown/src/org/intellij/plugins/markdown/lang/formatter/settings/MarkdownCodeStyleSettingsProvider.kt b/plugins/markdown/src/org/intellij/plugins/markdown/lang/formatter/settings/MarkdownCodeStyleSettingsProvider.kt index 1b5fdb2e84d9..c16089c9fcd9 100644 --- a/plugins/markdown/src/org/intellij/plugins/markdown/lang/formatter/settings/MarkdownCodeStyleSettingsProvider.kt +++ b/plugins/markdown/src/org/intellij/plugins/markdown/lang/formatter/settings/MarkdownCodeStyleSettingsProvider.kt @@ -25,37 +25,37 @@ internal class MarkdownCodeStyleSettingsProvider : LanguageCodeStyleSettingsProv consumer.showCustomOption( MarkdownCustomCodeStyleSettings::class.java, MarkdownCustomCodeStyleSettings::MAX_LINES_AROUND_HEADER.name, "Around header", - CodeStyleSettingsCustomizableOptions.BLANK_LINES.get() + CodeStyleSettingsCustomizable.BLANK_LINES ) consumer.showCustomOption( MarkdownCustomCodeStyleSettings::class.java, MarkdownCustomCodeStyleSettings::MAX_LINES_AROUND_BLOCK_ELEMENTS.name, "Around block elements", - CodeStyleSettingsCustomizableOptions.BLANK_LINES.get() + CodeStyleSettingsCustomizable.BLANK_LINES ) consumer.showCustomOption( MarkdownCustomCodeStyleSettings::class.java, MarkdownCustomCodeStyleSettings::MAX_LINES_BETWEEN_PARAGRAPHS.name, "Between paragraphs", - CodeStyleSettingsCustomizableOptions.BLANK_LINES.get() + CodeStyleSettingsCustomizable.BLANK_LINES ) consumer.showCustomOption( MarkdownCustomCodeStyleSettings::class.java, MarkdownCustomCodeStyleSettings::MIN_LINES_AROUND_HEADER.name, "Around header", - CodeStyleSettingsCustomizableOptions.BLANK_LINES_KEEP.get() + CodeStyleSettingsCustomizable.BLANK_LINES_KEEP ) consumer.showCustomOption( MarkdownCustomCodeStyleSettings::class.java, MarkdownCustomCodeStyleSettings::MIN_LINES_AROUND_BLOCK_ELEMENTS.name, "Around block elements", - CodeStyleSettingsCustomizableOptions.BLANK_LINES_KEEP.get() + CodeStyleSettingsCustomizable.BLANK_LINES_KEEP ) consumer.showCustomOption( MarkdownCustomCodeStyleSettings::class.java, MarkdownCustomCodeStyleSettings::MIN_LINES_BETWEEN_PARAGRAPHS.name, "Between paragraphs", - CodeStyleSettingsCustomizableOptions.BLANK_LINES_KEEP.get() + CodeStyleSettingsCustomizable.BLANK_LINES_KEEP ) } SettingsType.SPACING_SETTINGS -> { diff --git a/plugins/yaml/src/org/jetbrains/yaml/YAMLLanguageCodeStyleSettingsProvider.java b/plugins/yaml/src/org/jetbrains/yaml/YAMLLanguageCodeStyleSettingsProvider.java index 5e8c36fd53e6..1784faeee49c 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/YAMLLanguageCodeStyleSettingsProvider.java +++ b/plugins/yaml/src/org/jetbrains/yaml/YAMLLanguageCodeStyleSettingsProvider.java @@ -5,7 +5,10 @@ import com.intellij.application.options.CodeStyleAbstractPanel; import com.intellij.application.options.IndentOptionsEditor; import com.intellij.application.options.SmartIndentOptionsEditor; import com.intellij.lang.Language; -import com.intellij.psi.codeStyle.*; +import com.intellij.psi.codeStyle.CodeStyleSettings; +import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable; +import com.intellij.psi.codeStyle.CommonCodeStyleSettings; +import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.yaml.formatter.YAMLCodeStyleSettings; @@ -55,8 +58,7 @@ public class YAMLLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett } else if (settingsType == SettingsType.SPACING_SETTINGS) { consumer.showStandardOptions("SPACE_WITHIN_BRACES", "SPACE_WITHIN_BRACKETS"); - consumer.showCustomOption(YAMLCodeStyleSettings.class, "SPACE_BEFORE_COLON", "Before ':'", - CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get()); + consumer.showCustomOption(YAMLCodeStyleSettings.class, "SPACE_BEFORE_COLON", "Before ':'", CodeStyleSettingsCustomizable.SPACES_OTHER); } else if (settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS) { consumer.showStandardOptions("KEEP_LINE_BREAKS"); diff --git a/python/src/com/jetbrains/python/formatter/PyLanguageCodeStyleSettingsProvider.java b/python/src/com/jetbrains/python/formatter/PyLanguageCodeStyleSettingsProvider.java index 5e141049b470..286ada362315 100644 --- a/python/src/com/jetbrains/python/formatter/PyLanguageCodeStyleSettingsProvider.java +++ b/python/src/com/jetbrains/python/formatter/PyLanguageCodeStyleSettingsProvider.java @@ -1,4 +1,18 @@ -// Copyright 2000-2020 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. +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.jetbrains.python.formatter; import com.intellij.application.options.CodeStyleAbstractConfigurable; @@ -13,8 +27,7 @@ import com.jetbrains.python.PythonLanguage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable.WRAP_VALUES; -import static com.intellij.psi.codeStyle.CodeStyleSettingsCustomizableOptions.getWrapOptions; +import static com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable.*; /** * @author yole @@ -56,31 +69,24 @@ public class PyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettin "SPACE_BEFORE_COMMA", "SPACE_BEFORE_SEMICOLON"); consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_BEFORE_LBRACKET", - PyBundle.message("formatter.left.bracket"), - CodeStyleSettingsCustomizableOptions.SPACES_BEFORE_PARENTHESES.get()); + PyBundle.message("formatter.left.bracket"), SPACES_BEFORE_PARENTHESES); consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_AROUND_POWER_OPERATOR", - PyBundle.message("formatter.around.power.operator"), - CodeStyleSettingsCustomizableOptions.SPACES_AROUND_OPERATORS.get()); + PyBundle.message("formatter.around.power.operator"), SPACES_AROUND_OPERATORS); consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_AROUND_EQ_IN_NAMED_PARAMETER", - PyBundle.message("formatter.around.eq.in.named.parameter"), - CodeStyleSettingsCustomizableOptions.SPACES_AROUND_OPERATORS.get()); + PyBundle.message("formatter.around.eq.in.named.parameter"), SPACES_AROUND_OPERATORS); consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_AROUND_EQ_IN_KEYWORD_ARGUMENT", - PyBundle.message("formatter.around.eq.in.keyword.argument"), - CodeStyleSettingsCustomizableOptions.SPACES_AROUND_OPERATORS.get()); - consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_WITHIN_BRACES", PyBundle.message("formatter.braces"), - CodeStyleSettingsCustomizableOptions.SPACES_WITHIN.get()); + PyBundle.message("formatter.around.eq.in.keyword.argument"), SPACES_AROUND_OPERATORS); + consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_WITHIN_BRACES", PyBundle.message("formatter.braces"), SPACES_WITHIN); consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_BEFORE_PY_COLON", - ApplicationBundle.message("checkbox.spaces.before.colon"), - CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get()); + ApplicationBundle.message("checkbox.spaces.before.colon"), SPACES_OTHER); consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_AFTER_PY_COLON", - ApplicationBundle.message("checkbox.spaces.after.colon"), - CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get()); + ApplicationBundle.message("checkbox.spaces.after.colon"), SPACES_OTHER); consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_BEFORE_BACKSLASH", - PyBundle.message("formatter.before.backslash"), CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get()); + PyBundle.message("formatter.before.backslash"), SPACES_OTHER); consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_BEFORE_NUMBER_SIGN", - PyBundle.message("formatter.before.hash"), CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get()); + PyBundle.message("formatter.before.hash"), SPACES_OTHER); consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_AFTER_NUMBER_SIGN", - PyBundle.message("formatter.after.hash"), CodeStyleSettingsCustomizableOptions.SPACES_OTHER.get()); + PyBundle.message("formatter.after.hash"), SPACES_OTHER); consumer.renameStandardOption("SPACE_AROUND_MULTIPLICATIVE_OPERATORS", PyBundle.message("formatter.around.multiplicative.operators")); } else if (settingsType == SettingsType.BLANK_LINES_SETTINGS) { @@ -92,12 +98,11 @@ public class PyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettin consumer.renameStandardOption("BLANK_LINES_AFTER_IMPORTS", PyBundle.message("formatter.around.top.level.imports")); consumer.showCustomOption(PyCodeStyleSettings.class, "BLANK_LINES_AROUND_TOP_LEVEL_CLASSES_FUNCTIONS", - PyBundle.message("formatter.around.top.level.classes.and.function"), - CodeStyleSettingsCustomizableOptions.BLANK_LINES.get()); + PyBundle.message("formatter.around.top.level.classes.and.function"), BLANK_LINES); consumer.showCustomOption(PyCodeStyleSettings.class, "BLANK_LINES_AFTER_LOCAL_IMPORTS", - PyBundle.message("formatter.after.local.imports"), CodeStyleSettingsCustomizableOptions.BLANK_LINES.get()); + PyBundle.message("formatter.after.local.imports"), BLANK_LINES); consumer.showCustomOption(PyCodeStyleSettings.class, "BLANK_LINES_BEFORE_FIRST_METHOD", - PyBundle.message("formatter.before.first.method"), CodeStyleSettingsCustomizableOptions.BLANK_LINES.get()); + PyBundle.message("formatter.before.first.method"), BLANK_LINES); } else if (settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS) { consumer.showStandardOptions("RIGHT_MARGIN", @@ -115,9 +120,9 @@ public class PyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettin consumer.showCustomOption(PyCodeStyleSettings.class, "ALIGN_COLLECTIONS_AND_COMPREHENSIONS", PyBundle.message("formatter.align.when.multiline"), PyBundle.message("formatter.collections.and.comprehensions")); - + consumer.showCustomOption(PyCodeStyleSettings.class, "FROM_IMPORT_WRAPPING", - PyBundle.message("formatter.from.import.statements"), null, getWrapOptions(), WRAP_VALUES); + PyBundle.message("formatter.from.import.statements"), null, WRAP_OPTIONS, WRAP_VALUES); consumer.showCustomOption(PyCodeStyleSettings.class, "ALIGN_MULTILINE_IMPORTS", PyBundle.message("formatter.align.when.multiline"), PyBundle.message("formatter.from.import.statements")); @@ -135,7 +140,7 @@ public class PyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettin PyBundle.message("formatter.from.import.statements")); consumer.showCustomOption(PyCodeStyleSettings.class, "DICT_WRAPPING", - PyBundle.message("formatter.dictionary.literals"), null, getWrapOptions(), WRAP_VALUES); + PyBundle.message("formatter.dictionary.literals"), null, WRAP_OPTIONS, WRAP_VALUES); consumer.showCustomOption(PyCodeStyleSettings.class, "DICT_NEW_LINE_AFTER_LEFT_BRACE", ApplicationBundle.message("wrapping.new.line.after.lbrace"), PyBundle.message("formatter.dictionary.literals"));