From 7011eebe8775efcdd2aade7e2db433b082292f16 Mon Sep 17 00:00:00 2001
From: "Svetlana.Zemlyanskaya" <svetlana.zemlyanskaya@jetbrains.com>
Date: Wed, 25 Jul 2018 16:19:58 +0200
Subject: [PATCH] FUS: revert filtering for toolwindows from third-party
 plugins

Dynamically registered toolwindows are reported as coming from third-party plugins.
It's unexpected because some core toolbars use this dynamic approach.
Revert 93595f2 till we come up with a better solution.
---
 .../persistence/ToolWindowCollector.java      | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ToolWindowCollector.java b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ToolWindowCollector.java
index b9450822e37c..8b36087c0519 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ToolWindowCollector.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ToolWindowCollector.java
@@ -1,15 +1,10 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.internal.statistic.collectors.fus.actions.persistence;
 
-import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.internal.statistic.beans.ConvertUsagesUtil;
 import com.intellij.internal.statistic.eventLog.FeatureUsageLogger;
 import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent;
-import com.intellij.internal.statistic.utils.StatisticsUtilKt;
 import com.intellij.openapi.components.*;
-import com.intellij.openapi.extensions.PluginId;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.wm.ToolWindowEP;
 import com.intellij.util.xmlb.annotations.MapAnnotation;
 import com.intellij.util.xmlb.annotations.Tag;
 import org.jetbrains.annotations.NotNull;
@@ -28,8 +23,6 @@ import java.util.Map;
   }
 )
 public class ToolWindowCollector implements PersistentStateComponent<ToolWindowCollector.State> {
-  private static final String DEFAULT_ID = "third.party.plugin.toolwindow";
-
   public static ToolWindowCollector getInstance() {
     return ServiceManager.getService(ToolWindowCollector.class);
   }
@@ -48,24 +41,13 @@ public class ToolWindowCollector implements PersistentStateComponent<ToolWindowC
     State state = getState();
     if (state == null) return;
 
-    boolean isJB = isDevelopedByJetBrains(toolWindowId);
-    final String key = ConvertUsagesUtil.escapeDescriptorName((isJB ? toolWindowId : DEFAULT_ID) + "_by_" + source);
+    final String key = ConvertUsagesUtil.escapeDescriptorName(toolWindowId + "_by_" + source);
     FeatureUsageLogger.INSTANCE.log("toolwindow", key);
     final Integer count = state.myValues.get(key);
     int value = count == null ? 1 : count + 1;
     state.myValues.put(key, value);
   }
 
-  public static boolean isDevelopedByJetBrains(@NotNull String toolWindowId) {
-    for (ToolWindowEP ep : ToolWindowEP.EP_NAME.getExtensions()) {
-      if (StringUtil.equals(toolWindowId, ep.id)) {
-        final PluginId id = StringUtil.isNotEmpty(ep.factoryClass) ? PluginManagerCore.getPluginByClassName(ep.factoryClass) : null;
-        return StatisticsUtilKt.isDevelopedByJetBrains(id);
-      }
-    }
-    return false;
-  }
-
   private State myState = new State();
 
   @Nullable