WEB-54133 Angular: improve resolution of SVG element descriptors with Web Symbols

Also move most of com.intellij.html.webSymbols package from `impl` module to `xml-psi-impl` module to make it visible to `xml-analysis-impl` module and `HtmlUnknownTagInspectionBase` class.

GitOrigin-RevId: d34431683f52d9abd2e9d174917a818b6607536c

xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspectionBase.java

@@ -20,6 +20,7 @@ import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.codeInspection.XmlQuickFixFactory;
+import com.intellij.html.webSymbols.elements.WebSymbolElementDescriptor;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiElement;
@@ -99,7 +100,9 @@ public class HtmlUnknownTagInspectionBase extends HtmlUnknownElementInspection {
     }
 
     if (isAbstractDescriptor(ownDescriptor) ||
-        (parentDescriptor instanceof HtmlElementDescriptorImpl &&
+        ((parentDescriptor instanceof HtmlElementDescriptorImpl
+          || parentDescriptor instanceof WebSymbolElementDescriptor webSymbolElementDescriptor
+             && !webSymbolElementDescriptor.isCustomElement()) &&
          ownDescriptor instanceof HtmlElementDescriptorImpl &&
          isAbstractDescriptor(descriptorFromContext))) {
 

xml/xml-psi-impl/src/com/intellij/html/webSymbols/WebSymbolsHtmlQueryConfigurator.kt

@@ -6,6 +6,7 @@ import com.intellij.html.webSymbols.elements.WebSymbolElementDescriptor
 import com.intellij.model.Pointer
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.ModificationTracker
+import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.PsiElement
 import com.intellij.psi.SmartPointerManager
 import com.intellij.psi.XmlElementFactory
@@ -14,7 +15,6 @@ import com.intellij.psi.impl.source.html.dtd.HtmlNSDescriptorImpl
 import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.util.CachedValuesManager
 import com.intellij.psi.xml.XmlAttribute
-import com.intellij.psi.xml.XmlElement
 import com.intellij.psi.xml.XmlTag
 import com.intellij.refactoring.suggested.createSmartPointer
 import com.intellij.util.asSafely
@@ -42,13 +42,7 @@ class WebSymbolsHtmlQueryConfigurator : WebSymbolsQueryConfigurator {
                         context: WebSymbolsContext,
                         allowResolve: Boolean): List<WebSymbolsScope> =
     ((element as? XmlAttribute)?.parent ?: element as? XmlTag)?.let {
-      listOf(
-        HtmlElementSymbolsScope(it.project),
-        HtmlElementAttributesAndEventsScope(it)
-      )
-    }
-    ?: (element as? XmlElement)?.let {
-      listOf(HtmlElementSymbolsScope(it.project))
+      listOf(StandardHtmlSymbolsScope(it))
     }
     ?: emptyList()
 
@@ -78,24 +72,47 @@ class WebSymbolsHtmlQueryConfigurator : WebSymbolsQueryConfigurator {
     @JvmStatic
     fun getStandardHtmlAttributeDescriptor(tag: XmlTag, attrName: String): XmlAttributeDescriptor? =
       getHtmlElementDescriptor(tag)
-        ?.getDefaultAttributeDescriptor(attrName, tag)
+        ?.getDefaultAttributeDescriptor(attrName.adjustCase(tag), tag)
         ?.takeIf { !it.getName(tag).contains(':') }
 
     private fun getHtmlElementDescriptor(tag: XmlTag): HtmlElementDescriptorImpl? =
       when (val tagDescriptor = tag.descriptor) {
         is HtmlElementDescriptorImpl -> tagDescriptor
         is WebSymbolElementDescriptor, is AnyXmlElementDescriptor -> {
-          tag.getNSDescriptor(tag.namespace, false)
-            .asSafely<HtmlNSDescriptorImpl>()
-            ?.let { nsDescriptor ->
-              nsDescriptor.getElementDescriptorByName(tag.localName)
-              ?: nsDescriptor.getElementDescriptorByName("div")
-              ?: nsDescriptor.getElementDescriptorByName("span")
-            } as? HtmlElementDescriptorImpl
+          getStandardHtmlElementDescriptor(tag)
         }
         else -> null
       }
 
+    private fun getStandardHtmlElementDescriptor(tag: XmlTag, name: String = tag.localName): HtmlElementDescriptorImpl? {
+      val parentTag = tag.parentTag
+      return if (parentTag != null) {
+        parentTag.getNSDescriptor(tag.namespace, false)
+          .asSafely<HtmlNSDescriptorImpl>()
+          ?.let { nsDescriptor ->
+            sequenceOf(parentTag.localName.adjustCase(tag), "div", "span")
+              .firstNotNullOfOrNull { nsDescriptor.getElementDescriptorByName(it) }
+          }
+          ?.asSafely<HtmlElementDescriptorImpl>()
+          ?.let { descriptor ->
+            sequenceOf(name.adjustCase(tag), "div", "span")
+              .firstNotNullOfOrNull { descriptor.getElementDescriptor(it, parentTag) }
+          }
+          ?.asSafely<HtmlElementDescriptorImpl>()
+      }
+      else {
+        getHtmlNSDescriptor(tag.project)
+          ?.let { nsDescriptor ->
+            sequenceOf(name.adjustCase(tag), "div", "span")
+              .firstNotNullOfOrNull { nsDescriptor.getElementDescriptorByName(it) }
+          }
+          ?.asSafely<HtmlElementDescriptorImpl>()
+      }
+    }
+
+    private fun String.adjustCase(tag: XmlTag) =
+      if (tag.isCaseSensitive) this else StringUtil.toLowerCase(this)
+
     fun Sequence<WebSymbolCodeCompletionItem>.filterOutStandardHtmlSymbols(): Sequence<WebSymbolCodeCompletionItem> =
       filter {
         it.symbol !is StandardHtmlSymbol
@@ -115,7 +132,10 @@ class WebSymbolsHtmlQueryConfigurator : WebSymbolsQueryConfigurator {
 
   class HtmlSymbolsCodeCompletionItemCustomizer : WebSymbolCodeCompletionItemCustomizer {
     override fun customize(item: WebSymbolCodeCompletionItem,
-                           framework: FrameworkId?, namespace: SymbolNamespace, kind: SymbolKind, location: PsiElement): WebSymbolCodeCompletionItem =
+                           framework: FrameworkId?,
+                           namespace: SymbolNamespace,
+                           kind: SymbolKind,
+                           location: PsiElement): WebSymbolCodeCompletionItem =
       item.let {
         if (namespace == WebSymbol.NAMESPACE_HTML)
           when (kind) {
@@ -127,41 +147,21 @@ class WebSymbolsHtmlQueryConfigurator : WebSymbolsQueryConfigurator {
       }
   }
 
-  private class HtmlElementSymbolsScope(project: Project)
-    : WebSymbolsScopeWithCache<Project, Unit>(null, project, project, Unit) {
-
-    override fun provides(namespace: SymbolNamespace, kind: SymbolKind): Boolean =
-      namespace == WebSymbol.NAMESPACE_HTML && kind == WebSymbol.KIND_HTML_ELEMENTS
-
-    override fun getModificationCount(): Long = 0
-
-    override fun createPointer(): Pointer<HtmlElementSymbolsScope> =
-      Pointer.hardPointer(this)
-
-    override fun initialize(consumer: (WebSymbol) -> Unit, cacheDependencies: MutableSet<Any>) {
-      val descriptor = getHtmlNSDescriptor(project) ?: return
-      descriptor.getAllElementsDescriptors(null).forEach {
-        consumer(HtmlElementDescriptorBasedSymbol(it, null))
-      }
-      descriptor.descriptorFile?.let { cacheDependencies.add(it) }
-    }
-  }
-
-  private class HtmlElementAttributesAndEventsScope(private val tag: XmlTag) : WebSymbolsScope {
+  private class StandardHtmlSymbolsScope(private val tag: XmlTag) : WebSymbolsScope {
 
     override fun equals(other: Any?): Boolean =
-      other is HtmlElementAttributesAndEventsScope
+      other is StandardHtmlSymbolsScope
       && other.tag == tag
 
     override fun hashCode(): Int = tag.hashCode()
 
     override fun getModificationCount(): Long = 0
 
-    override fun createPointer(): Pointer<HtmlElementAttributesAndEventsScope> {
+    override fun createPointer(): Pointer<StandardHtmlSymbolsScope> {
       val tag = SmartPointerManager.createPointer(this.tag)
       return Pointer {
         tag.dereference()?.let {
-          HtmlElementAttributesAndEventsScope(it)
+          StandardHtmlSymbolsScope(it)
         }
       }
     }
@@ -172,8 +172,22 @@ class WebSymbolsHtmlQueryConfigurator : WebSymbolsQueryConfigurator {
                             params: WebSymbolsNameMatchQueryParams,
                             scope: Stack<WebSymbolsScope>): List<WebSymbolsScope> =
       if (params.queryExecutor.allowResolve) {
-        if (namespace == null || namespace == WebSymbol.NAMESPACE_HTML) {
+        if (namespace == WebSymbol.NAMESPACE_HTML) {
           when (kind) {
+            WebSymbol.KIND_HTML_ELEMENTS ->
+              if (name.isNullOrEmpty()) {
+                (getStandardHtmlElementDescriptor(tag)?.getElementsDescriptors(tag)
+                 ?: getHtmlNSDescriptor(tag.project)?.getAllElementsDescriptors(null)
+                 ?: emptyArray())
+                  .map { HtmlElementDescriptorBasedSymbol(it, tag) }
+                  .toList()
+              }
+              else {
+                getStandardHtmlElementDescriptor(tag, name)
+                  ?.let { HtmlElementDescriptorBasedSymbol(it, tag) }
+                  ?.match(name, scope, params)
+                ?: emptyList()
+              }
             WebSymbol.KIND_HTML_ATTRIBUTES ->
               if (name.isNullOrEmpty()) {
                 getStandardHtmlAttributeDescriptors(tag)

xml/xml-psi-impl/src/com/intellij/html/webSymbols/WebSymbolsXmlExtension.kt

@@ -1,9 +1,7 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.html.webSymbols
 
-import com.intellij.html.webSymbols.WebSymbolsHtmlQueryConfigurator.Companion.hasOnlyStandardHtmlSymbolsOrExtensions
 import com.intellij.html.webSymbols.attributes.WebSymbolAttributeDescriptor
-import com.intellij.html.webSymbols.elements.WebSymbolElementDescriptor
 import com.intellij.lang.html.HTMLLanguage
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiFile

xml/xml-psi-impl/src/com/intellij/html/webSymbols/elements/WebSymbolElementDescriptor.kt

@@ -93,7 +93,6 @@ open class WebSymbolElementDescriptor private constructor(private val tag: XmlTa
     getStandardHtmlElementDescriptor()
       ?.getElementDescriptor(childTag, contextTag)
       ?.let { if (it !is AnyXmlElementDescriptor) wrapInDelegating(it) else it }
-    ?: XmlDescriptorUtil.getElementDescriptor(childTag, contextTag)
 
   override fun getAttributesDescriptors(context: XmlTag?): Array<XmlAttributeDescriptor> =
     getStandardHtmlElementDescriptor()

xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java

@@ -100,7 +100,7 @@ public class HtmlNSDescriptorImpl implements XmlNSDescriptor, DumbAware, XmlNSTy
 
     for (XmlElementDescriptor element : elements) {
       decls.put(
-        element.getName(),
+        myCaseSensitive ? element.getName() : StringUtil.toLowerCase(element.getName()),
         createHtmlElementDescriptor(element)
       );
     }