Extract a single Dumb event field and use it everywhere

GitOrigin-RevId: a21dcd2dff36a11ae22c851985cf9eb4257d8a88
2025-12-16 14:23:28 +07:00 · 2024-09-01 14:03:07 +02:00
parent 2204c407e9
commit eb41da040e
7 changed files with 20 additions and 25 deletions
--- a/platform/execution-impl/src/com/intellij/execution/impl/statistics/RunConfigurationUsageTriggerCollector.java
+++ b/platform/execution-impl/src/com/intellij/execution/impl/statistics/RunConfigurationUsageTriggerCollector.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.execution.impl.statistics;

 import com.intellij.execution.EnvFilesOptions;
@@ -42,7 +42,6 @@ public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCo
                                                                                           RunConfigurationExecutorUtilValidator.class);
  private static final BooleanEventField IS_RERUN = EventFields.Boolean("is_rerun");
  private static final BooleanEventField IS_RUNNING_CURRENT_FILE = EventFields.Boolean("is_running_current_file");
-  private static final BooleanEventField IS_DUMB_MODE = EventFields.Boolean("dumb");
  private static final BooleanEventField IS_SERVICE_VIEW = EventFields.Boolean("service_view");

  /**
@@ -70,7 +69,7 @@ public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCo
      RunConfigurationTypeUsagesCollector.ID_FIELD,
      EventFields.PluginInfo,
      ENV_FILES_COUNT,
-      IS_DUMB_MODE,
+      EventFields.Dumb,
      IS_SERVICE_VIEW
    },
    new EventField<?>[]{FINISH_TYPE},
@@ -130,7 +129,7 @@ public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCo
    eventPairs.add(EXECUTOR.with(group != null ? group.getId() : executor.getId()));
    eventPairs.add(IS_RERUN.with(isRerun));
    eventPairs.add(IS_RUNNING_CURRENT_FILE.with(isRunningCurrentFile));
-    eventPairs.add(IS_DUMB_MODE.with(isDumb));
+    eventPairs.add(EventFields.Dumb.with(isDumb));
    eventPairs.add(IS_SERVICE_VIEW.with(isServiceView));

    if (runConfiguration instanceof FusAwareRunConfiguration) {
--- a/platform/lang-impl/src/com/intellij/internal/statistic/IntentionFUSCollector.java
+++ b/platform/lang-impl/src/com/intellij/internal/statistic/IntentionFUSCollector.java
@@ -26,7 +26,6 @@ import java.util.List;
 */
 public final class IntentionFUSCollector extends CounterUsagesCollector {
  private static final ClassEventField ID_FIELD = EventFields.Class("id");
-  private static final BooleanEventField DUMB_FIELD = EventFields.Boolean("dumb");
  private static final IntEventField POSITION_FIELD = EventFields.Int("position");
  private static final IntEventField DISTANCE_FIELD = EventFields.Int("distance");
  private static final StringEventField INSPECTION_ID_FIELD =
@@ -40,7 +39,7 @@ public final class IntentionFUSCollector extends CounterUsagesCollector {
                              EventFields.PluginInfo,
                              EventFields.Language,
                              DISTANCE_FIELD,
-                              DUMB_FIELD);
+                              EventFields.Dumb);

  private static final VarargEventId SHOWN =
    GROUP.registerVarargEvent("shown",
@@ -50,13 +49,13 @@ public final class IntentionFUSCollector extends CounterUsagesCollector {
                              POSITION_FIELD,
                              INSPECTION_ID_FIELD,
                              DISTANCE_FIELD,
-                              DUMB_FIELD);
+                              EventFields.Dumb);

  private static final EventId3<Long, FileType, Boolean> POPUP_DELAY =
    GROUP.registerEvent("popup.delay",
                        EventFields.DurationMs,
                        EventFields.FileType,
-                        DUMB_FIELD);
+                        EventFields.Dumb);

  @Override
  public EventLogGroup getGroup() {
@@ -76,7 +75,7 @@ public final class IntentionFUSCollector extends CounterUsagesCollector {
               ID_FIELD.with(clazz),
               EventFields.Language.with(language),
               DISTANCE_FIELD.with(getDistance(hostEditor, fixOffset)),
-               DUMB_FIELD.with(dumb));
+               EventFields.Dumb.with(dumb));
    FeatureUsageTracker.getInstance().triggerFeatureUsedByIntention(clazz);
  }

@@ -102,7 +101,7 @@ public final class IntentionFUSCollector extends CounterUsagesCollector {
        POSITION_FIELD.with(i),
        INSPECTION_ID_FIELD.with(intention.getToolId()),
        DISTANCE_FIELD.with(getDistance(editor, intention.getFixOffset())),
-        DUMB_FIELD.with(dumb)
+        EventFields.Dumb.with(dumb)
      );
    }
  }
--- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ActionsCollectorImpl.kt
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ActionsCollectorImpl.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.internal.statistic.collectors.fus.actions.persistence

 import com.intellij.codeInsight.lookup.LookupManager
@@ -217,7 +217,7 @@ class ActionsCollectorImpl : ActionsCollector() {

        return@compute buildList {
          if (isDumb != null) {
-            add(ActionsEventLogGroup.DUMB.with(isDumb))
+            add(EventFields.Dumb.with(isDumb))
          }
          if (incompleteDependenciesMode != null) {
            add(ActionsEventLogGroup.INCOMPLETE_DEPENDENCIES_MODE.with(incompleteDependenciesMode))
--- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ActionsEventLogGroup.kt
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ActionsEventLogGroup.kt
@@ -70,9 +70,6 @@ object ActionsEventLogGroup : CounterUsagesCollector() {
  @JvmField
  val DUMB_START: BooleanEventField = EventFields.Boolean("dumb_start")

-  @JvmField
-  val DUMB: BooleanEventField = EventFields.Boolean("dumb")
-
  @JvmField
  val INCOMPLETE_DEPENDENCIES_MODE = EventFields.Enum("incomplete_dependencies_mode", DependenciesState::class.java,
                                                      "COMPLETE or INCOMPLETE (see IncompleteDependenciesService)")
@@ -116,7 +113,7 @@ object ActionsEventLogGroup : CounterUsagesCollector() {
      EventFields.CurrentFile,
      TOGGLE_ACTION,
      CONTEXT_MENU,
-      DUMB,
+      EventFields.Dumb,
      INCOMPLETE_DEPENDENCIES_MODE,
      ACTION_ID,
      ACTION_CLASS,
--- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageCounterCollector.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageCounterCollector.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.internal.statistic.collectors.fus.fileTypes;

 import com.intellij.ide.fileTemplates.FileTemplate;
@@ -67,7 +67,6 @@ public final class FileTypeUsageCounterCollector extends CounterUsagesCollector
  private static final EventField<String> SCHEMA = EventFields.StringValidatedByCustomRule("schema", FileTypeSchemaValidator.class);
  private static final EventField<Boolean> IS_WRITABLE = EventFields.Boolean("is_writable");
  private static final EventField<Boolean> IS_PREVIEW_TAB = EventFields.Boolean("is_preview_tab");
-  private static final EventField<Boolean> IS_DUMB = EventFields.Boolean("dumb");
  private static final EnumEventField<DependenciesState> INCOMPLETE_DEPENDENCIES_MODE =
    EventFields.Enum("incomplete_dependencies_mode", DependenciesState.class);

@@ -90,9 +89,9 @@ public final class FileTypeUsageCounterCollector extends CounterUsagesCollector
  }

  private static final VarargEventId SELECT = registerFileTypeEvent("select");
-  private static final VarargEventId EDIT = registerFileTypeEvent("edit", FILE_NAME_PATTERN_FIELD, IS_DUMB, INCOMPLETE_DEPENDENCIES_MODE);
+  private static final VarargEventId EDIT = registerFileTypeEvent("edit", FILE_NAME_PATTERN_FIELD, EventFields.Dumb, INCOMPLETE_DEPENDENCIES_MODE);
  private static final VarargEventId OPEN = registerFileTypeEvent(
-    "open", FILE_EDITOR, EventFields.TimeToShowMs, EventFields.DurationMs, IS_WRITABLE, IS_PREVIEW_TAB, FILE_NAME_PATTERN_FIELD, IS_DUMB,
+    "open", FILE_EDITOR, EventFields.TimeToShowMs, EventFields.DurationMs, IS_WRITABLE, IS_PREVIEW_TAB, FILE_NAME_PATTERN_FIELD, EventFields.Dumb,
    INCOMPLETE_DEPENDENCIES_MODE
  );
  private static final VarargEventId CLOSE = registerFileTypeEvent("close", IS_WRITABLE);
@@ -169,7 +168,7 @@ public final class FileTypeUsageCounterCollector extends CounterUsagesCollector
        boolean isDumb = DumbService.isDumb(project);
        IncompleteDependenciesService service = project.getService(IncompleteDependenciesService.class);
        DependenciesState incompleteDependenciesMode = service.getState();
-        return Arrays.asList(IS_DUMB.with(isDumb), INCOMPLETE_DEPENDENCIES_MODE.with(incompleteDependenciesMode));
+        return Arrays.asList(EventFields.Dumb.with(isDumb), INCOMPLETE_DEPENDENCIES_MODE.with(incompleteDependenciesMode));
      }).expireWith(project)
      .executeSynchronously();
  }
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
@@ -24,7 +24,6 @@ import com.intellij.internal.inspector.UiInspectorPreciseContextProvider;
 import com.intellij.internal.inspector.UiInspectorUtil;
 import com.intellij.internal.statistic.collectors.fus.PluginInfoValidationRule;
 import com.intellij.internal.statistic.eventLog.EventLogGroup;
-import com.intellij.internal.statistic.eventLog.events.BooleanEventField;
 import com.intellij.internal.statistic.eventLog.events.EventFields;
 import com.intellij.internal.statistic.eventLog.events.StringEventField;
 import com.intellij.internal.statistic.eventLog.events.VarargEventId;
@@ -2905,14 +2904,13 @@ final class EditorGutterComponentImpl extends EditorGutterComponentEx
  private static final class GutterIconClickCollectors extends CounterUsagesCollector {
    private static final EventLogGroup GROUP = new EventLogGroup("gutter.icon.click", 5);

-    private static final BooleanEventField IS_DUMB_MODE = EventFields.Boolean("dumb");
    private static final StringEventField ICON = EventFields.StringValidatedByCustomRule("icon_id", PluginInfoValidationRule.class);

    private static final VarargEventId CLICKED = GROUP.registerVarargEvent(
      "clicked",
      EventFields.Language,
      ICON,
-      IS_DUMB_MODE,
+      EventFields.Dumb,
      EventFields.PluginInfo
    );

@@ -2930,7 +2928,7 @@ final class EditorGutterComponentImpl extends EditorGutterComponentEx
        project,
        EventFields.Language.with(language),
        ICON.with(icon),
-        IS_DUMB_MODE.with(isDumb),
+        EventFields.Dumb.with(isDumb),
        EventFields.PluginInfo.with(pluginInfo)
      );
    }
--- a/platform/statistics/src/com/intellij/internal/statistic/eventLog/events/EventFields.kt
+++ b/platform/statistics/src/com/intellij/internal/statistic/eventLog/events/EventFields.kt
@@ -717,6 +717,9 @@ object EventFields {
  @JvmField
  val StartTime = LongEventField(EventFieldIds.START_TIME_FIELD_ID)

+  @JvmField
+  val Dumb: BooleanEventField = Boolean("dumb")
+
  @JvmStatic
  @JvmOverloads
  fun createAdditionalDataField(groupId: String, eventId: String, @NonNls description: String? = null): ObjectEventField {