diff options
author | Tor Norbye <tnorbye@google.com> | 2014-07-25 20:12:40 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-24 20:55:36 +0000 |
commit | 6044be7330c93bc8dacb0f63e62da8029f39a16f (patch) | |
tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java | |
parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
parent | e5266e2343c8d275d79fa0be725180d0fe3a993c (diff) | |
download | idea-6044be7330c93bc8dacb0f63e62da8029f39a16f.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java')
-rw-r--r-- | platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java index f7c1fd4c7e2d..2b142a4bffb2 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java @@ -201,7 +201,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable { private int getAdjustedRightMargin() { int result = getRightMargin(); - return result > 0 ? result : CodeStyleFacade.getInstance(ProjectUtil.guessCurrentProject(getPanel())).getRightMargin(); + return result > 0 ? result : CodeStyleFacade.getInstance(ProjectUtil.guessCurrentProject(getPanel())).getRightMargin(getDefaultLanguage()); } protected abstract int getRightMargin(); @@ -226,7 +226,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable { catch (ConfigurationException ignore) { } CodeStyleSettings clone = mySettings.clone(); - clone.RIGHT_MARGIN = getAdjustedRightMargin(); + clone.setRightMargin(getDefaultLanguage(), getAdjustedRightMargin()); CodeStyleSettingsManager.getInstance(project).setTemporarySettings(clone); PsiFile formatted; try { @@ -267,7 +267,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable { Document document = documentManager.getDocument(psiFile); if (document != null) { CodeStyleSettings clone = mySettings.clone(); - clone.RIGHT_MARGIN = getAdjustedRightMargin(); + clone.setRightMargin(getDefaultLanguage(), getAdjustedRightMargin()); CodeStyleSettingsManager.getInstance(project).setTemporarySettings(clone); try { CodeStyleManager.getInstance(project).reformat(psiFile); |