From ca23bb270df1401a695f0bfc6d395d93b64cda15 Mon Sep 17 00:00:00 2001
From: "andrey.matveev" <andrey.matveev@jetbrains.com>
Date: Tue, 17 Dec 2019 17:40:37 +0700
Subject: [PATCH] PY-39742 Fix checking show diff enabled

GitOrigin-RevId: cf62cfb4eef59b291be75955b4252617cee9e3e5
---
 .../completion/settings/CompletionMLRankingSettings.java       | 2 +-
 .../src/com/intellij/completion/sorting/MLSorter.kt            | 3 ++-
 .../src/com/intellij/stats/completion/CompletionLoggerImpl.kt  | 3 ++-
 .../stats/completion/ItemsDiffCustomizingContributor.kt        | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/stats-collector/src/com/intellij/completion/settings/CompletionMLRankingSettings.java b/plugins/stats-collector/src/com/intellij/completion/settings/CompletionMLRankingSettings.java
index 89f31c9bdb97..812827d09911 100644
--- a/plugins/stats-collector/src/com/intellij/completion/settings/CompletionMLRankingSettings.java
+++ b/plugins/stats-collector/src/com/intellij/completion/settings/CompletionMLRankingSettings.java
@@ -34,7 +34,7 @@ public class CompletionMLRankingSettings implements PersistentStateComponent<Com
   }
 
   public boolean isShowDiffEnabled() {
-    return myState.showDiff;
+    return myState.showDiff || Registry.is("completion.stats.show.ml.ranking.diff", false);
   }
 
   void setRankingEnabled(boolean value) {
diff --git a/plugins/stats-collector/src/com/intellij/completion/sorting/MLSorter.kt b/plugins/stats-collector/src/com/intellij/completion/sorting/MLSorter.kt
index fb012f8036a7..9e9417b532f4 100644
--- a/plugins/stats-collector/src/com/intellij/completion/sorting/MLSorter.kt
+++ b/plugins/stats-collector/src/com/intellij/completion/sorting/MLSorter.kt
@@ -7,6 +7,7 @@ import com.intellij.codeInsight.completion.CompletionParameters
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.codeInsight.lookup.LookupManager
 import com.intellij.codeInsight.lookup.impl.LookupImpl
+import com.intellij.completion.settings.CompletionMLRankingSettings
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.util.Pair
 import com.intellij.openapi.util.registry.Registry
@@ -180,7 +181,7 @@ class MLSorter : CompletionFinalSorter() {
   }
 
   private fun Iterable<LookupElement>.addDiagnosticsIfNeeded(positionsBefore: Map<LookupElement, Int>, reordered: Int): Iterable<LookupElement> {
-    if (Registry.`is`("completion.stats.show.ml.ranking.diff")) {
+    if (CompletionMLRankingSettings.getInstance().isShowDiffEnabled) {
       this.forEachIndexed { position, element ->
         val before = positionsBefore.getValue(element)
         if (before < reordered || position < reordered) {
diff --git a/plugins/stats-collector/src/com/intellij/stats/completion/CompletionLoggerImpl.kt b/plugins/stats-collector/src/com/intellij/stats/completion/CompletionLoggerImpl.kt
index 5251cb8e0f06..544e4969e15a 100644
--- a/plugins/stats-collector/src/com/intellij/stats/completion/CompletionLoggerImpl.kt
+++ b/plugins/stats-collector/src/com/intellij/stats/completion/CompletionLoggerImpl.kt
@@ -3,6 +3,7 @@ package com.intellij.stats.completion
 
 
 import com.intellij.codeInsight.lookup.impl.LookupImpl
+import com.intellij.completion.settings.CompletionMLRankingSettings
 import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.ide.ui.UISettings
 import com.intellij.openapi.util.registry.Registry
@@ -49,7 +50,7 @@ class CompletionFileLogger(private val installationUID: String,
         event.isAutoPopup = CompletionUtil.getCurrentCompletionParameters()?.isAutoPopup
         event.fillCompletionParameters()
         event.additionalDetails["alphabetical"] = UISettings.instance.sortLookupElementsLexicographically.toString()
-        if (Registry.`is`("completion.stats.show.ml.ranking.diff", false)) {
+        if (CompletionMLRankingSettings.getInstance().isShowDiffEnabled) {
             event.additionalDetails["diff"] = "1"
         }
 
diff --git a/plugins/stats-collector/src/com/intellij/stats/completion/ItemsDiffCustomizingContributor.kt b/plugins/stats-collector/src/com/intellij/stats/completion/ItemsDiffCustomizingContributor.kt
index 5590b50cc774..d6b07067dbf3 100644
--- a/plugins/stats-collector/src/com/intellij/stats/completion/ItemsDiffCustomizingContributor.kt
+++ b/plugins/stats-collector/src/com/intellij/stats/completion/ItemsDiffCustomizingContributor.kt
@@ -35,7 +35,7 @@ class ItemsDiffCustomizingContributor : CompletionContributor() {
 
   private fun shouldShowDiff(parameters: CompletionParameters): Boolean {
     val mlRankingSettings = CompletionMLRankingSettings.getInstance()
-    if (!mlRankingSettings.isShowDiffEnabled && !Registry.`is`("completion.stats.show.ml.ranking.diff")) return false
+    if (!mlRankingSettings.isShowDiffEnabled) return false
     if (!mlRankingSettings.isRankingEnabled) return false
     val lookup = LookupManager.getActiveLookup(parameters.editor) as? LookupImpl ?: return false
     return LookupStorage.get(lookup)?.model != null