From 43e38fd60f424dd817b3d005faeccdcc272361a4 Mon Sep 17 00:00:00 2001 From: Noah Halstead Date: Sat, 2 Jul 2022 20:56:10 -0400 Subject: [PATCH] Fix an Exception in PHPStorm --- .../MdLanguageCodeStyleSettingsProvider.java | 75 ++++++++++--------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/vladsch/md/nav/language/MdLanguageCodeStyleSettingsProvider.java b/src/main/java/com/vladsch/md/nav/language/MdLanguageCodeStyleSettingsProvider.java index 2a63526f..0c959d0d 100644 --- a/src/main/java/com/vladsch/md/nav/language/MdLanguageCodeStyleSettingsProvider.java +++ b/src/main/java/com/vladsch/md/nav/language/MdLanguageCodeStyleSettingsProvider.java @@ -71,46 +71,51 @@ public void customizeSettings(@NotNull CodeStyleSettingsCustomizable consumer, @ if (settingsType == SettingsType.INDENT_SETTINGS) { consumer.showStandardOptions("INDENT_SIZE", "USE_TAB_CHARACTER", "TAB_SIZE"); } else if (settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS) { - consumer.showStandardOptions("RIGHT_MARGIN"); - consumer.showCustomOption(MdCodeStyleSettings.class, - "WRAP_ON_TYPING", - "Wrap on typing", - null, - CodeStyleSettingsCustomizable.WRAP_ON_TYPING_OPTIONS, - CodeStyleSettingsCustomizable.WRAP_ON_TYPING_VALUES); - consumer.showCustomOption(MdCodeStyleSettings.class, - "FORMAT_WITH_SOFT_WRAP", - "Disable wrap on typing when soft wraps enabled", - null, - new String[] { FormatWithSoftWrap.DISABLED.displayName, FormatWithSoftWrap.ENABLED.displayName, FormatWithSoftWrap.INFINITE_MARGIN.displayName }, - new int[] { FormatWithSoftWrap.DISABLED.intValue, FormatWithSoftWrap.ENABLED.intValue, FormatWithSoftWrap.INFINITE_MARGIN.intValue } - ); - consumer.showCustomOption(MdCodeStyleSettings.class, - "CODE_KEEP_TRAILING_SPACES", - "Fenced/Indented Code", - "Keep Trailing Spaces", - new String[] { TrailingSpacesType.KEEP_ALL.displayName, TrailingSpacesType.KEEP_NONE.displayName }, - new int[] { TrailingSpacesType.KEEP_ALL.intValue, TrailingSpacesType.KEEP_NONE.intValue } - ); + try { + consumer.showStandardOptions("RIGHT_MARGIN"); + consumer.showCustomOption(MdCodeStyleSettings.class, + "WRAP_ON_TYPING", + "Wrap on typing", + null, + CodeStyleSettingsCustomizable.WRAP_ON_TYPING_OPTIONS, + CodeStyleSettingsCustomizable.WRAP_ON_TYPING_VALUES); + consumer.showCustomOption(MdCodeStyleSettings.class, + "FORMAT_WITH_SOFT_WRAP", + "Disable wrap on typing when soft wraps enabled", + null, + new String[] { FormatWithSoftWrap.DISABLED.displayName, FormatWithSoftWrap.ENABLED.displayName, FormatWithSoftWrap.INFINITE_MARGIN.displayName }, + new int[] { FormatWithSoftWrap.DISABLED.intValue, FormatWithSoftWrap.ENABLED.intValue, FormatWithSoftWrap.INFINITE_MARGIN.intValue } + ); + consumer.showCustomOption(MdCodeStyleSettings.class, + "CODE_KEEP_TRAILING_SPACES", + "Fenced/Indented Code", + "Keep Trailing Spaces", + new String[] { TrailingSpacesType.KEEP_ALL.displayName, TrailingSpacesType.KEEP_NONE.displayName }, + new int[] { TrailingSpacesType.KEEP_ALL.intValue, TrailingSpacesType.KEEP_NONE.intValue } + ); + + int i = 1; + for (MdTrailingSpacesCodeStyleOption option : MdStripTrailingSpacesExtension.getOptions()) { + consumer.showCustomOption(MdCodeStyleSettings.class, + "TRAILING_SPACES_OPTION_" + i++, + option.getOptionName(), + "Keep Trailing Spaces", + TrailingSpacesType.getDisplayNames(option.getExcludedOptions()), + TrailingSpacesType.getOptionValues(option.getExcludedOptions()) + ); + } - int i = 1; - for (MdTrailingSpacesCodeStyleOption option : MdStripTrailingSpacesExtension.getOptions()) { consumer.showCustomOption(MdCodeStyleSettings.class, - "TRAILING_SPACES_OPTION_" + i++, - option.getOptionName(), + "KEEP_TRAILING_SPACES", + "Everything Else", "Keep Trailing Spaces", - TrailingSpacesType.getDisplayNames(option.getExcludedOptions()), - TrailingSpacesType.getOptionValues(option.getExcludedOptions()) + new String[] { TrailingSpacesType.KEEP_ALL.displayName, TrailingSpacesType.KEEP_NONE.displayName }, + new int[] { TrailingSpacesType.KEEP_ALL.intValue, TrailingSpacesType.KEEP_NONE.intValue } ); + } catch (Exception e) { + // Do nothing with the exception. + // This error would be thrown by JetBrains when properties like "WRAP_ON_TYPING_OPTIONS" do not exist. } - - consumer.showCustomOption(MdCodeStyleSettings.class, - "KEEP_TRAILING_SPACES", - "Everything Else", - "Keep Trailing Spaces", - new String[] { TrailingSpacesType.KEEP_ALL.displayName, TrailingSpacesType.KEEP_NONE.displayName }, - new int[] { TrailingSpacesType.KEEP_ALL.intValue, TrailingSpacesType.KEEP_NONE.intValue } - ); } }