[FIR] Add typealias to AbstractFirBasedSymbol<*> in FirDiagnosticsList

This commit is contained in:
Dmitriy Novozhilov
2021-04-16 15:40:03 +03:00
committed by TeamCityServer
parent 1ae41443a2
commit 951daeea3a
@@ -70,7 +70,7 @@ object DIAGNOSTICS_LIST : DiagnosticList() {
val UNRESOLVED by object : DiagnosticGroup("Unresolved") { val UNRESOLVED by object : DiagnosticGroup("Unresolved") {
val INVISIBLE_REFERENCE by error<PsiElement>(PositioningStrategy.REFERENCE_BY_QUALIFIED) { val INVISIBLE_REFERENCE by error<PsiElement>(PositioningStrategy.REFERENCE_BY_QUALIFIED) {
parameter<AbstractFirBasedSymbol<*>>("reference") parameter<Symbol>("reference")
} }
val UNRESOLVED_REFERENCE by error<PsiElement>(PositioningStrategy.REFERENCED_NAME_BY_QUALIFIED) { val UNRESOLVED_REFERENCE by error<PsiElement>(PositioningStrategy.REFERENCED_NAME_BY_QUALIFIED) {
parameter<String>("reference") parameter<String>("reference")
@@ -216,11 +216,11 @@ object DIAGNOSTICS_LIST : DiagnosticList() {
val APPLICABILITY by object : DiagnosticGroup("Applicability") { val APPLICABILITY by object : DiagnosticGroup("Applicability") {
val NONE_APPLICABLE by error<PsiElement>(PositioningStrategy.REFERENCE_BY_QUALIFIED) { val NONE_APPLICABLE by error<PsiElement>(PositioningStrategy.REFERENCE_BY_QUALIFIED) {
parameter<Collection<AbstractFirBasedSymbol<*>>>("candidates") parameter<Collection<Symbol>>("candidates")
} }
val INAPPLICABLE_CANDIDATE by error<PsiElement>(PositioningStrategy.REFERENCE_BY_QUALIFIED) { val INAPPLICABLE_CANDIDATE by error<PsiElement>(PositioningStrategy.REFERENCE_BY_QUALIFIED) {
parameter<AbstractFirBasedSymbol<*>>("candidate") parameter<Symbol>("candidate")
} }
val ARGUMENT_TYPE_MISMATCH by error<PsiElement> { val ARGUMENT_TYPE_MISMATCH by error<PsiElement> {
@@ -256,10 +256,10 @@ object DIAGNOSTICS_LIST : DiagnosticList() {
val AMBIGUITY by object : DiagnosticGroup("Ambiguity") { val AMBIGUITY by object : DiagnosticGroup("Ambiguity") {
val OVERLOAD_RESOLUTION_AMBIGUITY by error<PsiElement>(PositioningStrategy.REFERENCE_BY_QUALIFIED) { val OVERLOAD_RESOLUTION_AMBIGUITY by error<PsiElement>(PositioningStrategy.REFERENCE_BY_QUALIFIED) {
parameter<Collection<AbstractFirBasedSymbol<*>>>("candidates") parameter<Collection<Symbol>>("candidates")
} }
val ASSIGN_OPERATOR_AMBIGUITY by error<PsiElement> { val ASSIGN_OPERATOR_AMBIGUITY by error<PsiElement> {
parameter<Collection<AbstractFirBasedSymbol<*>>>("candidates") parameter<Collection<Symbol>>("candidates")
} }
val ITERATOR_AMBIGUITY by error<PsiElement>(PositioningStrategy.REFERENCE_BY_QUALIFIED) { val ITERATOR_AMBIGUITY by error<PsiElement>(PositioningStrategy.REFERENCE_BY_QUALIFIED) {
parameter<Collection<AbstractFirBasedSymbol<*>>>("candidates") parameter<Collection<AbstractFirBasedSymbol<*>>>("candidates")
@@ -448,10 +448,10 @@ object DIAGNOSTICS_LIST : DiagnosticList() {
val REDECLARATIONS by object : DiagnosticGroup("Redeclarations") { val REDECLARATIONS by object : DiagnosticGroup("Redeclarations") {
val MANY_COMPANION_OBJECTS by error<KtObjectDeclaration>(PositioningStrategy.COMPANION_OBJECT) val MANY_COMPANION_OBJECTS by error<KtObjectDeclaration>(PositioningStrategy.COMPANION_OBJECT)
val CONFLICTING_OVERLOADS by error<PsiElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) { val CONFLICTING_OVERLOADS by error<PsiElement>(PositioningStrategy.DECLARATION_SIGNATURE_OR_DEFAULT) {
parameter<Collection<AbstractFirBasedSymbol<*>>>("conflictingOverloads") parameter<Collection<Symbol>>("conflictingOverloads")
} }
val REDECLARATION by error<PsiElement> { val REDECLARATION by error<PsiElement> {
parameter<Collection<AbstractFirBasedSymbol<*>>>("conflictingDeclarations") parameter<Collection<Symbol>>("conflictingDeclarations")
} }
val METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE by error<PsiElement>() val METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE by error<PsiElement>()
} }
@@ -569,7 +569,7 @@ object DIAGNOSTICS_LIST : DiagnosticList() {
} }
val COMPONENT_FUNCTION_AMBIGUITY by error<PsiElement> { val COMPONENT_FUNCTION_AMBIGUITY by error<PsiElement> {
parameter<Name>("functionWithAmbiguityName") parameter<Name>("functionWithAmbiguityName")
parameter<Collection<AbstractFirBasedSymbol<*>>>("candidates") parameter<Collection<Symbol>>("candidates")
} }
val COMPONENT_FUNCTION_ON_NULLABLE by error<KtExpression> { val COMPONENT_FUNCTION_ON_NULLABLE by error<KtExpression> {
parameter<Name>("componentFunctionName") parameter<Name>("componentFunctionName")
@@ -601,12 +601,12 @@ object DIAGNOSTICS_LIST : DiagnosticList() {
parameter<FirPropertySymbol>("property") parameter<FirPropertySymbol>("property")
} }
val WRONG_INVOCATION_KIND by warning<PsiElement> { val WRONG_INVOCATION_KIND by warning<PsiElement> {
parameter<AbstractFirBasedSymbol<*>>("declaration") parameter<Symbol>("declaration")
parameter<EventOccurrencesRange>("requiredRange") parameter<EventOccurrencesRange>("requiredRange")
parameter<EventOccurrencesRange>("actualRange") parameter<EventOccurrencesRange>("actualRange")
} }
val LEAKED_IN_PLACE_LAMBDA by error<PsiElement> { val LEAKED_IN_PLACE_LAMBDA by error<PsiElement> {
parameter<AbstractFirBasedSymbol<*>>("lambda") parameter<Symbol>("lambda")
} }
val WRONG_IMPLIES_CONDITION by warning<PsiElement>() val WRONG_IMPLIES_CONDITION by warning<PsiElement>()
} }
@@ -740,3 +740,5 @@ private inline fun <reified P : PsiElement> DiagnosticGroup.exposedVisibilityWar
): PropertyDelegateProvider<Any?, ReadOnlyProperty<DiagnosticGroup, DiagnosticData>> { ): PropertyDelegateProvider<Any?, ReadOnlyProperty<DiagnosticGroup, DiagnosticData>> {
return warning<P>(positioningStrategy, exposedVisibilityDiagnosticInit) return warning<P>(positioningStrategy, exposedVisibilityDiagnosticInit)
} }
typealias Symbol = AbstractFirBasedSymbol<*>