[polySymbols] WEB-73607 Fix compilation errors and update API compatibility file

GitOrigin-RevId: 9490a00eb349cd0a5bca208f7b647952f758c034
2025-12-16 14:23:28 +07:00 · 2025-06-16 16:07:18 +02:00
parent 7c226c4cac
commit 12d4cec593
2 changed files with 245 additions and 245 deletions
--- a/platform/polySymbols/api-dump-experimental.txt
+++ b/platform/polySymbols/api-dump-experimental.txt
@@ -4,13 +4,13 @@
 *:com.intellij.polySymbols.PolySymbol
 - com.intellij.model.Symbol
 - com.intellij.navigation.NavigatableSymbol
- com.intellij.polySymbols.utils.PolySymbolsPrioritizedScope
+- com.intellij.polySymbols.utils.PolySymbolPrioritizedScope
 - *sf:Companion:com.intellij.polySymbols.PolySymbol$Companion
 - sf:PROP_DOC_HIDE_PATTERN:com.intellij.polySymbols.PolySymbolProperty
 - sf:PROP_HIDE_FROM_COMPLETION:com.intellij.polySymbols.PolySymbolProperty
 - sf:PROP_IJ_TEXT_ATTRIBUTES_KEY:com.intellij.polySymbols.PolySymbolProperty
 - sf:PROP_INJECT_LANGUAGE:com.intellij.polySymbols.PolySymbolProperty
- adjustNameForRefactoring(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,java.lang.String,java.lang.String):java.lang.String
+- adjustNameForRefactoring(com.intellij.polySymbols.query.PolySymbolQueryExecutor,java.lang.String,java.lang.String):java.lang.String
 - a:createPointer():com.intellij.model.Pointer
 - get(com.intellij.polySymbols.PolySymbolProperty):java.lang.Object
 - getApiStatus():com.intellij.polySymbols.PolySymbolApiStatus
@@ -458,7 +458,7 @@
 - sf:PROP_CSS_ARGUMENTS:com.intellij.polySymbols.PolySymbolProperty
 *:com.intellij.polySymbols.customElements.CustomElementsSymbol
 - com.intellij.polySymbols.documentation.PolySymbolWithDocumentation
- com.intellij.polySymbols.query.PolySymbolsScope
+- com.intellij.polySymbols.query.PolySymbolScope
 - *sf:Companion:com.intellij.polySymbols.customElements.CustomElementsSymbol$Companion
 - a:createPointer():com.intellij.model.Pointer
 - getModificationCount():J
@@ -560,26 +560,26 @@
 - getDescriptionSections():java.util.Map
 - getDocUrl():java.lang.String
 - getDocumentationTarget(com.intellij.psi.PsiElement):com.intellij.platform.backend.documentation.DocumentationTarget
-*a:com.intellij.polySymbols.framework.PolySymbolsFramework
- *sf:Companion:com.intellij.polySymbols.framework.PolySymbolsFramework$Companion
+*a:com.intellij.polySymbols.framework.PolySymbolFramework
+- *sf:Companion:com.intellij.polySymbols.framework.PolySymbolFramework$Companion
 - <init>():V
- sf:get(java.lang.String):com.intellij.polySymbols.framework.PolySymbolsFramework
+- sf:get(java.lang.String):com.intellij.polySymbols.framework.PolySymbolFramework
 - sf:getAll():java.util.List
 - sf:getAllAsSequence$intellij_platform_polySymbols():kotlin.sequences.Sequence
 - a:getDisplayName():java.lang.String
 - getIcon():javax.swing.Icon
 - f:getId():java.lang.String
 - getNames(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolNamesProvider$Target):java.util.List
- sf:inLocation(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.project.Project):com.intellij.polySymbols.framework.PolySymbolsFramework
- sf:inLocation(com.intellij.psi.PsiElement):com.intellij.polySymbols.framework.PolySymbolsFramework
+- sf:inLocation(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.project.Project):com.intellij.polySymbols.framework.PolySymbolFramework
+- sf:inLocation(com.intellij.psi.PsiElement):com.intellij.polySymbols.framework.PolySymbolFramework
 - f:isInContext(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.project.Project):Z
 - f:isInContext(com.intellij.psi.PsiElement):Z
 - pf:setIdFromAnotherModule(java.lang.String):V
-*f:com.intellij.polySymbols.framework.PolySymbolsFramework$Companion
- f:get(java.lang.String):com.intellij.polySymbols.framework.PolySymbolsFramework
+*f:com.intellij.polySymbols.framework.PolySymbolFramework$Companion
+- f:get(java.lang.String):com.intellij.polySymbols.framework.PolySymbolFramework
 - f:getAll():java.util.List
- f:inLocation(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.project.Project):com.intellij.polySymbols.framework.PolySymbolsFramework
- f:inLocation(com.intellij.psi.PsiElement):com.intellij.polySymbols.framework.PolySymbolsFramework
+- f:inLocation(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.project.Project):com.intellij.polySymbols.framework.PolySymbolFramework
+- f:inLocation(com.intellij.psi.PsiElement):com.intellij.polySymbols.framework.PolySymbolFramework
 *f:com.intellij.polySymbols.html.HtmlSymbolKinds
 - sf:HTML_ATTRIBUTES:com.intellij.polySymbols.PolySymbolQualifiedKind
 - sf:HTML_ATTRIBUTE_VALUES:com.intellij.polySymbols.PolySymbolQualifiedKind
@@ -646,13 +646,58 @@
 - s:getEntries():kotlin.enums.EnumEntries
 - s:valueOf(java.lang.String):com.intellij.polySymbols.js.JsSymbolSymbolKind
 - s:values():com.intellij.polySymbols.js.JsSymbolSymbolKind[]
-*Fa:com.intellij.polySymbols.patterns.PolySymbolsPattern
+*Fa:com.intellij.polySymbols.patterns.PolySymbolPattern
+*:com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams
+- com.intellij.polySymbols.query.PolySymbolQueryParams
+- *sf:Companion:com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams$Companion
+- s:create(com.intellij.polySymbols.query.PolySymbolQueryExecutor,I):com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams
+- s:create(com.intellij.polySymbols.query.PolySymbolQueryExecutor,I,kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams
+- a:getPosition():I
+- a:getQueryExecutor():com.intellij.polySymbols.query.PolySymbolQueryExecutor
+*:com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams$Builder
+- com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams$BuilderMixin
+- com.intellij.polySymbols.query.PolySymbolQueryParams$Builder
+*:com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams$BuilderMixin
+*f:com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams$Companion
+- f:create(com.intellij.polySymbols.query.PolySymbolQueryExecutor,I):com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams
+- f:create(com.intellij.polySymbols.query.PolySymbolQueryExecutor,I,kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams
+- bs:create$default(com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams$Companion,com.intellij.polySymbols.query.PolySymbolQueryExecutor,I,kotlin.jvm.functions.Function1,I,java.lang.Object):com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams
+*a:com.intellij.polySymbols.query.PolySymbolCompoundScope
+- com.intellij.polySymbols.query.PolySymbolScope
+- <init>():V
+- pa:build(com.intellij.polySymbols.query.PolySymbolQueryExecutor,kotlin.jvm.functions.Function1):V
+- a:createPointer():com.intellij.model.Pointer
+- f:getCodeCompletions(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
+- f:getMatchingSymbols(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
+- f:getModificationCount():J
+- f:getScopes(com.intellij.polySymbols.query.PolySymbolQueryExecutor):java.util.List
+- f:getSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind,com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams,com.intellij.util.containers.Stack):java.util.List
+- f:isExclusiveFor(com.intellij.polySymbols.PolySymbolQualifiedKind):Z
+- p:requiresResolve():Z
 *:com.intellij.polySymbols.query.PolySymbolDefaultIconProvider
 - *sf:Companion:com.intellij.polySymbols.query.PolySymbolDefaultIconProvider$Companion
 - sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName
 - a:getDefaultIcon(com.intellij.polySymbols.PolySymbolQualifiedKind):javax.swing.Icon
 *f:com.intellij.polySymbols.query.PolySymbolDefaultIconProvider$Companion
 - f:get(com.intellij.polySymbols.PolySymbolQualifiedKind):javax.swing.Icon
+*:com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams
+- com.intellij.polySymbols.query.PolySymbolQueryParams
+- *sf:Companion:com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams$Companion
+- s:create(com.intellij.polySymbols.query.PolySymbolQueryExecutor,Z):com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams
+- s:create(com.intellij.polySymbols.query.PolySymbolQueryExecutor,Z,kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams
+- a:getExpandPatterns():Z
+- a:getQueryExecutor():com.intellij.polySymbols.query.PolySymbolQueryExecutor
+- a:getStrictScope():Z
+*:com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams$Builder
+- com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams$BuilderMixin
+- com.intellij.polySymbols.query.PolySymbolQueryParams$Builder
+*:com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams$BuilderMixin
+- com.intellij.polySymbols.query.PolySymbolQueryParams$Builder
+- a:strictScope(Z):java.lang.Object
+*f:com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams$Companion
+- f:create(com.intellij.polySymbols.query.PolySymbolQueryExecutor,Z):com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams
+- f:create(com.intellij.polySymbols.query.PolySymbolQueryExecutor,Z,kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams
+- bs:create$default(com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams$Companion,com.intellij.polySymbols.query.PolySymbolQueryExecutor,Z,kotlin.jvm.functions.Function1,I,java.lang.Object):com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams
 *:com.intellij.polySymbols.query.PolySymbolMatch
 - com.intellij.polySymbols.CompositePolySymbol
 - *sf:Companion:com.intellij.polySymbols.query.PolySymbolMatch$Companion
@@ -711,6 +756,22 @@
 - a:getNameConversionRules():com.intellij.polySymbols.query.PolySymbolNameConversionRules
 *:com.intellij.polySymbols.query.PolySymbolNameConverter
 - a:getNames(java.lang.String):java.util.List
+*:com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams
+- com.intellij.polySymbols.query.PolySymbolQueryParams
+- *sf:Companion:com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams$Companion
+- s:create(com.intellij.polySymbols.query.PolySymbolQueryExecutor):com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams
+- s:create(com.intellij.polySymbols.query.PolySymbolQueryExecutor,kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams
+- a:getQueryExecutor():com.intellij.polySymbols.query.PolySymbolQueryExecutor
+- a:getStrictScope():Z
+*:com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams$Builder
+- com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams$BuilderMixin
+- com.intellij.polySymbols.query.PolySymbolQueryParams$Builder
+*:com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams$BuilderMixin
+- a:strictScope(Z):java.lang.Object
+*f:com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams$Companion
+- f:create(com.intellij.polySymbols.query.PolySymbolQueryExecutor):com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams
+- f:create(com.intellij.polySymbols.query.PolySymbolQueryExecutor,kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams
+- bs:create$default(com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams$Companion,com.intellij.polySymbols.query.PolySymbolQueryExecutor,kotlin.jvm.functions.Function1,I,java.lang.Object):com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams
 *:com.intellij.polySymbols.query.PolySymbolNamesProvider
 - com.intellij.openapi.util.ModificationTracker
 - a:adjustRename(com.intellij.polySymbols.PolySymbolQualifiedName,java.lang.String,java.lang.String):java.lang.String
@@ -726,84 +787,20 @@
 - s:getEntries():kotlin.enums.EnumEntries
 - s:valueOf(java.lang.String):com.intellij.polySymbols.query.PolySymbolNamesProvider$Target
 - s:values():com.intellij.polySymbols.query.PolySymbolNamesProvider$Target[]
-*:com.intellij.polySymbols.query.PolySymbolWithPattern
- com.intellij.polySymbols.PolySymbol
- a:getPattern():com.intellij.polySymbols.patterns.PolySymbolsPattern
-*:com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams
- com.intellij.polySymbols.query.PolySymbolsQueryParams
- *sf:Companion:com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams$Companion
- s:create(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,I):com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams
- s:create(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,I,kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams
- a:getPosition():I
- a:getQueryExecutor():com.intellij.polySymbols.query.PolySymbolsQueryExecutor
-*:com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams$Builder
- com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams$BuilderMixin
- com.intellij.polySymbols.query.PolySymbolsQueryParams$Builder
-*:com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams$BuilderMixin
-*f:com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams$Companion
- f:create(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,I):com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams
- f:create(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,I,kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams
- bs:create$default(com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams$Companion,com.intellij.polySymbols.query.PolySymbolsQueryExecutor,I,kotlin.jvm.functions.Function1,I,java.lang.Object):com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams
-*a:com.intellij.polySymbols.query.PolySymbolsCompoundScope
- com.intellij.polySymbols.query.PolySymbolsScope
- <init>():V
- pa:build(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,kotlin.jvm.functions.Function1):V
- a:createPointer():com.intellij.model.Pointer
- f:getCodeCompletions(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
- f:getMatchingSymbols(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
- f:getModificationCount():J
- f:getScopes(com.intellij.polySymbols.query.PolySymbolsQueryExecutor):java.util.List
- f:getSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind,com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams,com.intellij.util.containers.Stack):java.util.List
- f:isExclusiveFor(com.intellij.polySymbols.PolySymbolQualifiedKind):Z
- p:requiresResolve():Z
-*:com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams
- com.intellij.polySymbols.query.PolySymbolsQueryParams
- *sf:Companion:com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams$Companion
- s:create(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,Z):com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams
- s:create(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,Z,kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams
- a:getExpandPatterns():Z
- a:getQueryExecutor():com.intellij.polySymbols.query.PolySymbolsQueryExecutor
- a:getStrictScope():Z
-*:com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams$Builder
- com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams$BuilderMixin
- com.intellij.polySymbols.query.PolySymbolsQueryParams$Builder
-*:com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams$BuilderMixin
- com.intellij.polySymbols.query.PolySymbolsQueryParams$Builder
- a:strictScope(Z):java.lang.Object
-*f:com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams$Companion
- f:create(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,Z):com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams
- f:create(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,Z,kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams
- bs:create$default(com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams$Companion,com.intellij.polySymbols.query.PolySymbolsQueryExecutor,Z,kotlin.jvm.functions.Function1,I,java.lang.Object):com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams
-*:com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams
- com.intellij.polySymbols.query.PolySymbolsQueryParams
- *sf:Companion:com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams$Companion
- s:create(com.intellij.polySymbols.query.PolySymbolsQueryExecutor):com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams
- s:create(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams
- a:getQueryExecutor():com.intellij.polySymbols.query.PolySymbolsQueryExecutor
- a:getStrictScope():Z
-*:com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams$Builder
- com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams$BuilderMixin
- com.intellij.polySymbols.query.PolySymbolsQueryParams$Builder
-*:com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams$BuilderMixin
- a:strictScope(Z):java.lang.Object
-*f:com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams$Companion
- f:create(com.intellij.polySymbols.query.PolySymbolsQueryExecutor):com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams
- f:create(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams
- bs:create$default(com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams$Companion,com.intellij.polySymbols.query.PolySymbolsQueryExecutor,kotlin.jvm.functions.Function1,I,java.lang.Object):com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams
-*:com.intellij.polySymbols.query.PolySymbolsQueryConfigurator
- *sf:Companion:com.intellij.polySymbols.query.PolySymbolsQueryConfigurator$Companion
+*:com.intellij.polySymbols.query.PolySymbolQueryConfigurator
+- *sf:Companion:com.intellij.polySymbols.query.PolySymbolQueryConfigurator$Companion
 - sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName
 - beforeQueryExecutorCreation(com.intellij.openapi.project.Project):V
 - getContextRulesProviders(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile):java.util.List
 - getNameConversionRulesProviders(com.intellij.openapi.project.Project,com.intellij.psi.PsiElement,com.intellij.polySymbols.context.PolyContext):java.util.List
 - getScope(com.intellij.openapi.project.Project,com.intellij.psi.PsiElement,com.intellij.polySymbols.context.PolyContext,Z):java.util.List
-*f:com.intellij.polySymbols.query.PolySymbolsQueryConfigurator$Companion
-*:com.intellij.polySymbols.query.PolySymbolsQueryExecutor
+*f:com.intellij.polySymbols.query.PolySymbolQueryConfigurator$Companion
+*:com.intellij.polySymbols.query.PolySymbolQueryExecutor
 - com.intellij.openapi.util.ModificationTracker
 - a:allowResolve():Z
- codeCompletionQuery(com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,I):com.intellij.polySymbols.query.PolySymbolsQueryExecutor$CodeCompletionQueryBuilder
+- codeCompletionQuery(com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,I):com.intellij.polySymbols.query.PolySymbolQueryExecutor$CodeCompletionQueryBuilder
 - codeCompletionQuery(com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,I,kotlin.jvm.functions.Function1):java.util.List
- a:codeCompletionQuery(java.util.List,I):com.intellij.polySymbols.query.PolySymbolsQueryExecutor$CodeCompletionQueryBuilder
+- a:codeCompletionQuery(java.util.List,I):com.intellij.polySymbols.query.PolySymbolQueryExecutor$CodeCompletionQueryBuilder
 - codeCompletionQuery(java.util.List,I,kotlin.jvm.functions.Function1):java.util.List
 - a:createPointer():com.intellij.model.Pointer
 - a:getContext():com.intellij.polySymbols.context.PolyContext
@@ -811,98 +808,101 @@
 - a:getKeepUnresolvedTopLevelReferences():Z
 - a:getLocation():com.intellij.psi.PsiElement
 - a:getNamesProvider():com.intellij.polySymbols.query.PolySymbolNamesProvider
- a:getResultsCustomizer():com.intellij.polySymbols.query.PolySymbolsQueryResultsCustomizer
+- a:getResultsCustomizer():com.intellij.polySymbols.query.PolySymbolQueryResultsCustomizer
 - a:hasExclusiveScopeFor(com.intellij.polySymbols.PolySymbolQualifiedKind,java.util.List):Z
- bs:hasExclusiveScopeFor$default(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,com.intellij.polySymbols.PolySymbolQualifiedKind,java.util.List,I,java.lang.Object):Z
- listSymbolsQuery(com.intellij.polySymbols.PolySymbolQualifiedKind,Z):com.intellij.polySymbols.query.PolySymbolsQueryExecutor$ListSymbolsQueryBuilder
+- bs:hasExclusiveScopeFor$default(com.intellij.polySymbols.query.PolySymbolQueryExecutor,com.intellij.polySymbols.PolySymbolQualifiedKind,java.util.List,I,java.lang.Object):Z
+- listSymbolsQuery(com.intellij.polySymbols.PolySymbolQualifiedKind,Z):com.intellij.polySymbols.query.PolySymbolQueryExecutor$ListSymbolsQueryBuilder
 - listSymbolsQuery(com.intellij.polySymbols.PolySymbolQualifiedKind,Z,kotlin.jvm.functions.Function1):java.util.List
- a:listSymbolsQuery(java.util.List,com.intellij.polySymbols.PolySymbolQualifiedKind,Z):com.intellij.polySymbols.query.PolySymbolsQueryExecutor$ListSymbolsQueryBuilder
+- a:listSymbolsQuery(java.util.List,com.intellij.polySymbols.PolySymbolQualifiedKind,Z):com.intellij.polySymbols.query.PolySymbolQueryExecutor$ListSymbolsQueryBuilder
 - listSymbolsQuery(java.util.List,com.intellij.polySymbols.PolySymbolQualifiedKind,Z,kotlin.jvm.functions.Function1):java.util.List
- bs:listSymbolsQuery$default(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,com.intellij.polySymbols.PolySymbolQualifiedKind,Z,kotlin.jvm.functions.Function1,I,java.lang.Object):java.util.List
- nameMatchQuery(com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String):com.intellij.polySymbols.query.PolySymbolsQueryExecutor$NameMatchQueryBuilder
+- bs:listSymbolsQuery$default(com.intellij.polySymbols.query.PolySymbolQueryExecutor,com.intellij.polySymbols.PolySymbolQualifiedKind,Z,kotlin.jvm.functions.Function1,I,java.lang.Object):java.util.List
+- nameMatchQuery(com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String):com.intellij.polySymbols.query.PolySymbolQueryExecutor$NameMatchQueryBuilder
 - nameMatchQuery(com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,kotlin.jvm.functions.Function1):java.util.List
- a:nameMatchQuery(java.util.List):com.intellij.polySymbols.query.PolySymbolsQueryExecutor$NameMatchQueryBuilder
+- a:nameMatchQuery(java.util.List):com.intellij.polySymbols.query.PolySymbolQueryExecutor$NameMatchQueryBuilder
 - nameMatchQuery(java.util.List,kotlin.jvm.functions.Function1):java.util.List
 - a:setKeepUnresolvedTopLevelReferences(Z):V
- a:withNameConversionRules(java.util.List):com.intellij.polySymbols.query.PolySymbolsQueryExecutor
-*:com.intellij.polySymbols.query.PolySymbolsQueryExecutor$CodeCompletionQueryBuilder
- com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams$BuilderMixin
- com.intellij.polySymbols.query.PolySymbolsQueryExecutor$QueryBuilder
+- a:withNameConversionRules(java.util.List):com.intellij.polySymbols.query.PolySymbolQueryExecutor
+*:com.intellij.polySymbols.query.PolySymbolQueryExecutor$CodeCompletionQueryBuilder
+- com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams$BuilderMixin
+- com.intellij.polySymbols.query.PolySymbolQueryExecutor$QueryBuilder
 - a:run():java.util.List
-*:com.intellij.polySymbols.query.PolySymbolsQueryExecutor$ListSymbolsQueryBuilder
- com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams$BuilderMixin
- com.intellij.polySymbols.query.PolySymbolsQueryExecutor$QueryBuilder
+*:com.intellij.polySymbols.query.PolySymbolQueryExecutor$ListSymbolsQueryBuilder
+- com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams$BuilderMixin
+- com.intellij.polySymbols.query.PolySymbolQueryExecutor$QueryBuilder
 - a:run():java.util.List
-*:com.intellij.polySymbols.query.PolySymbolsQueryExecutor$NameMatchQueryBuilder
- com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams$BuilderMixin
- com.intellij.polySymbols.query.PolySymbolsQueryExecutor$QueryBuilder
+*:com.intellij.polySymbols.query.PolySymbolQueryExecutor$NameMatchQueryBuilder
+- com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams$BuilderMixin
+- com.intellij.polySymbols.query.PolySymbolQueryExecutor$QueryBuilder
 - a:run():java.util.List
-*:com.intellij.polySymbols.query.PolySymbolsQueryExecutor$QueryBuilder
- com.intellij.polySymbols.query.PolySymbolsQueryParams$Builder
- a:additionalScope(com.intellij.polySymbols.query.PolySymbolsScope):java.lang.Object
+*:com.intellij.polySymbols.query.PolySymbolQueryExecutor$QueryBuilder
+- com.intellij.polySymbols.query.PolySymbolQueryParams$Builder
+- a:additionalScope(com.intellij.polySymbols.query.PolySymbolScope):java.lang.Object
 - a:additionalScope(java.util.Collection):java.lang.Object
- a:additionalScope(com.intellij.polySymbols.query.PolySymbolsScope[]):java.lang.Object
-*:com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory
+- a:additionalScope(com.intellij.polySymbols.query.PolySymbolScope[]):java.lang.Object
+*:com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory
 - com.intellij.openapi.Disposable
- *sf:Companion:com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory$Companion
- a:addScope(com.intellij.polySymbols.query.PolySymbolsScope,com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.Disposable):V
- a:create(com.intellij.psi.PsiElement,Z):com.intellij.polySymbols.query.PolySymbolsQueryExecutor
- bs:create$default(com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory,com.intellij.psi.PsiElement,Z,I,java.lang.Object):com.intellij.polySymbols.query.PolySymbolsQueryExecutor
- s:getInstance(com.intellij.openapi.project.Project):com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory
-*f:com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory$Companion
- f:create(com.intellij.psi.PsiElement,Z):com.intellij.polySymbols.query.PolySymbolsQueryExecutor
- bs:create$default(com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory$Companion,com.intellij.psi.PsiElement,Z,I,java.lang.Object):com.intellij.polySymbols.query.PolySymbolsQueryExecutor
- f:createCustom():com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory$PolySymbolsQueryExecutorBuilder
- f:createCustom(kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolsQueryExecutor
- f:getInstance(com.intellij.openapi.project.Project):com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory
-*:com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory$PolySymbolsQueryExecutorBuilder
- a:addCustomizer(com.intellij.polySymbols.query.PolySymbolsQueryResultsCustomizer):com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory$PolySymbolsQueryExecutorBuilder
- a:addNameConversionRules(com.intellij.polySymbols.query.PolySymbolNameConversionRules):com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory$PolySymbolsQueryExecutorBuilder
- a:addPolyContext(java.lang.String,java.lang.String):com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory$PolySymbolsQueryExecutorBuilder
- a:addRootScope(com.intellij.polySymbols.query.PolySymbolsScope):com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory$PolySymbolsQueryExecutorBuilder
- a:addRootScopes(java.util.List):com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory$PolySymbolsQueryExecutorBuilder
- a:allowResolve(Z):com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory$PolySymbolsQueryExecutorBuilder
- a:create():com.intellij.polySymbols.query.PolySymbolsQueryExecutor
- a:setFramework(java.lang.String):com.intellij.polySymbols.query.PolySymbolsQueryExecutorFactory$PolySymbolsQueryExecutorBuilder
-*:com.intellij.polySymbols.query.PolySymbolsQueryExecutorListener
- *sf:Companion:com.intellij.polySymbols.query.PolySymbolsQueryExecutorListener$Companion
- a:afterQuery(com.intellij.polySymbols.query.PolySymbolsQueryParams):V
- a:beforeQuery(com.intellij.polySymbols.query.PolySymbolsQueryParams):V
-*f:com.intellij.polySymbols.query.PolySymbolsQueryExecutorListener$Companion
+- *sf:Companion:com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory$Companion
+- a:addScope(com.intellij.polySymbols.query.PolySymbolScope,com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.Disposable):V
+- a:create(com.intellij.psi.PsiElement,Z):com.intellij.polySymbols.query.PolySymbolQueryExecutor
+- bs:create$default(com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory,com.intellij.psi.PsiElement,Z,I,java.lang.Object):com.intellij.polySymbols.query.PolySymbolQueryExecutor
+- s:getInstance(com.intellij.openapi.project.Project):com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory
+*f:com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory$Companion
+- f:create(com.intellij.psi.PsiElement,Z):com.intellij.polySymbols.query.PolySymbolQueryExecutor
+- bs:create$default(com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory$Companion,com.intellij.psi.PsiElement,Z,I,java.lang.Object):com.intellij.polySymbols.query.PolySymbolQueryExecutor
+- f:createCustom():com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory$PolySymbolQueryExecutorBuilder
+- f:createCustom(kotlin.jvm.functions.Function1):com.intellij.polySymbols.query.PolySymbolQueryExecutor
+- f:getInstance(com.intellij.openapi.project.Project):com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory
+*:com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory$PolySymbolQueryExecutorBuilder
+- a:addCustomizer(com.intellij.polySymbols.query.PolySymbolQueryResultsCustomizer):com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory$PolySymbolQueryExecutorBuilder
+- a:addNameConversionRules(com.intellij.polySymbols.query.PolySymbolNameConversionRules):com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory$PolySymbolQueryExecutorBuilder
+- a:addPolyContext(java.lang.String,java.lang.String):com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory$PolySymbolQueryExecutorBuilder
+- a:addRootScope(com.intellij.polySymbols.query.PolySymbolScope):com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory$PolySymbolQueryExecutorBuilder
+- a:addRootScopes(java.util.List):com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory$PolySymbolQueryExecutorBuilder
+- a:allowResolve(Z):com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory$PolySymbolQueryExecutorBuilder
+- a:create():com.intellij.polySymbols.query.PolySymbolQueryExecutor
+- a:setFramework(java.lang.String):com.intellij.polySymbols.query.PolySymbolQueryExecutorFactory$PolySymbolQueryExecutorBuilder
+*:com.intellij.polySymbols.query.PolySymbolQueryExecutorListener
+- *sf:Companion:com.intellij.polySymbols.query.PolySymbolQueryExecutorListener$Companion
+- a:afterQuery(com.intellij.polySymbols.query.PolySymbolQueryParams):V
+- a:beforeQuery(com.intellij.polySymbols.query.PolySymbolQueryParams):V
+*f:com.intellij.polySymbols.query.PolySymbolQueryExecutorListener$Companion
 - f:getTOPIC():com.intellij.util.messages.Topic
-*:com.intellij.polySymbols.query.PolySymbolsQueryParams
+*:com.intellij.polySymbols.query.PolySymbolQueryParams
 - accept(com.intellij.polySymbols.PolySymbol):Z
 - a:getExcludeModifiers():java.util.List
 - getFramework():java.lang.String
- a:getQueryExecutor():com.intellij.polySymbols.query.PolySymbolsQueryExecutor
+- a:getQueryExecutor():com.intellij.polySymbols.query.PolySymbolQueryExecutor
 - a:getRequiredModifiers():java.util.List
-*:com.intellij.polySymbols.query.PolySymbolsQueryParams$Builder
- copyFiltersFrom(com.intellij.polySymbols.query.PolySymbolsQueryParams):V
+*:com.intellij.polySymbols.query.PolySymbolQueryParams$Builder
+- copyFiltersFrom(com.intellij.polySymbols.query.PolySymbolQueryParams):V
 - a:exclude(com.intellij.polySymbols.PolySymbolModifier):java.lang.Object
 - a:exclude(java.util.Collection):java.lang.Object
 - a:exclude(com.intellij.polySymbols.PolySymbolModifier[]):java.lang.Object
 - a:require(com.intellij.polySymbols.PolySymbolModifier):java.lang.Object
 - a:require(java.util.Collection):java.lang.Object
 - a:require(com.intellij.polySymbols.PolySymbolModifier[]):java.lang.Object
-*:com.intellij.polySymbols.query.PolySymbolsQueryResultsCustomizer
+*:com.intellij.polySymbols.query.PolySymbolQueryResultsCustomizer
 - com.intellij.openapi.util.ModificationTracker
 - a:apply(com.intellij.polySymbols.completion.PolySymbolCodeCompletionItem,com.intellij.polySymbols.PolySymbolQualifiedKind):com.intellij.polySymbols.completion.PolySymbolCodeCompletionItem
 - a:apply(java.util.List,Z,com.intellij.polySymbols.PolySymbolQualifiedName):java.util.List
 - a:createPointer():com.intellij.model.Pointer
-*:com.intellij.polySymbols.query.PolySymbolsQueryResultsCustomizerFactory
- *sf:Companion:com.intellij.polySymbols.query.PolySymbolsQueryResultsCustomizerFactory$Companion
+*:com.intellij.polySymbols.query.PolySymbolQueryResultsCustomizerFactory
+- *sf:Companion:com.intellij.polySymbols.query.PolySymbolQueryResultsCustomizerFactory$Companion
 - sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName
- a:create(com.intellij.psi.PsiElement,com.intellij.polySymbols.context.PolyContext):com.intellij.polySymbols.query.PolySymbolsQueryResultsCustomizer
- s:getQueryResultsCustomizer(com.intellij.psi.PsiElement,com.intellij.polySymbols.context.PolyContext):com.intellij.polySymbols.query.PolySymbolsQueryResultsCustomizer
-*f:com.intellij.polySymbols.query.PolySymbolsQueryResultsCustomizerFactory$Companion
- f:getQueryResultsCustomizer(com.intellij.psi.PsiElement,com.intellij.polySymbols.context.PolyContext):com.intellij.polySymbols.query.PolySymbolsQueryResultsCustomizer
-*:com.intellij.polySymbols.query.PolySymbolsScope
+- a:create(com.intellij.psi.PsiElement,com.intellij.polySymbols.context.PolyContext):com.intellij.polySymbols.query.PolySymbolQueryResultsCustomizer
+- s:getQueryResultsCustomizer(com.intellij.psi.PsiElement,com.intellij.polySymbols.context.PolyContext):com.intellij.polySymbols.query.PolySymbolQueryResultsCustomizer
+*f:com.intellij.polySymbols.query.PolySymbolQueryResultsCustomizerFactory$Companion
+- f:getQueryResultsCustomizer(com.intellij.psi.PsiElement,com.intellij.polySymbols.context.PolyContext):com.intellij.polySymbols.query.PolySymbolQueryResultsCustomizer
+*:com.intellij.polySymbols.query.PolySymbolScope
 - com.intellij.openapi.util.ModificationTracker
 - a:createPointer():com.intellij.model.Pointer
- getCodeCompletions(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
- getMatchingSymbols(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
- getSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind,com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams,com.intellij.util.containers.Stack):java.util.List
+- getCodeCompletions(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
+- getMatchingSymbols(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
+- getSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind,com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams,com.intellij.util.containers.Stack):java.util.List
 - isExclusiveFor(com.intellij.polySymbols.PolySymbolQualifiedKind):Z
+*:com.intellij.polySymbols.query.PolySymbolWithPattern
+- com.intellij.polySymbols.PolySymbol
+- a:getPattern():com.intellij.polySymbols.patterns.PolySymbolPattern
 *:com.intellij.polySymbols.refactoring.PolySymbolRenameTarget
 - com.intellij.refactoring.rename.api.RenameTarget
 - *sf:Companion:com.intellij.polySymbols.refactoring.PolySymbolRenameTarget$Companion
@@ -934,7 +934,7 @@
 - createPointer():com.intellij.model.Pointer
 - getName():java.lang.String
 - getOrigin():com.intellij.polySymbols.PolySymbolOrigin
- getPattern():com.intellij.polySymbols.patterns.PolySymbolsPattern
+- getPattern():com.intellij.polySymbols.patterns.PolySymbolPattern
 - getPriority():com.intellij.polySymbols.PolySymbol$Priority
 - getQualifiedKind():com.intellij.polySymbols.PolySymbolQualifiedKind
 *f:com.intellij.polySymbols.utils.MappedPolySymbol$Companion
@@ -973,17 +973,17 @@
 - navigationRequest():com.intellij.platform.backend.navigation.NavigationRequest
 *:com.intellij.polySymbols.utils.PolySymbolDelegate
 - com.intellij.polySymbols.PolySymbol
- com.intellij.polySymbols.query.PolySymbolsScope
+- com.intellij.polySymbols.query.PolySymbolScope
 - *sf:Companion:com.intellij.polySymbols.utils.PolySymbolDelegate$Companion
 - a:createPointer():com.intellij.model.Pointer
 - get(com.intellij.polySymbols.PolySymbolProperty):java.lang.Object
 - getApiStatus():com.intellij.polySymbols.PolySymbolApiStatus
- getCodeCompletions(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
+- getCodeCompletions(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
 - a:getDelegate():com.intellij.polySymbols.PolySymbol
 - getDocumentationTarget(com.intellij.psi.PsiElement):com.intellij.platform.backend.documentation.DocumentationTarget
 - getExtension():Z
 - getIcon():javax.swing.Icon
- getMatchingSymbols(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
+- getMatchingSymbols(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
 - getModificationCount():J
 - getModifiers():java.util.Set
 - getName():java.lang.String
@@ -995,7 +995,7 @@
 - getQueryScope():java.util.List
 - getRenameTarget():com.intellij.polySymbols.refactoring.PolySymbolRenameTarget
 - getSearchTarget():com.intellij.polySymbols.search.PolySymbolSearchTarget
- getSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind,com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams,com.intellij.util.containers.Stack):java.util.List
+- getSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind,com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams,com.intellij.util.containers.Stack):java.util.List
 - isExclusiveFor(com.intellij.polySymbols.PolySymbolQualifiedKind):Z
 - s:unwrapAllDelegates(com.intellij.polySymbols.PolySymbol):com.intellij.polySymbols.PolySymbol
 *f:com.intellij.polySymbols.utils.PolySymbolDelegate$Companion
@@ -1010,6 +1010,74 @@
 - getDescriptionSections():java.util.Map
 - getDocUrl():java.lang.String
 - getDocumentationTarget(com.intellij.psi.PsiElement):com.intellij.platform.backend.documentation.DocumentationTarget
+*a:com.intellij.polySymbols.utils.PolySymbolIsolatedMappingScope
+- com.intellij.polySymbols.query.PolySymbolScope
+- <init>(java.util.Map,java.lang.String,com.intellij.psi.PsiElement):V
+- pa:acceptSymbol(com.intellij.polySymbols.PolySymbol):Z
+- f:equals(java.lang.Object):Z
+- getCodeCompletions(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
+- pf:getFramework():java.lang.String
+- pf:getLocation():com.intellij.psi.PsiElement
+- pf:getMappings():java.util.Map
+- getMatchingSymbols(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
+- f:getModificationCount():J
+- pa:getSubScopeBuilder():kotlin.jvm.functions.Function2
+- getSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind,com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams,com.intellij.util.containers.Stack):java.util.List
+- hashCode():I
+*:com.intellij.polySymbols.utils.PolySymbolPrioritizedScope
+- a:getPriority():com.intellij.polySymbols.PolySymbol$Priority
+*a:com.intellij.polySymbols.utils.PolySymbolScopeWithCache
+- com.intellij.polySymbols.query.PolySymbolScope
+- <init>(java.lang.String,com.intellij.openapi.project.Project,com.intellij.openapi.util.UserDataHolder,java.lang.Object):V
+- a:createPointer():com.intellij.model.Pointer
+- equals(java.lang.Object):Z
+- getCodeCompletions(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
+- pf:getDataHolder():com.intellij.openapi.util.UserDataHolder
+- pf:getFramework():java.lang.String
+- pf:getKey():java.lang.Object
+- getMatchingSymbols(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
+- getModificationCount():J
+- pf:getProject():com.intellij.openapi.project.Project
+- getSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind,com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams,com.intellij.util.containers.Stack):java.util.List
+- hashCode():I
+- pa:initialize(kotlin.jvm.functions.Function1,java.util.Set):V
+- pa:provides(com.intellij.polySymbols.PolySymbolQualifiedKind):Z
+*a:com.intellij.polySymbols.utils.PolySymbolStructuredScope
+- com.intellij.polySymbols.query.PolySymbolCompoundScope
+- <init>(com.intellij.psi.PsiElement):V
+- p:build(com.intellij.polySymbols.query.PolySymbolQueryExecutor,kotlin.jvm.functions.Function1):V
+- a:createPointer():com.intellij.model.Pointer
+- equals(java.lang.Object):Z
+- p:findBestMatchingScope(com.intellij.polySymbols.utils.PolySymbolStructuredScope$PolySymbolPsiScope):com.intellij.polySymbols.utils.PolySymbolStructuredScope$PolySymbolPsiScope
+- pf:getCurrentScope():com.intellij.polySymbols.utils.PolySymbolStructuredScope$PolySymbolPsiScope
+- pf:getLocation():com.intellij.psi.PsiElement
+- pa:getProvidedSymbolKinds():java.util.Set
+- pa:getRootPsiElement():com.intellij.psi.PsiElement
+- pf:getRootScope():com.intellij.polySymbols.utils.PolySymbolStructuredScope$PolySymbolPsiScope
+- pa:getScopesBuilderProvider():kotlin.jvm.functions.Function2
+- hashCode():I
+*p:com.intellij.polySymbols.utils.PolySymbolStructuredScope$PolySymbolPsiScope
+- com.intellij.polySymbols.query.PolySymbolScope
+- a:getAllSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind):java.util.List
+- a:getChildren():java.util.List
+- a:getLocalSymbols():java.util.List
+- a:getParent():com.intellij.polySymbols.utils.PolySymbolStructuredScope$PolySymbolPsiScope
+- a:getProperties():java.util.Map
+- a:getSource():com.intellij.psi.PsiElement
+*pf:com.intellij.polySymbols.utils.PolySymbolStructuredScope$PolySymbolPsiScopesHolder
+- <init>(com.intellij.psi.PsiElement,java.util.Set):V
+- f:currentScope():com.intellij.polySymbols.utils.PolySymbolStructuredScope$PolySymbolPsiScope
+- f:currentScope(kotlin.jvm.functions.Function1):V
+- f:getProvidedSymbolKinds():java.util.Set
+- f:getRootElement():com.intellij.psi.PsiElement
+- f:popScope():V
+- f:previousScope():com.intellij.polySymbols.utils.PolySymbolStructuredScope$PolySymbolPsiScope
+- f:previousScope(kotlin.jvm.functions.Function1):V
+- f:pushScope(com.intellij.psi.PsiElement,java.util.Map,java.util.Set,kotlin.jvm.functions.Function1):V
+- bs:pushScope$default(com.intellij.polySymbols.utils.PolySymbolStructuredScope$PolySymbolPsiScopesHolder,com.intellij.psi.PsiElement,java.util.Map,java.util.Set,kotlin.jvm.functions.Function1,I,java.lang.Object):V
+*:com.intellij.polySymbols.utils.PolySymbolStructuredScope$PolySymbolPsiScopesHolder$ScopeModifier
+- a:addSymbol(com.intellij.polySymbols.PolySymbol):V
+- a:addSymbols(java.util.List):V
 *:com.intellij.polySymbols.utils.PolySymbolTypeSupport
 - a:getTypeProperty():com.intellij.polySymbols.PolySymbolProperty
 - a:resolve(java.util.List):java.lang.Object
@@ -1028,7 +1096,7 @@
 - sf:coalesceWith(com.intellij.polySymbols.PolySymbolApiStatus,com.intellij.polySymbols.PolySymbolApiStatus):com.intellij.polySymbols.PolySymbolApiStatus
 - sf:createPsiRangeNavigationItem(com.intellij.platform.backend.navigation.NavigationTarget,com.intellij.psi.PsiElement,I):com.intellij.pom.Navigatable
 - sf:getCompleteMatch(com.intellij.polySymbols.PolySymbol):Z
- sf:getDefaultCodeCompletions(com.intellij.polySymbols.query.PolySymbolsScope,com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
+- sf:getDefaultCodeCompletions(com.intellij.polySymbols.query.PolySymbolScope,com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
 - sf:getHideFromCompletion(com.intellij.polySymbols.PolySymbol):Z
 - sf:getKind(com.intellij.polySymbols.PolySymbol):java.lang.String
 - sf:getNameSegments(com.intellij.polySymbols.PolySymbol):java.util.List
@@ -1037,10 +1105,10 @@
 - sf:getQualifiedName(com.intellij.polySymbols.PolySymbol):com.intellij.polySymbols.PolySymbolQualifiedName
 - sf:hasOnlyExtensions(java.util.List):Z
 - sf:isCritical(com.intellij.polySymbols.PolySymbolNameSegment$MatchProblem):Z
- sf:match(com.intellij.polySymbols.PolySymbol,java.lang.String,com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
+- sf:match(com.intellij.polySymbols.PolySymbol,java.lang.String,com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
 - sf:merge(kotlin.sequences.Sequence):com.intellij.polySymbols.html.PolySymbolHtmlAttributeValue
- sf:nameMatches(com.intellij.polySymbols.PolySymbol,java.lang.String,com.intellij.polySymbols.query.PolySymbolsQueryExecutor):Z
- sf:toCodeCompletionItems(com.intellij.polySymbols.PolySymbol,java.lang.String,com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
+- sf:nameMatches(com.intellij.polySymbols.PolySymbol,java.lang.String,com.intellij.polySymbols.query.PolySymbolQueryExecutor):Z
+- sf:toCodeCompletionItems(com.intellij.polySymbols.PolySymbol,java.lang.String,com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
 - sf:unwrapMatchedSymbols(com.intellij.polySymbols.PolySymbol):kotlin.sequences.Sequence
 - sf:withMatchedKind(com.intellij.polySymbols.PolySymbol,com.intellij.polySymbols.PolySymbolQualifiedKind):com.intellij.polySymbols.PolySymbol
 - sf:withMatchedName(com.intellij.polySymbols.PolySymbol,java.lang.String):com.intellij.polySymbols.PolySymbol
@@ -1048,74 +1116,6 @@
 - sf:withOffset(java.util.List,I):java.util.List
 - sf:withSegments(com.intellij.polySymbols.query.PolySymbolMatch,java.util.List):com.intellij.polySymbols.query.PolySymbolMatch
 - sf:withSymbols(com.intellij.polySymbols.PolySymbolNameSegment,java.util.List):com.intellij.polySymbols.PolySymbolNameSegment
-*a:com.intellij.polySymbols.utils.PolySymbolsIsolatedMappingScope
- com.intellij.polySymbols.query.PolySymbolsScope
- <init>(java.util.Map,java.lang.String,com.intellij.psi.PsiElement):V
- pa:acceptSymbol(com.intellij.polySymbols.PolySymbol):Z
- f:equals(java.lang.Object):Z
- getCodeCompletions(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
- pf:getFramework():java.lang.String
- pf:getLocation():com.intellij.psi.PsiElement
- pf:getMappings():java.util.Map
- getMatchingSymbols(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
- f:getModificationCount():J
- pa:getSubScopeBuilder():kotlin.jvm.functions.Function2
- getSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind,com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams,com.intellij.util.containers.Stack):java.util.List
- hashCode():I
-*:com.intellij.polySymbols.utils.PolySymbolsPrioritizedScope
- a:getPriority():com.intellij.polySymbols.PolySymbol$Priority
-*a:com.intellij.polySymbols.utils.PolySymbolsScopeWithCache
- com.intellij.polySymbols.query.PolySymbolsScope
- <init>(java.lang.String,com.intellij.openapi.project.Project,com.intellij.openapi.util.UserDataHolder,java.lang.Object):V
- a:createPointer():com.intellij.model.Pointer
- equals(java.lang.Object):Z
- getCodeCompletions(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
- pf:getDataHolder():com.intellij.openapi.util.UserDataHolder
- pf:getFramework():java.lang.String
- pf:getKey():java.lang.Object
- getMatchingSymbols(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
- getModificationCount():J
- pf:getProject():com.intellij.openapi.project.Project
- getSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind,com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams,com.intellij.util.containers.Stack):java.util.List
- hashCode():I
- pa:initialize(kotlin.jvm.functions.Function1,java.util.Set):V
- pa:provides(com.intellij.polySymbols.PolySymbolQualifiedKind):Z
-*a:com.intellij.polySymbols.utils.PolySymbolsStructuredScope
- com.intellij.polySymbols.query.PolySymbolsCompoundScope
- <init>(com.intellij.psi.PsiElement):V
- p:build(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,kotlin.jvm.functions.Function1):V
- a:createPointer():com.intellij.model.Pointer
- equals(java.lang.Object):Z
- p:findBestMatchingScope(com.intellij.polySymbols.utils.PolySymbolsStructuredScope$PolySymbolsPsiScope):com.intellij.polySymbols.utils.PolySymbolsStructuredScope$PolySymbolsPsiScope
- pf:getCurrentScope():com.intellij.polySymbols.utils.PolySymbolsStructuredScope$PolySymbolsPsiScope
- pf:getLocation():com.intellij.psi.PsiElement
- pa:getProvidedSymbolKinds():java.util.Set
- pa:getRootPsiElement():com.intellij.psi.PsiElement
- pf:getRootScope():com.intellij.polySymbols.utils.PolySymbolsStructuredScope$PolySymbolsPsiScope
- pa:getScopesBuilderProvider():kotlin.jvm.functions.Function2
- hashCode():I
-*p:com.intellij.polySymbols.utils.PolySymbolsStructuredScope$PolySymbolsPsiScope
- com.intellij.polySymbols.query.PolySymbolsScope
- a:getAllSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind):java.util.List
- a:getChildren():java.util.List
- a:getLocalSymbols():java.util.List
- a:getParent():com.intellij.polySymbols.utils.PolySymbolsStructuredScope$PolySymbolsPsiScope
- a:getProperties():java.util.Map
- a:getSource():com.intellij.psi.PsiElement
-*pf:com.intellij.polySymbols.utils.PolySymbolsStructuredScope$PolySymbolsPsiScopesHolder
- <init>(com.intellij.psi.PsiElement,java.util.Set):V
- f:currentScope():com.intellij.polySymbols.utils.PolySymbolsStructuredScope$PolySymbolsPsiScope
- f:currentScope(kotlin.jvm.functions.Function1):V
- f:getProvidedSymbolKinds():java.util.Set
- f:getRootElement():com.intellij.psi.PsiElement
- f:popScope():V
- f:previousScope():com.intellij.polySymbols.utils.PolySymbolsStructuredScope$PolySymbolsPsiScope
- f:previousScope(kotlin.jvm.functions.Function1):V
- f:pushScope(com.intellij.psi.PsiElement,java.util.Map,java.util.Set,kotlin.jvm.functions.Function1):V
- bs:pushScope$default(com.intellij.polySymbols.utils.PolySymbolsStructuredScope$PolySymbolsPsiScopesHolder,com.intellij.psi.PsiElement,java.util.Map,java.util.Set,kotlin.jvm.functions.Function1,I,java.lang.Object):V
-*:com.intellij.polySymbols.utils.PolySymbolsStructuredScope$PolySymbolsPsiScopesHolder$ScopeModifier
- a:addSymbol(com.intellij.polySymbols.PolySymbol):V
- a:addSymbols(java.util.List):V
 *:com.intellij.polySymbols.utils.PsiSourcedPolySymbolDelegate
 - com.intellij.polySymbols.search.PsiSourcedPolySymbol
 - com.intellij.polySymbols.utils.PolySymbolDelegate
@@ -1133,7 +1133,7 @@
 - equals(java.lang.Object):Z
 - getName():java.lang.String
 - getOrigin():com.intellij.polySymbols.PolySymbolOrigin
- getPattern():com.intellij.polySymbols.patterns.PolySymbolsPattern
+- getPattern():com.intellij.polySymbols.patterns.PolySymbolPattern
 - getPriority():com.intellij.polySymbols.PolySymbol$Priority
 - getQualifiedKind():com.intellij.polySymbols.PolySymbolQualifiedKind
 - hashCode():I
@@ -1144,7 +1144,7 @@
 - bs:create$default(com.intellij.polySymbols.utils.ReferencingPolySymbol$Companion,com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,com.intellij.polySymbols.PolySymbolOrigin,com.intellij.polySymbols.PolySymbolQualifiedKind[],com.intellij.polySymbols.PolySymbol$Priority,java.util.List,I,java.lang.Object):com.intellij.polySymbols.utils.ReferencingPolySymbol
 *:com.intellij.polySymbols.webTypes.WebTypesSymbol
 - com.intellij.polySymbols.documentation.PolySymbolWithDocumentation
- com.intellij.polySymbols.query.PolySymbolsScope
+- com.intellij.polySymbols.query.PolySymbolScope
 - com.intellij.polySymbols.search.PsiSourcedPolySymbol
 - *sf:Companion:com.intellij.polySymbols.webTypes.WebTypesSymbol$Companion
 - sf:PROP_NO_DOC:com.intellij.polySymbols.PolySymbolProperty
@@ -1187,13 +1187,13 @@
 - f:create(java.lang.String,java.lang.String):com.intellij.polySymbols.webTypes.WebTypesSymbol$ModuleExport
 *c:com.intellij.polySymbols.webTypes.WebTypesSymbolBase
 - com.intellij.polySymbols.webTypes.WebTypesSymbol
- p:queryExecutor:com.intellij.polySymbols.query.PolySymbolsQueryExecutor
+- p:queryExecutor:com.intellij.polySymbols.query.PolySymbolQueryExecutor
 - <init>():V
 - createPointer():com.intellij.model.Pointer
 - equals(java.lang.Object):Z
 - get(com.intellij.polySymbols.PolySymbolProperty):java.lang.Object
 - f:getApiStatus():com.intellij.polySymbols.PolySymbolApiStatus
- f:getCodeCompletions(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
+- f:getCodeCompletions(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolCodeCompletionQueryParams,com.intellij.util.containers.Stack):java.util.List
 - f:getDefaultValue():java.lang.String
 - f:getDescription():java.lang.String
 - f:getDescriptionSections():java.util.Map
@@ -1201,31 +1201,31 @@
 - f:getExtension():Z
 - f:getIcon():javax.swing.Icon
 - f:getLocation():com.intellij.polySymbols.webTypes.WebTypesSymbol$Location
- f:getMatchingSymbols(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolsNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
+- f:getMatchingSymbols(com.intellij.polySymbols.PolySymbolQualifiedName,com.intellij.polySymbols.query.PolySymbolNameMatchQueryParams,com.intellij.util.containers.Stack):java.util.List
 - getModificationCount():J
 - getModifiers():java.util.Set
 - f:getName():java.lang.String
 - f:getOrigin():com.intellij.polySymbols.PolySymbolOrigin
 - f:getPriority():com.intellij.polySymbols.PolySymbol$Priority
 - f:getQualifiedKind():com.intellij.polySymbols.PolySymbolQualifiedKind
- pf:getQueryExecutor():com.intellij.polySymbols.query.PolySymbolsQueryExecutor
+- pf:getQueryExecutor():com.intellij.polySymbols.query.PolySymbolQueryExecutor
 - f:getQueryScope():java.util.List
 - f:getSource():com.intellij.psi.PsiElement
- f:getSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind,com.intellij.polySymbols.query.PolySymbolsListSymbolsQueryParams,com.intellij.util.containers.Stack):java.util.List
+- f:getSymbols(com.intellij.polySymbols.PolySymbolQualifiedKind,com.intellij.polySymbols.query.PolySymbolListSymbolsQueryParams,com.intellij.util.containers.Stack):java.util.List
 - hashCode():I
 - isEquivalentTo(com.intellij.model.Symbol):Z
 - f:isExclusiveFor(com.intellij.polySymbols.PolySymbolQualifiedKind):Z
 - matchContext(com.intellij.polySymbols.context.PolyContext):Z
- pf:setQueryExecutor(com.intellij.polySymbols.query.PolySymbolsQueryExecutor):V
+- pf:setQueryExecutor(com.intellij.polySymbols.query.PolySymbolQueryExecutor):V
 *:com.intellij.polySymbols.webTypes.WebTypesSymbolFactory
 - a:create():com.intellij.polySymbols.webTypes.WebTypesSymbolBase
-*:com.intellij.polySymbols.webTypes.filters.PolySymbolsFilter
- *sf:Companion:com.intellij.polySymbols.webTypes.filters.PolySymbolsFilter$Companion
- a:filterCodeCompletions(java.util.List,com.intellij.polySymbols.query.PolySymbolsQueryExecutor,java.util.List,java.util.Map):java.util.List
- a:filterNameMatches(java.util.List,com.intellij.polySymbols.query.PolySymbolsQueryExecutor,java.util.List,java.util.Map):java.util.List
- s:get(java.lang.String):com.intellij.polySymbols.webTypes.filters.PolySymbolsFilter
-*f:com.intellij.polySymbols.webTypes.filters.PolySymbolsFilter$Companion
- f:get(java.lang.String):com.intellij.polySymbols.webTypes.filters.PolySymbolsFilter
+*:com.intellij.polySymbols.webTypes.filters.PolySymbolFilter
+- *sf:Companion:com.intellij.polySymbols.webTypes.filters.PolySymbolFilter$Companion
+- a:filterCodeCompletions(java.util.List,com.intellij.polySymbols.query.PolySymbolQueryExecutor,java.util.List,java.util.Map):java.util.List
+- a:filterNameMatches(java.util.List,com.intellij.polySymbols.query.PolySymbolQueryExecutor,java.util.List,java.util.Map):java.util.List
+- s:get(java.lang.String):com.intellij.polySymbols.webTypes.filters.PolySymbolFilter
+*f:com.intellij.polySymbols.webTypes.filters.PolySymbolFilter$Companion
+- f:get(java.lang.String):com.intellij.polySymbols.webTypes.filters.PolySymbolFilter
 *f:com.intellij.webSymbols.references.WebSymbolReferenceProvider
 - *sf:Companion:com.intellij.webSymbols.references.WebSymbolReferenceProvider$Companion
 - <init>():V
--- a/platform/polySymbols/backend/api-dump-experimental.txt
+++ b/platform/polySymbols/backend/api-dump-experimental.txt
@@ -18,18 +18,18 @@
 - com.intellij.codeInsight.completion.CompletionProvider
 - *sf:Companion:com.intellij.polySymbols.completion.PolySymbolsCompletionProviderBase$Companion
 - <init>():V
- pa:addCompletions(com.intellij.codeInsight.completion.CompletionParameters,com.intellij.codeInsight.completion.CompletionResultSet,I,java.lang.String,com.intellij.polySymbols.query.PolySymbolsQueryExecutor,com.intellij.psi.PsiElement):V
+- pa:addCompletions(com.intellij.codeInsight.completion.CompletionParameters,com.intellij.codeInsight.completion.CompletionResultSet,I,java.lang.String,com.intellij.polySymbols.query.PolySymbolQueryExecutor,com.intellij.psi.PsiElement):V
 - pf:addCompletions(com.intellij.codeInsight.completion.CompletionParameters,com.intellij.util.ProcessingContext,com.intellij.codeInsight.completion.CompletionResultSet):V
 - pa:getContext(com.intellij.psi.PsiElement):com.intellij.psi.PsiElement
 - sf:isFurtherCodeCompletionPreventedFor(com.intellij.codeInsight.completion.CompletionParameters,com.intellij.polySymbols.PolySymbolQualifiedKind[]):Z
 - sf:preventFurtherCodeCompletionsFor(com.intellij.codeInsight.completion.CompletionParameters,com.intellij.polySymbols.PolySymbolQualifiedKind):V
- sf:processCompletionQueryResults(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,com.intellij.codeInsight.completion.CompletionResultSet,com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,I,com.intellij.psi.PsiElement,java.util.List,java.util.Set,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1):V
+- sf:processCompletionQueryResults(com.intellij.polySymbols.query.PolySymbolQueryExecutor,com.intellij.codeInsight.completion.CompletionResultSet,com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,I,com.intellij.psi.PsiElement,java.util.List,java.util.Set,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1):V
 - sf:processPolySymbolCodeCompletionItems(java.util.List,com.intellij.codeInsight.completion.CompletionResultSet,com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,java.lang.String,com.intellij.psi.PsiElement,java.util.Set,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1):V
 *f:com.intellij.polySymbols.completion.PolySymbolsCompletionProviderBase$Companion
 - f:isFurtherCodeCompletionPreventedFor(com.intellij.codeInsight.completion.CompletionParameters,com.intellij.polySymbols.PolySymbolQualifiedKind[]):Z
 - f:preventFurtherCodeCompletionsFor(com.intellij.codeInsight.completion.CompletionParameters,com.intellij.polySymbols.PolySymbolQualifiedKind):V
- f:processCompletionQueryResults(com.intellij.polySymbols.query.PolySymbolsQueryExecutor,com.intellij.codeInsight.completion.CompletionResultSet,com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,I,com.intellij.psi.PsiElement,java.util.List,java.util.Set,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1):V
- bs:processCompletionQueryResults$default(com.intellij.polySymbols.completion.PolySymbolsCompletionProviderBase$Companion,com.intellij.polySymbols.query.PolySymbolsQueryExecutor,com.intellij.codeInsight.completion.CompletionResultSet,com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,I,com.intellij.psi.PsiElement,java.util.List,java.util.Set,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,I,java.lang.Object):V
+- f:processCompletionQueryResults(com.intellij.polySymbols.query.PolySymbolQueryExecutor,com.intellij.codeInsight.completion.CompletionResultSet,com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,I,com.intellij.psi.PsiElement,java.util.List,java.util.Set,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1):V
+- bs:processCompletionQueryResults$default(com.intellij.polySymbols.completion.PolySymbolsCompletionProviderBase$Companion,com.intellij.polySymbols.query.PolySymbolQueryExecutor,com.intellij.codeInsight.completion.CompletionResultSet,com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,I,com.intellij.psi.PsiElement,java.util.List,java.util.Set,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,I,java.lang.Object):V
 - f:processPolySymbolCodeCompletionItems(java.util.List,com.intellij.codeInsight.completion.CompletionResultSet,com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,java.lang.String,com.intellij.psi.PsiElement,java.util.Set,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1):V
 - bs:processPolySymbolCodeCompletionItems$default(com.intellij.polySymbols.completion.PolySymbolsCompletionProviderBase$Companion,java.util.List,com.intellij.codeInsight.completion.CompletionResultSet,com.intellij.polySymbols.PolySymbolQualifiedKind,java.lang.String,java.lang.String,com.intellij.psi.PsiElement,java.util.Set,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function1,I,java.lang.Object):V
 *:com.intellij.polySymbols.highlighting.PolySymbolHighlightingCustomizer
@@ -39,13 +39,13 @@
 - getSymbolKindTextAttributes(com.intellij.polySymbols.PolySymbolQualifiedKind):com.intellij.openapi.editor.colors.TextAttributesKey
 - getSymbolTextAttributes(com.intellij.model.psi.PsiExternalReferenceHost,com.intellij.polySymbols.PolySymbol,I):com.intellij.openapi.editor.colors.TextAttributesKey
 *f:com.intellij.polySymbols.highlighting.PolySymbolHighlightingCustomizer$Companion
-*f:com.intellij.polySymbols.highlighting.PolySymbolsHighlightingUtilsKt
+*f:com.intellij.polySymbols.highlighting.PolySymbolHighlightingUtilsKt
 - sf:newSilentAnnotationWithDebugInfo(com.intellij.lang.annotation.AnnotationHolder,com.intellij.lang.annotation.HighlightSeverity,java.lang.String):com.intellij.lang.annotation.AnnotationBuilder
-*:com.intellij.polySymbols.inspections.PolySymbolsProblemQuickFixProvider
- *sf:Companion:com.intellij.polySymbols.inspections.PolySymbolsProblemQuickFixProvider$Companion
+*:com.intellij.polySymbols.inspections.PolySymbolProblemQuickFixProvider
+- *sf:Companion:com.intellij.polySymbols.inspections.PolySymbolProblemQuickFixProvider$Companion
 - sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName
 - a:getQuickFixes(com.intellij.psi.PsiElement,com.intellij.polySymbols.PolySymbol,com.intellij.polySymbols.PolySymbolNameSegment,com.intellij.polySymbols.references.PolySymbolReferenceProblem$ProblemKind):java.util.List
-*f:com.intellij.polySymbols.inspections.PolySymbolsProblemQuickFixProvider$Companion
+*f:com.intellij.polySymbols.inspections.PolySymbolProblemQuickFixProvider$Companion
 - f:getQuickFixes(com.intellij.psi.PsiElement,com.intellij.polySymbols.PolySymbol,com.intellij.polySymbols.PolySymbolNameSegment,com.intellij.polySymbols.references.PolySymbolReferenceProblem$ProblemKind):java.util.List
 *:com.intellij.polySymbols.references.PolySymbolReference
 - com.intellij.model.psi.PsiSymbolReference