diff --git a/xml/xml-psi-impl/src/com/intellij/polySymbols/html/HtmlSymbolHighlightingCustomizer.kt b/xml/xml-psi-impl/src/com/intellij/polySymbols/html/HtmlSymbolHighlightingCustomizer.kt
index 96f3e954b883..382a167a9047 100644
--- a/xml/xml-psi-impl/src/com/intellij/polySymbols/html/HtmlSymbolHighlightingCustomizer.kt
+++ b/xml/xml-psi-impl/src/com/intellij/polySymbols/html/HtmlSymbolHighlightingCustomizer.kt
@@ -4,18 +4,15 @@ package com.intellij.polySymbols.html
 import com.intellij.model.psi.PsiExternalReferenceHost
 import com.intellij.openapi.editor.XmlHighlighterColors
 import com.intellij.openapi.editor.colors.TextAttributesKey
-import com.intellij.polySymbols.html.HTML_ATTRIBUTES
-import com.intellij.polySymbols.html.HTML_ATTRIBUTE_VALUES
-import com.intellij.polySymbols.html.HTML_ELEMENTS
+import com.intellij.polySymbols.PolySymbolQualifiedKind
+import com.intellij.polySymbols.highlighting.PolySymbolHighlightingCustomizer
 import com.intellij.psi.xml.XmlAttribute
 import com.intellij.psi.xml.XmlAttributeValue
 import com.intellij.psi.xml.XmlTag
-import com.intellij.polySymbols.PolySymbolQualifiedKind
-import com.intellij.polySymbols.highlighting.PolySymbolHighlightingCustomizer
 
-class HtmlSymbolHighlightingCustomizer: PolySymbolHighlightingCustomizer {
+class HtmlSymbolHighlightingCustomizer : PolySymbolHighlightingCustomizer {
   override fun getSymbolKindTextAttributes(qualifiedKind: PolySymbolQualifiedKind): TextAttributesKey? =
-    when(qualifiedKind) {
+    when (qualifiedKind) {
       HTML_ATTRIBUTES -> XmlHighlighterColors.HTML_ATTRIBUTE_NAME
       HTML_ELEMENTS -> XmlHighlighterColors.HTML_TAG_NAME
       HTML_ATTRIBUTE_VALUES -> XmlHighlighterColors.HTML_ATTRIBUTE_VALUE
diff --git a/xml/xml-psi-impl/src/com/intellij/polySymbols/html/attributes/HtmlAttributeSymbolDescriptor.kt b/xml/xml-psi-impl/src/com/intellij/polySymbols/html/attributes/HtmlAttributeSymbolDescriptor.kt
index 24c625e8dfde..89e96af5ac12 100644
--- a/xml/xml-psi-impl/src/com/intellij/polySymbols/html/attributes/HtmlAttributeSymbolDescriptor.kt
+++ b/xml/xml-psi-impl/src/com/intellij/polySymbols/html/attributes/HtmlAttributeSymbolDescriptor.kt
@@ -133,7 +133,7 @@ open class HtmlAttributeSymbolDescriptor private constructor(
 
   companion object {
 
-    fun HtmlAttributeSymbolInfo.toAttributeDescriptor(tag: XmlTag?) =
+    fun HtmlAttributeSymbolInfo.toAttributeDescriptor(tag: XmlTag?): HtmlAttributeSymbolDescriptor =
       HtmlFrameworkSymbolsSupport.get(this.symbol.origin.framework)
         .createHtmlAttributeDescriptor(this, tag)
 
diff --git a/xml/xml-psi-impl/src/com/intellij/polySymbols/html/elements/HtmlElementSymbolDescriptor.kt b/xml/xml-psi-impl/src/com/intellij/polySymbols/html/elements/HtmlElementSymbolDescriptor.kt
index 061c0d6fb963..2282c05b45d3 100644
--- a/xml/xml-psi-impl/src/com/intellij/polySymbols/html/elements/HtmlElementSymbolDescriptor.kt
+++ b/xml/xml-psi-impl/src/com/intellij/polySymbols/html/elements/HtmlElementSymbolDescriptor.kt
@@ -173,7 +173,7 @@ open class HtmlElementSymbolDescriptor private constructor(
 
   companion object {
 
-    fun HtmlElementSymbolInfo.toElementDescriptor(tag: XmlTag) =
+    fun HtmlElementSymbolInfo.toElementDescriptor(tag: XmlTag): HtmlElementSymbolDescriptor =
       HtmlFrameworkSymbolsSupport.get(this.symbol.origin.framework)
         .createHtmlElementDescriptor(this, tag)