diff --git a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java index ae858bb077f0..78c2b78ff8d6 100644 --- a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java +++ b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java @@ -72,7 +72,6 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett } else if (settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS) { consumer.showStandardOptions("RIGHT_MARGIN", - "WRAP_ON_TYPING", "KEEP_CONTROL_STATEMENT_IN_ONE_LINE", "LINE_COMMENT_AT_FIRST_COLUMN", "BLOCK_COMMENT_AT_FIRST_COLUMN", diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java index 8bf85e2b3e12..2b2b110514a6 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java @@ -266,11 +266,6 @@ public class CodeStyleSettings extends CommonCodeStyleSettings implements Clonea */ @Deprecated public int RIGHT_MARGIN = 120; - /** - * @deprecated Use isWrapOnTyping(Language) instead or setWrapOnTyping(Language,boolean) for testing purposes. - * @see #isWrapOnTyping(Language) - * @see #setWrapOnTyping(Language, boolean) - */ public boolean WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = false; @@ -962,35 +957,4 @@ public class CodeStyleSettings extends CommonCodeStyleSettings implements Clonea public void setDefaultRightMargin(int rightMargin) { RIGHT_MARGIN = rightMargin; } - - /** - * Defines whether or not wrapping should occur when typing reaches right margin. - * @param language The language to check the option for or null for a global option. - * @return True if wrapping on right margin is enabled. - */ - public boolean isWrapOnTyping(@Nullable Language language) { - if (language != null) { - CommonCodeStyleSettings langSettings = getCommonSettings(language); - if (langSettings != null) { - if (langSettings.WRAP_ON_TYPING != WrapOnTyping.UNDEFINED.intValue) { - return langSettings.WRAP_ON_TYPING == WrapOnTyping.WRAP.intValue; - } - } - } - //noinspection deprecation - return WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN; - } - - @TestOnly - public void setWrapOnTyping(@Nullable Language language, boolean wrapOnTyping) { - if (language != null) { - CommonCodeStyleSettings langSettings = getCommonSettings(language); - if (langSettings != null) { - langSettings.WRAP_ON_TYPING = wrapOnTyping ? WrapOnTyping.WRAP.intValue : WrapOnTyping.NO_WRAP.intValue; - return; - } - } - //noinspection deprecation - WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = wrapOnTyping; - } } diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsCustomizable.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsCustomizable.java index ce71e8e4a5c7..5ddf99d92b58 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsCustomizable.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsCustomizable.java @@ -113,7 +113,6 @@ public interface CodeStyleSettingsCustomizable { enum WrappingOrBraceOption { RIGHT_MARGIN, - WRAP_ON_TYPING, KEEP_CONTROL_STATEMENT_IN_ONE_LINE, LINE_COMMENT_AT_FIRST_COLUMN, BLOCK_COMMENT_AT_FIRST_COLUMN, diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java index 29ce4da8cd81..6c01003b365d 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java @@ -890,24 +890,6 @@ public class CommonCodeStyleSettings { public int FORCE_REARRANGE_MODE = REARRANGE_ACCORDIND_TO_DIALOG; - public enum WrapOnTyping { - UNDEFINED (-1), - NO_WRAP (0), - WRAP (1); - - public int intValue; - - WrapOnTyping(int i) { - this.intValue = i; - } - } - - /** - * Defines if wrapping should occur when typing reaches right margin. Do not refer to this field directly, use - * CodeStyleSettings.isWrapOnTyping(Language) method instead. - * @see CodeStyleSettings#isWrapOnTyping(Language) - */ - public int WRAP_ON_TYPING = WrapOnTyping.UNDEFINED.intValue; //-------------------------Indent options------------------------------------------------- public static class IndentOptions implements JDOMExternalizable, Cloneable { diff --git a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java index 8722ac1fb895..c49104a10dda 100644 --- a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java @@ -158,7 +158,6 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel { settings.LINE_SEPARATOR = getSelectedLineSeparator(); settings.setDefaultRightMargin(((Number) myRightMarginSpinner.getValue()).intValue()); - //noinspection deprecation settings.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = myCbWrapWhenTypingReachesRightMargin.isSelected(); myIndentOptionsEditor.setEnabled(true); myIndentOptionsEditor.apply(settings, settings.OTHER_INDENT_OPTIONS); @@ -224,7 +223,6 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel { return true; } - //noinspection deprecation if (settings.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN ^ myCbWrapWhenTypingReachesRightMargin.isSelected()) { return true; } @@ -281,7 +279,6 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel { } myRightMarginSpinner.setValue(settings.getDefaultRightMargin()); - //noinspection deprecation myCbWrapWhenTypingReachesRightMargin.setSelected(settings.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN); myIndentOptionsEditor.reset(settings, settings.OTHER_INDENT_OPTIONS); myIndentOptionsEditor.setEnabled(true); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java index 8f9794b3793a..10fd6fc2d65c 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java @@ -31,7 +31,6 @@ import com.intellij.ui.treeStructure.treetable.TreeTableModel; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.AbstractTableCellEditor; import com.intellij.util.ui.ColumnInfo; -import com.intellij.util.ui.ThreeStateCheckBox; import com.intellij.util.ui.UIUtil; import gnu.trove.THashMap; import gnu.trove.THashSet; @@ -352,11 +351,6 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo myOptions.add(new BooleanOption(null, fieldName, title, groupName, null, null)); } - protected void addOption( - @NotNull String filedName, @NotNull String title, @Nullable String groupName, int undefinedValue, int falseValue, int trueValue) { - myOptions.add(new TriStateOption(null, filedName, title, groupName, null, null, undefinedValue, falseValue, trueValue)); - } - protected void addOption(@NotNull String fieldName, @NotNull String title, @Nullable String groupName, @NotNull String[] options, @NotNull int[] values) { myOptions.add(new SelectionOption(null, fieldName, title, groupName, null, null, options, values)); @@ -437,61 +431,6 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo } } - - private class TriStateOption extends Option { - - private int myUndefinedValue; - private int myFalseValue; - private int myTrueValue; - - public TriStateOption(@Nullable Class clazz, - @NotNull String fieldName, - @NotNull String title, - @Nullable String groupName, - @Nullable OptionAnchor anchor, - @Nullable String anchorFiledName, - int undefinedValue, - int falseValue, - int trueValue) { - super(clazz, fieldName, title, groupName, anchor, anchorFiledName); - myUndefinedValue = undefinedValue; - myFalseValue = falseValue; - myTrueValue = trueValue; - } - - @Override - public Object getValue(CodeStyleSettings settings) { - try { - int value = field.getInt(getSettings(settings)); - return getState(value); - } - catch (IllegalAccessException e) { - return null; - } - } - - @Override - public void setValue(Object value, CodeStyleSettings settings) { - try { - int intValue = - ThreeStateCheckBox.State.DONT_CARE.equals(value) ? myUndefinedValue : - ThreeStateCheckBox.State.SELECTED.equals(value) ? myTrueValue : myFalseValue; - field.setInt(getSettings(settings), intValue); - } - catch (IllegalAccessException ignored) { - } - } - - public ThreeStateCheckBox.State getState(Object value) { - if (value instanceof Integer) { - if (value.equals(myTrueValue)) return ThreeStateCheckBox.State.SELECTED; - if (value.equals(myFalseValue)) return ThreeStateCheckBox.State.NOT_SELECTED; - } - return ThreeStateCheckBox.State.DONT_CARE; - } - } - - private class SelectionOption extends Option { @NotNull final String[] options; @NotNull final int[] values; @@ -746,7 +685,6 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo private final JCheckBox myCheckBox = new JBCheckBox(); private final JPanel myEmptyLabel = new JPanel(); private final JLabel myIntLabel = new JLabel(); - private final ThreeStateCheckBox myTriStateCheckBox = new ThreeStateCheckBox(); @NotNull @Override @@ -787,10 +725,6 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo myIntLabel.setText(value.toString()); return myIntLabel; } - else if (value instanceof ThreeStateCheckBox.State) { - myTriStateCheckBox.setState((ThreeStateCheckBox.State)value); - return myTriStateCheckBox; - } myCheckBox.putClientProperty("JComponent.sizeVariant", "small"); myComboBox.putClientProperty("JComponent.sizeVariant", "small"); @@ -849,7 +783,6 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo private final JCheckBox myBooleanEditor = new JBCheckBox(); private JBComboBoxTableCellEditorComponent myOptionsEditor = new JBComboBoxTableCellEditorComponent(); private MyIntOptionEditor myIntOptionsEditor = new MyIntOptionEditor(); - private ThreeStateCheckBox myTriStateOptionsEditor = new ThreeStateCheckBox(); private Component myCurrentEditor = null; private MyTreeNode myCurrentNode = null; @@ -865,7 +798,6 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo }; myBooleanEditor.addActionListener(itemChoosen); myOptionsEditor.addActionListener(itemChoosen); - myTriStateOptionsEditor.addActionListener(itemChoosen); myBooleanEditor.putClientProperty("JComponent.sizeVariant", "small"); myOptionsEditor.putClientProperty("JComponent.sizeVariant", "small"); } @@ -887,9 +819,6 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo else if (myCurrentEditor == myIntOptionsEditor) { return myIntOptionsEditor.getPresentableValue(); } - else if (myCurrentEditor == myTriStateOptionsEditor) { - return myTriStateOptionsEditor.getState(); - } return null; } @@ -917,11 +846,6 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo myIntOptionsEditor.setDefaultValue(intOption.getDefaultValue()); myIntOptionsEditor.setDefaultValueText(intOption.getDefaultValueText()); } - else if (node.getKey() instanceof TriStateOption) { - TriStateOption triStateOption = (TriStateOption)node.getKey(); - myCurrentEditor = myTriStateOptionsEditor; - myTriStateOptionsEditor.setState(triStateOption.getState(node.getValue())); - } else { myCurrentEditor = myOptionsEditor; myOptionsEditor.setCell(table, row, column); 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 index e43ff8a64b7e..6a888eae4be0 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.form +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.form @@ -1,7 +1,7 @@
- - + + @@ -18,7 +18,7 @@ - + @@ -39,14 +39,6 @@ - - - - - - - - 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 index 24fc397b5562..0759052ee623 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.java @@ -16,10 +16,8 @@ package com.intellij.application.options.codeStyle; import com.intellij.lang.Language; -import com.intellij.openapi.application.ApplicationBundle; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; -import com.intellij.util.ui.ThreeStateCheckBox; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -45,7 +43,6 @@ public class RightMarginForm { private JTextField myRightMarginField; private JCheckBox myDefaultGeneralCheckBox; private JPanel myTopPanel; - private JCheckBox myWrapOnTypingCheckBox; private final Language myLanguage; private final int myDefaultRightMargin; @@ -80,22 +77,6 @@ public class RightMarginForm { myRightMarginField.setEnabled(false); } } - if (langSettings != settings) { - if (CommonCodeStyleSettings.WrapOnTyping.WRAP.intValue == langSettings.WRAP_ON_TYPING) { - ((ThreeStateCheckBox)myWrapOnTypingCheckBox).setState(ThreeStateCheckBox.State.SELECTED); - } - else if (CommonCodeStyleSettings.WrapOnTyping.NO_WRAP.intValue == langSettings.WRAP_ON_TYPING) { - ((ThreeStateCheckBox)myWrapOnTypingCheckBox).setState(ThreeStateCheckBox.State.NOT_SELECTED); - } - else { - ((ThreeStateCheckBox)myWrapOnTypingCheckBox).setState(ThreeStateCheckBox.State.DONT_CARE); - } - } - else { - ((ThreeStateCheckBox)myWrapOnTypingCheckBox) - .setState(settings.isWrapOnTyping(myLanguage) ? ThreeStateCheckBox.State.SELECTED : ThreeStateCheckBox.State.NOT_SELECTED); - myWrapOnTypingCheckBox.setEnabled(false); - } } public void apply(@NotNull CodeStyleSettings settings) { @@ -107,26 +88,17 @@ public class RightMarginForm { else { langSettings.RIGHT_MARGIN = getFieldRightMargin(settings.getDefaultRightMargin()); } - langSettings.WRAP_ON_TYPING = getWrapOnTypingIntValue(); } } public boolean isModified(@NotNull CodeStyleSettings settings) { CommonCodeStyleSettings langSettings = settings.getCommonSettings(myLanguage); - boolean isRightMarginChanged = - myDefaultGeneralCheckBox.isSelected() ? - langSettings.RIGHT_MARGIN >= 0 : - langSettings.RIGHT_MARGIN != getFieldRightMargin(settings.getDefaultRightMargin()); - return isRightMarginChanged || getWrapOnTypingIntValue() != langSettings.WRAP_ON_TYPING; - } - - private int getWrapOnTypingIntValue() { - ThreeStateCheckBox.State state = ((ThreeStateCheckBox)myWrapOnTypingCheckBox).getState(); - return - ThreeStateCheckBox.State.SELECTED.equals(state) ? CommonCodeStyleSettings.WrapOnTyping.WRAP.intValue : - ThreeStateCheckBox.State.NOT_SELECTED.equals(state) ? CommonCodeStyleSettings.WrapOnTyping.NO_WRAP.intValue : - CommonCodeStyleSettings.WrapOnTyping.UNDEFINED.intValue; - + if (myDefaultGeneralCheckBox.isSelected()) { + return langSettings.RIGHT_MARGIN >= 0; + } + else { + return langSettings.RIGHT_MARGIN != getFieldRightMargin(settings.getDefaultRightMargin()); + } } private int getFieldRightMargin(int fallBackValue) { @@ -145,8 +117,4 @@ public class RightMarginForm { public JPanel getTopPanel() { return myTopPanel; } - - private void createUIComponents() { - myWrapOnTypingCheckBox = new ThreeStateCheckBox(ApplicationBundle.message("wrapping.wrap.on.typing")); - } } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesPanel.java index 5f92c35e61b6..098bd5b5f7aa 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/WrappingAndBracesPanel.java @@ -17,7 +17,6 @@ package com.intellij.application.options.codeStyle; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.psi.codeStyle.CodeStyleSettings; -import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; @@ -59,27 +58,9 @@ public class WrappingAndBracesPanel extends OptionTableWithPreviewPanel { } } - @Override - protected void addOption(@NotNull String fieldName, - @NotNull String title, - @Nullable String groupName, - int minValue, - int maxValue, - int defaultValue, - String defaultValueText) { - super.addOption(fieldName, title, groupName, minValue, maxValue, defaultValue, defaultValueText); - if (groupName != null) { - myGroupToFields.putValue(groupName, fieldName); - } - } - @Override protected void initTables() { addOption("RIGHT_MARGIN", ApplicationBundle.message("editbox.right.margin.columns"), null, 0, 999, -1, ApplicationBundle.message("settings.code.style.default.general")); - addOption("WRAP_ON_TYPING", ApplicationBundle.message("wrapping.wrap.on.typing"), null, - CommonCodeStyleSettings.WrapOnTyping.UNDEFINED.intValue, - CommonCodeStyleSettings.WrapOnTyping.NO_WRAP.intValue, - CommonCodeStyleSettings.WrapOnTyping.WRAP.intValue); addOption("KEEP_LINE_BREAKS", ApplicationBundle.message("wrapping.keep.line.breaks"), WRAPPING_KEEP); addOption("KEEP_FIRST_COLUMN_COMMENT", ApplicationBundle.message("wrapping.keep.comment.at.first.column"), WRAPPING_KEEP); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java index 04916af5377f..6184c6741236 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/AutoHardWrapHandler.java @@ -17,7 +17,6 @@ package com.intellij.codeInsight.editorActions; import com.intellij.codeInsight.template.TemplateManager; import com.intellij.formatting.FormatConstants; -import com.intellij.lang.Language; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.formatter.WhiteSpaceFormattingStrategy; import com.intellij.ide.DataManager; @@ -48,7 +47,7 @@ public class AutoHardWrapHandler { /** * This key is used as a flag that indicates if 'auto wrap line on typing' activity is performed now. * - * @see CodeStyleSettings#isWrapOnTyping(Language) + * @see CodeStyleSettings#WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN */ public static final Key AUTO_WRAP_LINE_IN_PROGRESS_KEY = new Key("AUTO_WRAP_LINE_IN_PROGRESS"); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleFacadeImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleFacadeImpl.java index ea56724d4d17..81eda35222dd 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleFacadeImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleFacadeImpl.java @@ -74,17 +74,10 @@ public class CodeStyleFacadeImpl extends CodeStyleFacade { } @Override - @Deprecated public boolean isWrapWhenTypingReachesRightMargin() { - //noinspection deprecation return CodeStyleSettingsManager.getSettings(myProject).WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN; } - @Override - public boolean isWrapOnTyping(@Nullable Language language) { - return CodeStyleSettingsManager.getSettings(myProject).isWrapOnTyping(language); - } - @Override public int getTabSize(final FileType fileType) { return CodeStyleSettingsManager.getSettings(myProject).getTabSize(fileType); diff --git a/platform/platform-api/src/com/intellij/codeStyle/CodeStyleFacade.java b/platform/platform-api/src/com/intellij/codeStyle/CodeStyleFacade.java index c3c4c36ac0ad..0bc7ed42febb 100644 --- a/platform/platform-api/src/com/intellij/codeStyle/CodeStyleFacade.java +++ b/platform/platform-api/src/com/intellij/codeStyle/CodeStyleFacade.java @@ -56,17 +56,8 @@ public abstract class CodeStyleFacade { public abstract int getRightMargin(Language language); - /** - * @return True if wrap on typing is enabled - * @deprecated Use isWrapOnTyping(language) instead - */ public abstract boolean isWrapWhenTypingReachesRightMargin(); - @SuppressWarnings("deprecation") - public boolean isWrapOnTyping(@Nullable Language language) { - return isWrapWhenTypingReachesRightMargin(); - } - public abstract int getTabSize(final FileType fileType); public abstract boolean useTabCharacter(final FileType fileType); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SettingsImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SettingsImpl.java index 3ab014cb4344..ed14e128a804 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SettingsImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SettingsImpl.java @@ -213,7 +213,7 @@ public class SettingsImpl implements EditorSettings { public boolean isWrapWhenTypingReachesRightMargin(Project project) { return myWrapWhenTypingReachesRightMargin != null ? myWrapWhenTypingReachesRightMargin.booleanValue() : - CodeStyleFacade.getInstance(project).isWrapOnTyping(myLanguage); + CodeStyleFacade.getInstance(project).isWrapWhenTypingReachesRightMargin(); } @Override diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index 4acd697bb0f6..bd6fdca56f44 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -223,7 +223,6 @@ wrapping.long.lines=Ensure right margin is not exceeded wrapping.comments=Comments wrapping.comments.wrap.at.right.margin=Wrap at right margin wrapping.annotation.parameters=Annotation parameters -wrapping.wrap.on.typing=Wrap on typing checkbox.align.multiline.chained.methods=Chained methods checkbox.align.multiline.method.parameters=Method parameters diff --git a/python/testSrc/com/jetbrains/python/PyWrapTest.java b/python/testSrc/com/jetbrains/python/PyWrapTest.java index eac94f185dfa..4146391ea5d8 100644 --- a/python/testSrc/com/jetbrains/python/PyWrapTest.java +++ b/python/testSrc/com/jetbrains/python/PyWrapTest.java @@ -32,9 +32,9 @@ public class PyWrapTest extends PyTestCase { super.setUp(); final CodeStyleSettings settings = CodeStyleSettingsManager.getInstance(myFixture.getProject()).getCurrentSettings(); final CommonCodeStyleSettings pythonSettings = settings.getCommonSettings(PythonLanguage.getInstance()); - myOldWrap = settings.isWrapOnTyping(PythonLanguage.getInstance()); + myOldWrap = settings.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN; myOldMargin = pythonSettings.RIGHT_MARGIN; - settings.setWrapOnTyping(PythonLanguage.getInstance(), true); + settings.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = true; pythonSettings.RIGHT_MARGIN = 80; } @@ -42,7 +42,7 @@ public class PyWrapTest extends PyTestCase { protected void tearDown() throws Exception { final CodeStyleSettings settings = CodeStyleSettingsManager.getInstance(myFixture.getProject()).getCurrentSettings(); final CommonCodeStyleSettings pythonSettings = settings.getCommonSettings(PythonLanguage.getInstance()); - settings.setWrapOnTyping(PythonLanguage.getInstance(), myOldWrap); + settings.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = myOldWrap; pythonSettings.RIGHT_MARGIN = myOldMargin; super.tearDown(); } @@ -76,9 +76,9 @@ public class PyWrapTest extends PyTestCase { final CodeStyleSettings settings = CodeStyleSettingsManager.getInstance(myFixture.getProject()).getCurrentSettings(); final CommonCodeStyleSettings pythonSettings = settings.getCommonSettings(PythonLanguage.getInstance()); int oldValue = pythonSettings.RIGHT_MARGIN; - boolean oldMarginValue = settings.isWrapOnTyping(PythonLanguage.getInstance()); + boolean oldMarginValue = settings.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN; pythonSettings.RIGHT_MARGIN = 100; - settings.setWrapOnTyping(PythonLanguage.getInstance(), true); + settings.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = true; try { final String testName = "wrap/" + getTestName(true); myFixture.configureByFile(testName + ".py"); @@ -89,7 +89,7 @@ public class PyWrapTest extends PyTestCase { } finally { pythonSettings.RIGHT_MARGIN = oldValue; - settings.setWrapOnTyping(PythonLanguage.getInstance(), oldMarginValue); + settings.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = oldMarginValue; } } diff --git a/xml/impl/src/com/intellij/application/options/HtmlLanguageCodeStyleSettings.java b/xml/impl/src/com/intellij/application/options/HtmlLanguageCodeStyleSettings.java index 29f8d8359ce6..f84b325df90d 100644 --- a/xml/impl/src/com/intellij/application/options/HtmlLanguageCodeStyleSettings.java +++ b/xml/impl/src/com/intellij/application/options/HtmlLanguageCodeStyleSettings.java @@ -42,7 +42,6 @@ public class HtmlLanguageCodeStyleSettings extends LanguageCodeStyleSettingsProv @NotNull SettingsType settingsType) { if (settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS) { consumer.showStandardOptions("RIGHT_MARGIN"); - consumer.showStandardOptions("WRAP_ON_TYPING"); } } diff --git a/xml/impl/src/com/intellij/application/options/XmlLanguageCodeStyleSettingsProvider.java b/xml/impl/src/com/intellij/application/options/XmlLanguageCodeStyleSettingsProvider.java index b75beb28eb5b..89311331d59b 100644 --- a/xml/impl/src/com/intellij/application/options/XmlLanguageCodeStyleSettingsProvider.java +++ b/xml/impl/src/com/intellij/application/options/XmlLanguageCodeStyleSettingsProvider.java @@ -46,7 +46,6 @@ public class XmlLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSetti @NotNull SettingsType settingsType) { if (settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS) { consumer.showStandardOptions("RIGHT_MARGIN"); - consumer.showStandardOptions("WRAP_ON_TYPING"); } } diff --git a/xml/tests/src/com/intellij/editor/XmlEditorTest.java b/xml/tests/src/com/intellij/editor/XmlEditorTest.java index 1067217f23a5..ae6ad3c47416 100644 --- a/xml/tests/src/com/intellij/editor/XmlEditorTest.java +++ b/xml/tests/src/com/intellij/editor/XmlEditorTest.java @@ -55,7 +55,7 @@ public class XmlEditorTest extends LightCodeInsightTestCase { ""); CodeStyleSettings clone = CodeStyleSettingsManager.getInstance(getProject()).getCurrentSettings().clone(); - clone.setWrapOnTyping(null, true); + clone.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = true; try { CodeStyleSettingsManager.getInstance(getProject()).setTemporarySettings(clone); EditorTestUtil.performTypingAction(getEditor(), 'x'); @@ -77,7 +77,7 @@ public class XmlEditorTest extends LightCodeInsightTestCase { ""); CodeStyleSettings clone = CodeStyleSettingsManager.getInstance(getProject()).getCurrentSettings().clone(); - clone.setWrapOnTyping(null, true); + clone.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = true; try { CodeStyleSettingsManager.getInstance(getProject()).setTemporarySettings(clone); EditorTestUtil.performTypingAction(getEditor(), '?');