From edc7524f5cf4e1ef62408f375f91e0d6475e0a37 Mon Sep 17 00:00:00 2001 From: Alexandr Trushev Date: Tue, 14 May 2024 11:58:32 +0200 Subject: [PATCH] IJPL-449 IJPL-952 Sticky lines: fus per language usage GitOrigin-RevId: a6775ce29faae6bf8f0a1262bacc6238665c9f8e --- .../openapi/editor/ex/EditorSettingsExternalizable.java | 1 - .../editor/EditorSettingsStatisticsCollector.java | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/ide-core-impl/src/com/intellij/openapi/editor/ex/EditorSettingsExternalizable.java b/platform/ide-core-impl/src/com/intellij/openapi/editor/ex/EditorSettingsExternalizable.java index ff9704a22bf2..d5baf36fbd8b 100644 --- a/platform/ide-core-impl/src/com/intellij/openapi/editor/ex/EditorSettingsExternalizable.java +++ b/platform/ide-core-impl/src/com/intellij/openapi/editor/ex/EditorSettingsExternalizable.java @@ -137,7 +137,6 @@ public class EditorSettingsExternalizable implements PersistentStateComponent getLanguageStickyLines() { return mapLanguageStickyLines; } diff --git a/platform/lang-impl/src/com/intellij/internal/statistic/editor/EditorSettingsStatisticsCollector.java b/platform/lang-impl/src/com/intellij/internal/statistic/editor/EditorSettingsStatisticsCollector.java index ace3efcff07a..df87eba7bf7d 100644 --- a/platform/lang-impl/src/com/intellij/internal/statistic/editor/EditorSettingsStatisticsCollector.java +++ b/platform/lang-impl/src/com/intellij/internal/statistic/editor/EditorSettingsStatisticsCollector.java @@ -28,7 +28,7 @@ import java.util.*; import java.util.function.Function; final class EditorSettingsStatisticsCollector extends ApplicationUsagesCollector { - private static final EventLogGroup GROUP = new EventLogGroup("editor.settings.ide", 10); + private static final EventLogGroup GROUP = new EventLogGroup("editor.settings.ide", 11); private static final EnumEventField SETTING_ID = EventFields.Enum("setting_id", Settings.class, it -> it.internalName); private static final IntEventField INT_VALUE_FIELD = EventFields.Int("value"); private static final StringEventField TRAILING_SPACES_FIELD = EventFields.String("value", List.of("Whole", "Changed", "None")); @@ -103,6 +103,11 @@ final class EditorSettingsStatisticsCollector extends ApplicationUsagesCollector EventFields.LanguageById.with(language)); } + for (String language : es.getOptions().getLanguageStickyLines().keySet()) { + addBoolIfDiffers(set, es, esDefault, s -> s.areStickyLinesShownFor(language), Settings.STICKY_LINES_FOR_LANG, + EventFields.LanguageById.with(language)); + } + RichCopySettings rcs = RichCopySettings.getInstance(); RichCopySettings rcsDefault = new RichCopySettings(); addBoolIfDiffers(set, rcs, rcsDefault, s -> s.isEnabled(), Settings.RICH_COPY); @@ -279,6 +284,7 @@ final class EditorSettingsStatisticsCollector extends ApplicationUsagesCollector USE_EDITOR_FONT_IN_INLAYS("useEditorFontInInlays"), BREADCRUMBS("breadcrumbs"), STICKY_LINES("stickyLines"), + STICKY_LINES_FOR_LANG("stickyLinesForLang"), RICH_COPY("richCopy"), PARAMETER_AUTO_POPUP("parameterAutoPopup"), JAVADOC_AUTO_POPUP("javadocAutoPopup"),