From e78815d14874818e1885fd97067abde4124faf87 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 19 Nov 2025 11:23:26 +0100
Subject: [PATCH] IJPL-218803 convert GutterIconsSearchableOptionContributor to
 kotlin

GitOrigin-RevId: a8fd78c1710574cc41d3b23325e8abc692a545b3
---
 .../BaseKeyedLazyInstance.java                |  4 +--
 .../GutterIconsSearchableOptionContributor.kt | 35 ++++++++-----------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/platform/core-api/src/com/intellij/serviceContainer/BaseKeyedLazyInstance.java b/platform/core-api/src/com/intellij/serviceContainer/BaseKeyedLazyInstance.java
index 1cc3238208ac..d1e18182abce 100644
--- a/platform/core-api/src/com/intellij/serviceContainer/BaseKeyedLazyInstance.java
+++ b/platform/core-api/src/com/intellij/serviceContainer/BaseKeyedLazyInstance.java
@@ -40,8 +40,6 @@ public abstract class BaseKeyedLazyInstance<T> extends LazyExtensionInstance<T>
 
   // todo get rid of it - pluginDescriptor must be not null
   public @NotNull ClassLoader getLoaderForClass() {
-    return pluginDescriptor != null ?
-           pluginDescriptor.getClassLoader() :
-           getClass().getClassLoader();
+    return pluginDescriptor == null ? getClass().getClassLoader() : pluginDescriptor.getClassLoader();
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/GutterIconsSearchableOptionContributor.kt b/platform/lang-impl/src/com/intellij/application/options/editor/GutterIconsSearchableOptionContributor.kt
index 79e5dcde0be8..8f746a5b8986 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/GutterIconsSearchableOptionContributor.kt
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/GutterIconsSearchableOptionContributor.kt
@@ -1,27 +1,20 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.application.options.editor;
+package com.intellij.application.options.editor
 
-import com.intellij.codeInsight.daemon.LineMarkerProvider;
-import com.intellij.codeInsight.daemon.LineMarkerProviderDescriptor;
-import com.intellij.codeInsight.daemon.LineMarkerProviders;
-import com.intellij.ide.IdeBundle;
-import com.intellij.ide.ui.search.SearchableOptionContributor;
-import com.intellij.ide.ui.search.SearchableOptionProcessor;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.KeyedLazyInstance;
-import org.jetbrains.annotations.NotNull;
+import com.intellij.codeInsight.daemon.LineMarkerProviderDescriptor
+import com.intellij.codeInsight.daemon.LineMarkerProviders
+import com.intellij.ide.IdeBundle
+import com.intellij.ide.ui.search.SearchableOptionContributor
+import com.intellij.ide.ui.search.SearchableOptionProcessor
 
-final class GutterIconsSearchableOptionContributor extends SearchableOptionContributor {
-  @Override
-  public void processOptions(@NotNull SearchableOptionProcessor processor) {
-    String gutterIconsDisplayName = IdeBundle.message("configurable.GutterIconsConfigurable.display.name");
-    for (KeyedLazyInstance<LineMarkerProvider> extension : LineMarkerProviders.EP_NAME.getExtensionList()) {
-      LineMarkerProvider instance = extension.getInstance();
-      if (instance instanceof LineMarkerProviderDescriptor) {
-        String name = ((LineMarkerProviderDescriptor)instance).getName();
-        if (StringUtil.isNotEmpty(name)) {
-          processor.addOptions(name, null, name, GutterIconsConfigurable.ID, gutterIconsDisplayName, true);
-        }
+private class GutterIconsSearchableOptionContributor : SearchableOptionContributor() {
+  override fun processOptions(processor: SearchableOptionProcessor) {
+    val gutterIconsDisplayName = IdeBundle.message("configurable.GutterIconsConfigurable.display.name")
+    for (extension in LineMarkerProviders.EP_NAME.extensionList) {
+      val instance = extension.getInstance() as? LineMarkerProviderDescriptor ?: continue
+      val name = instance.getName()
+      if (!name.isNullOrEmpty()) {
+        processor.addOptions(name, null, name, GutterIconsConfigurable.ID, gutterIconsDisplayName, true)
       }
     }
   }