New UI Tool Window Icons

CHANGELOG.md

@@ -36,6 +36,7 @@
 
 ### Other
 - Added VCS issue navigation for IntelliJ [#665](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/665)
+- New UI Tool Window Icons ([sdk docs](https://plugins.jetbrains.com/docs/intellij/work-with-icons-and-images.html#new-ui-tool-window-icons)) [#688](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/688)
 
 ## [2023.2.7]
 

resources/META-INF/plugin-internal.xml

@@ -95,7 +95,7 @@
                              key="hybris.settings.project.remote_instances.title"
                              provider="com.intellij.idea.plugin.hybris.settings.HybrisProjectRemoteInstancesSettingsConfigurableProvider"/>
 
-        <toolWindow id="SAP Commerce" icon="/icons/toolWindowHybrisIcon.svg" anchor="bottom"
+        <toolWindow id="SAP Commerce" icon="/icons/toolWindow.svg" anchor="bottom"
                     factoryClass="com.intellij.idea.plugin.hybris.toolwindow.HybrisToolWindowFactory"/>
 
         <applicationService serviceImplementation="com.intellij.idea.plugin.hybris.project.configurators.impl.DummySpringConfigurator"/>

src/com/intellij/idea/plugin/hybris/system/extensioninfo/codeInsight/lookup/EiSLookupElementFactory.kt

@@ -18,18 +18,19 @@
 
 package com.intellij.idea.plugin.hybris.system.extensioninfo.codeInsight.lookup
 
+import com.intellij.codeInsight.completion.PrioritizedLookupElement
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.idea.plugin.hybris.common.utils.HybrisIcons
 import com.intellij.idea.plugin.hybris.facet.ExtensionDescriptor
 import com.intellij.idea.plugin.hybris.project.descriptors.ModuleDescriptorType
 
 object EiSLookupElementFactory {
 
-    fun build(it: ExtensionDescriptor) = LookupElementBuilder.create(it.name)
-        .withTailText(tail(it), true)
-        .withTypeText(it.type.name, true)
+    fun build(ed: ExtensionDescriptor) = LookupElementBuilder.create(ed.name)
+        .withTailText(tail(ed), true)
+        .withTypeText(ed.type.name, true)
         .withIcon(
-            when (it.type) {
+            when (ed.type) {
                 ModuleDescriptorType.CCV2 -> HybrisIcons.EXTENSION_CLOUD
                 ModuleDescriptorType.CUSTOM -> HybrisIcons.EXTENSION_CUSTOM
                 ModuleDescriptorType.EXT -> HybrisIcons.EXTENSION_EXT
@@ -38,6 +39,18 @@ object EiSLookupElementFactory {
                 else -> null
             }
         )
+        .let {
+            PrioritizedLookupElement.withPriority(
+                it,
+                when (ed.type) {
+                    ModuleDescriptorType.CUSTOM -> 5.0
+                    ModuleDescriptorType.CCV2 -> 4.0
+                    ModuleDescriptorType.OOTB -> 3.0
+                    ModuleDescriptorType.EXT -> 2.0
+                    else -> 1.0
+                }
+            )
+        }
 
     private fun tail(extensionDescriptor: ExtensionDescriptor): String? {
         val tail = listOfNotNull(

src/com/intellij/idea/plugin/hybris/system/manifest/codeInsight/completion/provider/TemplateExtensionNameCompletionProvider.kt

@@ -28,13 +28,12 @@ import com.intellij.openapi.project.Project
 class TemplateExtensionNameCompletionProvider : ExtensionNameCompletionProvider() {
 
     override fun getExtensionDescriptors(parameters: CompletionParameters, project: Project) = HybrisProjectSettingsComponent.getInstance(project)
-            .getAvailableExtensions()
-            .values
-            .filter { it.extGenTemplateExtension }
-            .toList()
+        .getAvailableExtensions()
+        .values
+        .filter { it.extGenTemplateExtension }
+        .toList()
 
     companion object {
-        val instance: CompletionProvider<CompletionParameters> =
-                ApplicationManager.getApplication().getService(TemplateExtensionNameCompletionProvider::class.java)
+        val instance: CompletionProvider<CompletionParameters> = ApplicationManager.getApplication().getService(TemplateExtensionNameCompletionProvider::class.java)
     }
 }