From 4e23cf6c923241eea8e0dffcb1c3418b073eb776 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 13 Dec 2018 09:48:41 +0100 Subject: [PATCH] a bit lazier GroovyLanguageCodeStyleSettingsProvider --- ...roovyLanguageCodeStyleSettingsProvider.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) 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 ab96b9a8505f..2d9db726d46a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GroovyLanguageCodeStyleSettingsProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GroovyLanguageCodeStyleSettingsProvider.java @@ -18,8 +18,6 @@ import org.jetbrains.plugins.groovy.GroovyLanguage; import javax.swing.*; import java.io.IOException; -import java.util.EnumMap; -import java.util.Map; import static com.intellij.openapi.util.io.StreamUtil.readText; import static com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider.SettingsType.*; @@ -266,17 +264,13 @@ public class GroovyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSe @Override public String getCodeSample(@NotNull SettingsType settingsType) { - return SAMPLES.get(settingsType); - } - - private static final Map SAMPLES; - - static { - Map samples = new EnumMap<>(SettingsType.class); - for (SettingsType type: new SettingsType[]{BLANK_LINES_SETTINGS, SPACING_SETTINGS, WRAPPING_AND_BRACES_SETTINGS, INDENT_SETTINGS}) { - samples.put(type, loadSample(type)); + if (settingsType == BLANK_LINES_SETTINGS || + settingsType == SPACING_SETTINGS || + settingsType == WRAPPING_AND_BRACES_SETTINGS || + settingsType == INDENT_SETTINGS) { + return loadSample(settingsType); } - SAMPLES = samples; + return null; } private static String loadSample(@NotNull SettingsType settingsType) {