From c96233b030d84a9316613323fdab0413180b6ddf Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Wed, 8 Aug 2018 17:29:42 +0300
Subject: [PATCH] SettingsImpl cleanup

---
 .../src/com/intellij/openapi/editor/impl/EditorImpl.java | 2 +-
 .../com/intellij/openapi/editor/impl/SettingsImpl.java   | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
index 9903d826f9ba..17b477571787 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
@@ -345,7 +345,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
     myScrollPane = new MyScrollPane(); // create UI after scheme initialization
     myIsViewer = viewer;
     myKind = kind;
-    mySettings = new SettingsImpl(this, project, kind);
+    mySettings = new SettingsImpl(this, kind);
     if (!mySettings.isUseSoftWraps() && shouldSoftWrapsBeForced()) {
       mySettings.setUseSoftWrapsQuiet();
       putUserData(FORCED_SOFT_WRAPS, Boolean.TRUE);
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 7cbd1120711a..2fba18e7f8d9 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
@@ -34,7 +34,7 @@ public class SettingsImpl implements EditorSettings {
   private Boolean myIsCamelWords;
 
   // This group of settings does not have UI
-  private SoftWrapAppliancePlaces mySoftWrapAppliancePlace        = SoftWrapAppliancePlaces.MAIN_EDITOR;
+  private final SoftWrapAppliancePlaces mySoftWrapAppliancePlace;
   private int                     myAdditionalLinesCount          = Registry.intValue("editor.virtual.lines", 5);
   private int                     myAdditionalColumnsCount        = 3;
   private int                     myLineCursorWidth               = EditorUtil.getDefaultCaretWidth();
@@ -83,10 +83,10 @@ public class SettingsImpl implements EditorSettings {
   private List<Integer> mySoftMargins = null;
   
   public SettingsImpl() {
-    this(null, null, null);
+    this(null, null);
   }
 
-  SettingsImpl(@Nullable EditorEx editor, @Nullable Project project, @Nullable EditorKind kind) {
+  SettingsImpl(@Nullable EditorEx editor, @Nullable EditorKind kind) {
     myEditor = editor;
     if (EditorKind.CONSOLE.equals(kind)) {
       mySoftWrapAppliancePlace = SoftWrapAppliancePlaces.CONSOLE;
@@ -94,6 +94,9 @@ public class SettingsImpl implements EditorSettings {
     else if (EditorKind.PREVIEW.equals(kind)) {
       mySoftWrapAppliancePlace = SoftWrapAppliancePlaces.PREVIEW;
     }
+    else {
+      mySoftWrapAppliancePlace = SoftWrapAppliancePlaces.MAIN_EDITOR;
+    }
   }
   
   @Override