diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
| commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /xml/impl/src/com/intellij/application/options/HtmlLanguageCodeStyleSettings.java | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
| download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'xml/impl/src/com/intellij/application/options/HtmlLanguageCodeStyleSettings.java')
| -rw-r--r-- | xml/impl/src/com/intellij/application/options/HtmlLanguageCodeStyleSettings.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/xml/impl/src/com/intellij/application/options/HtmlLanguageCodeStyleSettings.java b/xml/impl/src/com/intellij/application/options/HtmlLanguageCodeStyleSettings.java index aa36d1b9aa60..d970ee5008cf 100644 --- a/xml/impl/src/com/intellij/application/options/HtmlLanguageCodeStyleSettings.java +++ b/xml/impl/src/com/intellij/application/options/HtmlLanguageCodeStyleSettings.java @@ -17,10 +17,13 @@ package com.intellij.application.options; import com.intellij.lang.Language; import com.intellij.lang.html.HTMLLanguage; +import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; import org.jetbrains.annotations.NotNull; +import java.util.Set; + /** * @author Rustam Vishnyakov */ @@ -37,6 +40,14 @@ public class HtmlLanguageCodeStyleSettings extends LanguageCodeStyleSettingsProv } @Override + public void customizeSettings(@NotNull CodeStyleSettingsCustomizable consumer, + @NotNull SettingsType settingsType) { + if (settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS) { + consumer.showStandardOptions("RIGHT_MARGIN"); + } + } + + @Override public CommonCodeStyleSettings getDefaultCommonSettings() { CommonCodeStyleSettings defaultSettings = new CommonCodeStyleSettings(HTMLLanguage.INSTANCE); defaultSettings.initIndentOptions(); |