diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.form b/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.form new file mode 100644 index 000000000000..67f579a77ff5 --- /dev/null +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.form @@ -0,0 +1,44 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.java new file mode 100644 index 000000000000..70c747dc11ca --- /dev/null +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.java @@ -0,0 +1,120 @@ +/* + * 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.application.options.codeStyle; + +import com.intellij.lang.Language; +import com.intellij.psi.codeStyle.CodeStyleSettings; +import com.intellij.psi.codeStyle.CommonCodeStyleSettings; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +/** + * Can be used for languages which do not use standard "Wrapping and Braces" panel. + *

+ * Note: besides adding the panel to UI it is necessary to make sure that language's own + * LanguageCodeStyleSettingsProvider explicitly supports RIGHT_MARGIN field in customizeSettings() + * method as shown below: + * 

+ * public void customizeSettings(...) {
+ *   if (settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS) {
+ *     consumer.showStandardOptions("RIGHT_MARGIN");
+ *   }
+ * }
+ *
+ * @author Rustam Vishnyakov + */ +public class RightMarginForm { + private JTextField myRightMarginField; + private JCheckBox myDefaultGeneralCheckBox; + private JPanel myTopPanel; + private final Language myLanguage; + private final int myDefaultRightMargin; + + public RightMarginForm(@NotNull Language language, @NotNull CodeStyleSettings settings) { + myLanguage = language; + myDefaultRightMargin = settings.RIGHT_MARGIN; + myDefaultGeneralCheckBox.addChangeListener(new ChangeListener() { + @Override + public void stateChanged(ChangeEvent e) { + if (myDefaultGeneralCheckBox.isSelected()) { + myRightMarginField.setText(Integer.toString(myDefaultRightMargin)); + myRightMarginField.setEnabled(false); + } + else { + myRightMarginField.setEnabled(true); + } + } + }); + } + + public void reset(@NotNull CodeStyleSettings settings) { + CommonCodeStyleSettings langSettings = settings.getCommonSettings(myLanguage); + if (langSettings != settings && langSettings.RIGHT_MARGIN >= 0) { + myDefaultGeneralCheckBox.setSelected(false); + myRightMarginField.setText(Integer.toString(langSettings.RIGHT_MARGIN)); + } + else { + myDefaultGeneralCheckBox.setSelected(true); + myRightMarginField.setText(Integer.toString(settings.RIGHT_MARGIN)); + if (langSettings == settings) { + myDefaultGeneralCheckBox.setEnabled(false); + myRightMarginField.setEnabled(false); + } + } + } + + public void apply(@NotNull CodeStyleSettings settings) { + CommonCodeStyleSettings langSettings = settings.getCommonSettings(myLanguage); + if (langSettings != settings) { + if (myDefaultGeneralCheckBox.isSelected()) { + langSettings.RIGHT_MARGIN = -1; + } + else { + langSettings.RIGHT_MARGIN = getFieldRightMargin(settings.RIGHT_MARGIN); + } + } + } + + public boolean isModified(@NotNull CodeStyleSettings settings) { + CommonCodeStyleSettings langSettings = settings.getCommonSettings(myLanguage); + if (myDefaultGeneralCheckBox.isSelected()) { + return langSettings.RIGHT_MARGIN >= 0; + } + else { + return langSettings.RIGHT_MARGIN != getFieldRightMargin(settings.RIGHT_MARGIN); + } + } + + private int getFieldRightMargin(int fallBackValue) { + String strValue = myRightMarginField.getText(); + if (!strValue.trim().isEmpty()) { + try { + return Integer.parseInt(strValue); + } + catch (NumberFormatException e) { + myRightMarginField.setText(Integer.toString(fallBackValue)); + } + } + return fallBackValue; + } + + public JPanel getTopPanel() { + return myTopPanel; + } +} diff --git a/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.form b/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.form index 01f7df00f6bd..0ddd4cf577f3 100644 --- a/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.form +++ b/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.form @@ -17,7 +17,7 @@ - + @@ -27,14 +27,14 @@ - + - + @@ -43,7 +43,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -277,7 +277,7 @@ - + @@ -336,6 +336,15 @@ + + + + + + + + + diff --git a/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.java b/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.java index ba5a72a80beb..476181ff256d 100644 --- a/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.java +++ b/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.java @@ -15,6 +15,7 @@ */ package com.intellij.application.options; +import com.intellij.application.options.codeStyle.RightMarginForm; import com.intellij.ide.highlighter.XmlHighlighterFactory; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.editor.colors.EditorColorsScheme; @@ -30,6 +31,7 @@ import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ArrayUtil; import com.intellij.util.PlatformIcons; +import com.intellij.util.ui.Centerizer; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -64,6 +66,8 @@ public class CodeStyleHtmlPanel extends CodeStyleAbstractPanel { private JCheckBox myShouldKeepLineBreaksInText; private TextFieldWithBrowseButton myDontBreakIfInlineContent; private JBScrollPane myJBScrollPane; + private JPanel myRightMarginPanel; + private RightMarginForm myRightMarginForm; public CodeStyleHtmlPanel(CodeStyleSettings settings) { super(settings); @@ -95,6 +99,8 @@ public class CodeStyleHtmlPanel extends CodeStyleAbstractPanel { } private void createUIComponents() { + myRightMarginForm = new RightMarginForm(StdFileTypes.HTML.getLanguage(), getSettings()); + myRightMarginPanel = myRightMarginForm.getTopPanel(); myJBScrollPane = new JBScrollPane() { @Override public Dimension getPreferredSize() { @@ -158,6 +164,7 @@ public class CodeStyleHtmlPanel extends CodeStyleAbstractPanel { settings.HTML_KEEP_WHITESPACES_INSIDE = myKeepWhiteSpacesTagNames.getText(); settings.HTML_KEEP_LINE_BREAKS = myShouldKeepBlankLines.isSelected(); settings.HTML_KEEP_LINE_BREAKS_IN_TEXT = myShouldKeepLineBreaksInText.isSelected(); + myRightMarginForm.apply(settings); } private static int getIntValue(JTextField keepBlankLines) { @@ -190,6 +197,7 @@ public class CodeStyleHtmlPanel extends CodeStyleAbstractPanel { myInlineElementsTagNames.setText(settings.HTML_INLINE_ELEMENTS); myDontBreakIfInlineContent.setText(settings.HTML_DONT_ADD_BREAKS_IF_INLINE_CONTENT); myKeepWhiteSpacesTagNames.setText(settings.HTML_KEEP_WHITESPACES_INSIDE); + myRightMarginForm.reset(settings); } @Override @@ -260,7 +268,7 @@ public class CodeStyleHtmlPanel extends CodeStyleAbstractPanel { return true; } - return false; + return myRightMarginForm.isModified(settings); } @Override 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 */ @@ -36,6 +39,14 @@ public class HtmlLanguageCodeStyleSettings extends LanguageCodeStyleSettingsProv return CodeStyleAbstractPanel.readFromFile(this.getClass(), "preview.html.template"); } + @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);