From 6aafd6d1c38b59d5e73ec7c6d0190657fe6aa572 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <ampivovarov@gmail.com>
Date: Fri, 30 Dec 2016 21:44:23 +0300
Subject: [PATCH] IDEA-166058 diff: do not save default settings

* implement equals/hashCode for `PlaceSettings` to be used in `Map.equals()`
---
 .../testSrc/DoNotSaveDefaults.kt              |  1 -
 .../tools/util/base/TextDiffSettingsHolder.kt | 34 +++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/platform/configuration-store-impl/testSrc/DoNotSaveDefaults.kt b/platform/configuration-store-impl/testSrc/DoNotSaveDefaults.kt
index b0103d733490..25a301007743 100644
--- a/platform/configuration-store-impl/testSrc/DoNotSaveDefaults.kt
+++ b/platform/configuration-store-impl/testSrc/DoNotSaveDefaults.kt
@@ -62,7 +62,6 @@ class DoNotSaveDefaultsTest {
       "usage.statistics.xml" /* SHOW_NOTIFICATION_ATTR in internal mode */,
       "feature.usage.statistics.xml" /* non-roamable usage counters */,
       "tomee.extensions.xml", "jboss.extensions.xml", "glassfish.extensions.xml" /* javaee non-roamable stuff, it will be better to fix it */,
-      "diff.xml" /* IDEA-166058 */,
       "dimensions.xml" /* non-roamable sizes of window, dialogs, etc. */,
       "debugger.renderers.xml", "debugger.xml" /* todo */
     ))
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffSettingsHolder.kt b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffSettingsHolder.kt
index 4bed1f880e09..9f8d44d8a53f 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffSettingsHolder.kt
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffSettingsHolder.kt
@@ -42,33 +42,33 @@ class TextDiffSettingsHolder : PersistentStateComponent<TextDiffSettingsHolder.S
     }
   }
 
-  internal class SharedSettings {
+  internal data class SharedSettings(
     // Fragments settings
-    var CONTEXT_RANGE: Int = 4
+    var CONTEXT_RANGE: Int = 4,
 
-    var MERGE_AUTO_APPLY_NON_CONFLICTED_CHANGES: Boolean = false
+    var MERGE_AUTO_APPLY_NON_CONFLICTED_CHANGES: Boolean = false,
     var MERGE_LST_GUTTER_MARKERS: Boolean = true
-  }
+  )
 
-  internal class PlaceSettings {
+  internal data class PlaceSettings(
     // Diff settings
-    var HIGHLIGHT_POLICY: HighlightPolicy = HighlightPolicy.BY_WORD
-    var IGNORE_POLICY: IgnorePolicy = IgnorePolicy.DEFAULT
+    var HIGHLIGHT_POLICY: HighlightPolicy = HighlightPolicy.BY_WORD,
+    var IGNORE_POLICY: IgnorePolicy = IgnorePolicy.DEFAULT,
 
     // Presentation settings
-    var ENABLE_SYNC_SCROLL: Boolean = true
+    var ENABLE_SYNC_SCROLL: Boolean = true,
 
     // Editor settings
-    var SHOW_WHITESPACES: Boolean = false
-    var SHOW_LINE_NUMBERS: Boolean = true
-    var SHOW_INDENT_LINES: Boolean = false
-    var USE_SOFT_WRAPS: Boolean = false
-    var HIGHLIGHTING_LEVEL: HighlightingLevel = HighlightingLevel.INSPECTIONS
-    var READ_ONLY_LOCK: Boolean = true
+    var SHOW_WHITESPACES: Boolean = false,
+    var SHOW_LINE_NUMBERS: Boolean = true,
+    var SHOW_INDENT_LINES: Boolean = false,
+    var USE_SOFT_WRAPS: Boolean = false,
+    var HIGHLIGHTING_LEVEL: HighlightingLevel = HighlightingLevel.INSPECTIONS,
+    var READ_ONLY_LOCK: Boolean = true,
 
     // Fragments settings
     var EXPAND_BY_DEFAULT: Boolean = true
-  }
+  )
 
   class TextDiffSettings internal constructor(val SHARED_SETTINGS: SharedSettings,
                                               val PLACE_SETTINGS: PlaceSettings) {
@@ -160,11 +160,11 @@ class TextDiffSettingsHolder : PersistentStateComponent<TextDiffSettingsHolder.S
 
   class State {
     @MapAnnotation(surroundWithTag = false, surroundKeyWithTag = false, surroundValueWithTag = false)
-    internal var PLACES_MAP: MutableMap<String, PlaceSettings> = defaultPlaceSettings()
+    internal var PLACES_MAP: TreeMap<String, PlaceSettings> = defaultPlaceSettings()
     internal var SHARED_SETTINGS = SharedSettings()
 
     companion object {
-      private fun defaultPlaceSettings(): MutableMap<String, PlaceSettings> {
+      private fun defaultPlaceSettings(): TreeMap<String, PlaceSettings> {
         val map = TreeMap<String, PlaceSettings>()
 
         val changes = PlaceSettings()