From 5b27be0ac37f9649c9b1cf701e3efaa5981a9beb Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Wed, 6 Jul 2016 18:44:44 +0300 Subject: [PATCH] IDEA-158213 Inconsistent soft wraps all state --- .../actions/AbstractToggleUseSoftWrapsAction.java | 4 ++-- .../actions/ToggleUseSoftWrapsInPreviewAction.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/AbstractToggleUseSoftWrapsAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/AbstractToggleUseSoftWrapsAction.java index 8e5a9203b7a3..a9846a4d69c9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/AbstractToggleUseSoftWrapsAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/AbstractToggleUseSoftWrapsAction.java @@ -71,9 +71,9 @@ public abstract class AbstractToggleUseSoftWrapsAction extends ToggleAction impl @Override public boolean isSelected(AnActionEvent e) { + if (myGlobal) return EditorSettingsExternalizable.getInstance().isUseSoftWraps(myAppliancePlace); Editor editor = getEditor(e); - if (editor != null) return editor.getSettings().isUseSoftWraps(); - else return myGlobal && EditorSettingsExternalizable.getInstance().isUseSoftWraps(myAppliancePlace); + return editor != null && editor.getSettings().isUseSoftWraps(); } @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleUseSoftWrapsInPreviewAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleUseSoftWrapsInPreviewAction.java index b8a668e66bc5..6dcfbdc28826 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleUseSoftWrapsInPreviewAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleUseSoftWrapsInPreviewAction.java @@ -15,10 +15,21 @@ */ package com.intellij.openapi.editor.actions; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.editor.ex.EditorSettingsExternalizable; import com.intellij.openapi.editor.impl.softwrap.SoftWrapAppliancePlaces; public class ToggleUseSoftWrapsInPreviewAction extends AbstractToggleUseSoftWrapsAction { public ToggleUseSoftWrapsInPreviewAction() { super(SoftWrapAppliancePlaces.PREVIEW, true); } + + @Override + public boolean isSelected(AnActionEvent e) { + Editor editor = getEditor(e); + return editor == null + ? EditorSettingsExternalizable.getInstance().isUseSoftWraps(SoftWrapAppliancePlaces.PREVIEW) + : editor.getSettings().isUseSoftWraps(); + } }