FIR IDE: move KtIconProvider out of idea-frontend-api module

2021-06-19 17:06:21 +02:00
parent 75331b3448
commit 796baf261d
6 changed files with 118 additions and 122 deletions
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea
+
+import com.intellij.openapi.diagnostic.Logger
+import com.intellij.openapi.util.Iconable
+import com.intellij.psi.PsiClass
+import com.intellij.ui.RowIcon
+import com.intellij.util.PlatformIcons
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
+import org.jetbrains.kotlin.idea.frontend.api.symbols.*
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtPossibleMemberSymbol
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithModality
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithVisibility
+import org.jetbrains.kotlin.psi.KtClass
+import org.jetbrains.kotlin.psi.KtDeclaration
+import javax.swing.Icon
+
+object KtIconProvider {
+    private val LOG = Logger.getInstance(KtIconProvider::class.java)
+
+    // KtAnalysisSession is unused, but we want to keep it here to force all access to this method has a KtAnalysisSession
+    @Suppress("unused")
+    fun KtAnalysisSession.getIcon(ktSymbol: KtSymbol): Icon? {
+        // logic copied from org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider
+        val declaration = ktSymbol.psi
+        return if (declaration?.isValid == true) {
+            val isClass = declaration is PsiClass || declaration is KtClass
+            val flags = if (isClass) 0 else Iconable.ICON_FLAG_VISIBILITY
+            if (declaration is KtDeclaration) {
+                // kotlin declaration
+                // visibility and abstraction better detect by a descriptor
+                getIcon(ktSymbol, flags) ?: declaration.getIcon(flags)
+            } else {
+                // Use Java icons if it's not Kotlin declaration
+                declaration.getIcon(flags)
+            }
+        } else {
+            getIcon(ktSymbol, 0)
+        }
+    }
+
+    private fun getIcon(symbol: KtSymbol, flags: Int): Icon? {
+        var result: Icon = getBaseIcon(symbol) ?: return null
+
+        if (flags and Iconable.ICON_FLAG_VISIBILITY > 0) {
+            val rowIcon = RowIcon(2)
+            rowIcon.setIcon(result, 0)
+            rowIcon.setIcon(getVisibilityIcon(symbol), 1)
+            result = rowIcon
+        }
+        return result
+    }
+
+    private fun getBaseIcon(symbol: KtSymbol): Icon? {
+        val isAbstract = (symbol as? KtSymbolWithModality)?.modality == Modality.ABSTRACT
+        return when (symbol) {
+            is KtPackageSymbol -> PlatformIcons.PACKAGE_ICON
+            is KtFunctionLikeSymbol -> {
+                val isExtension = symbol.isExtension
+                val isMember = (symbol as? KtPossibleMemberSymbol)?.dispatchType != null
+                when {
+                    isExtension && isAbstract -> KotlinIcons.ABSTRACT_EXTENSION_FUNCTION
+                    isExtension && !isAbstract -> KotlinIcons.EXTENSION_FUNCTION
+                    isMember && isAbstract -> PlatformIcons.ABSTRACT_METHOD_ICON
+                    isMember && !isAbstract -> PlatformIcons.METHOD_ICON
+                    else -> KotlinIcons.FUNCTION
+                }
+            }
+            is KtClassOrObjectSymbol -> {
+                when (symbol.classKind) {
+                    KtClassKind.CLASS -> when {
+                        isAbstract -> KotlinIcons.ABSTRACT_CLASS
+                        else -> KotlinIcons.CLASS
+                    }
+                    KtClassKind.ENUM_CLASS, KtClassKind.ENUM_ENTRY -> KotlinIcons.ENUM
+                    KtClassKind.ANNOTATION_CLASS -> KotlinIcons.ANNOTATION
+                    KtClassKind.INTERFACE -> KotlinIcons.INTERFACE
+                    KtClassKind.ANONYMOUS_OBJECT, KtClassKind.OBJECT, KtClassKind.COMPANION_OBJECT -> KotlinIcons.OBJECT
+                }
+            }
+            is KtValueParameterSymbol -> KotlinIcons.PARAMETER
+            is KtLocalVariableSymbol -> when {
+                symbol.isVal -> KotlinIcons.VAL
+                else -> KotlinIcons.VAR
+            }
+            is KtPropertySymbol -> when {
+                symbol.isVal -> KotlinIcons.FIELD_VAL
+                else -> KotlinIcons.FIELD_VAR
+            }
+            is KtTypeParameterSymbol -> PlatformIcons.CLASS_ICON
+            is KtTypeAliasSymbol -> KotlinIcons.TYPE_ALIAS
+
+            else -> {
+                LOG.warn("No icon for symbol: $symbol")
+                null
+            }
+        }
+    }
+
+    private fun getVisibilityIcon(symbol: KtSymbol): Icon? {
+        return when ((symbol as? KtSymbolWithVisibility)?.visibility?.normalize()) {
+            Visibilities.Public -> PlatformIcons.PUBLIC_ICON
+            Visibilities.Protected -> PlatformIcons.PROTECTED_ICON
+            Visibilities.Private, Visibilities.PrivateToThis -> PlatformIcons.PRIVATE_ICON
+            Visibilities.Internal -> PlatformIcons.PACKAGE_LOCAL_ICON
+            else -> null
+        }
+    }
+}
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithModali
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtIconProvider.getIcon
+import org.jetbrains.kotlin.idea.KtIconProvider.getIcon
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtNamedSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.nameOrAnonymous
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.idea.frontend.api.analyse
 import org.jetbrains.kotlin.idea.frontend.api.fir.diagnostics.KtFirDiagnostic
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassOrObjectSymbol
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtIconProvider.getIcon
+import org.jetbrains.kotlin.idea.KtIconProvider.getIcon
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithModality
 import org.jetbrains.kotlin.idea.frontend.api.tokens.HackToForceAllowRunningAnalyzeOnEDT
 import org.jetbrains.kotlin.idea.frontend.api.tokens.hackyAllowRunningOnEdt
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.idea.frontend.api.analyse
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassKind
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassOrObjectSymbol
-import org.jetbrains.kotlin.idea.frontend.api.symbols.KtIconProvider.getIcon
+import org.jetbrains.kotlin.idea.KtIconProvider.getIcon
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithModality
 import org.jetbrains.kotlin.idea.frontend.api.tokens.HackToForceAllowRunningAnalyzeOnEDT
 import org.jetbrains.kotlin.idea.frontend.api.tokens.hackyAllowRunningOnEdt
@@ -1,115 +0,0 @@
-/*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.frontend.api.symbols
-
-import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.util.Iconable
-import com.intellij.psi.PsiClass
-import com.intellij.ui.RowIcon
-import com.intellij.util.PlatformIcons
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibilities
-import org.jetbrains.kotlin.idea.KotlinIcons
-import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
-import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtPossibleMemberSymbol
-import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithModality
-import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithVisibility
-import org.jetbrains.kotlin.psi.KtClass
-import org.jetbrains.kotlin.psi.KtDeclaration
-import javax.swing.Icon
-
-object KtIconProvider {
-    private val LOG = Logger.getInstance(KtIconProvider::class.java)
-
-    // KtAnalysisSession is unused, but we want to keep it here to force all access to this method has a KtAnalysisSession
-    @Suppress("unused")
-    fun KtAnalysisSession.getIcon(ktSymbol: KtSymbol): Icon? {
-        // logic copied from org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider
-        val declaration = ktSymbol.psi
-        return if (declaration?.isValid == true) {
-            val isClass = declaration is PsiClass || declaration is KtClass
-            val flags = if (isClass) 0 else Iconable.ICON_FLAG_VISIBILITY
-            if (declaration is KtDeclaration) {
-                // kotlin declaration
-                // visibility and abstraction better detect by a descriptor
-                getIcon(ktSymbol, flags) ?: declaration.getIcon(flags)
-            } else {
-                // Use Java icons if it's not Kotlin declaration
-                declaration.getIcon(flags)
-            }
-        } else {
-            getIcon(ktSymbol, 0)
-        }
-    }
-
-    private fun getIcon(symbol: KtSymbol, flags: Int): Icon? {
-        var result: Icon = getBaseIcon(symbol) ?: return null
-
-        if (flags and Iconable.ICON_FLAG_VISIBILITY > 0) {
-            val rowIcon = RowIcon(2)
-            rowIcon.setIcon(result, 0)
-            rowIcon.setIcon(getVisibilityIcon(symbol), 1)
-            result = rowIcon
-        }
-        return result
-    }
-
-    private fun getBaseIcon(symbol: KtSymbol): Icon? {
-        val isAbstract = (symbol as? KtSymbolWithModality)?.modality == Modality.ABSTRACT
-        return when (symbol) {
-            is KtPackageSymbol -> PlatformIcons.PACKAGE_ICON
-            is KtFunctionLikeSymbol -> {
-                val isExtension = symbol.isExtension
-                val isMember = (symbol as? KtPossibleMemberSymbol)?.dispatchType != null
-                when {
-                    isExtension && isAbstract -> KotlinIcons.ABSTRACT_EXTENSION_FUNCTION
-                    isExtension && !isAbstract -> KotlinIcons.EXTENSION_FUNCTION
-                    isMember && isAbstract -> PlatformIcons.ABSTRACT_METHOD_ICON
-                    isMember && !isAbstract -> PlatformIcons.METHOD_ICON
-                    else -> KotlinIcons.FUNCTION
-                }
-            }
-            is KtClassOrObjectSymbol -> {
-                when (symbol.classKind) {
-                    KtClassKind.CLASS -> when {
-                        isAbstract -> KotlinIcons.ABSTRACT_CLASS
-                        else -> KotlinIcons.CLASS
-                    }
-                    KtClassKind.ENUM_CLASS, KtClassKind.ENUM_ENTRY -> KotlinIcons.ENUM
-                    KtClassKind.ANNOTATION_CLASS -> KotlinIcons.ANNOTATION
-                    KtClassKind.INTERFACE -> KotlinIcons.INTERFACE
-                    KtClassKind.ANONYMOUS_OBJECT, KtClassKind.OBJECT, KtClassKind.COMPANION_OBJECT -> KotlinIcons.OBJECT
-                }
-            }
-            is KtValueParameterSymbol -> KotlinIcons.PARAMETER
-            is KtLocalVariableSymbol -> when {
-                symbol.isVal -> KotlinIcons.VAL
-                else -> KotlinIcons.VAR
-            }
-            is KtPropertySymbol -> when {
-                symbol.isVal -> KotlinIcons.FIELD_VAL
-                else -> KotlinIcons.FIELD_VAR
-            }
-            is KtTypeParameterSymbol -> PlatformIcons.CLASS_ICON
-            is KtTypeAliasSymbol -> KotlinIcons.TYPE_ALIAS
-
-            else -> {
-                LOG.warn("No icon for symbol: $symbol")
-                null
-            }
-        }
-    }
-
-    private fun getVisibilityIcon(symbol: KtSymbol): Icon? {
-        return when ((symbol as? KtSymbolWithVisibility)?.visibility?.normalize()) {
-            Visibilities.Public -> PlatformIcons.PUBLIC_ICON
-            Visibilities.Protected -> PlatformIcons.PROTECTED_ICON
-            Visibilities.Private, Visibilities.PrivateToThis -> PlatformIcons.PRIVATE_ICON
-            Visibilities.Internal -> PlatformIcons.PACKAGE_LOCAL_ICON
-            else -> null
-        }
-    }
-}
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.ideaExt.idea

 plugins {
    kotlin("jvm")
@@ -7,9 +6,6 @@ plugins {

 dependencies {
    compile(project(":compiler:psi"))
-    compile(project(":idea:idea-frontend-independent"))
-    compile(project(":idea:idea-frontend-api"))
-    compile(project(":idea:idea-core"))
    compile(project(":compiler:fir:fir2ir"))
    compile(project(":compiler:ir.tree"))
    compile(project(":compiler:fir:resolve"))