FIR checker: fix positioning of CONFLICTING_IMPORT
FE1.0 puts it on the alias when applicable.
This commit is contained in:
committed by
Mikhail Glukhikh
parent
4ad5f01324
commit
52b247937e
+1
-1
@@ -1322,7 +1322,7 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") {
|
||||
parameter<Name>("name")
|
||||
}
|
||||
|
||||
val CONFLICTING_IMPORT by error<KtImportDirective>(PositioningStrategy.IMPORT_LAST_NAME) {
|
||||
val CONFLICTING_IMPORT by error<KtImportDirective>(PositioningStrategy.IMPORT_ALIAS) {
|
||||
parameter<Name>("name")
|
||||
}
|
||||
|
||||
|
||||
+1
@@ -108,6 +108,7 @@ enum class PositioningStrategy(private val strategy: String? = null) {
|
||||
ENUM_MODIFIER,
|
||||
FIELD_KEYWORD,
|
||||
TAILREC_MODIFIER,
|
||||
IMPORT_ALIAS,
|
||||
PROPERTY_DELEGATE,
|
||||
|
||||
;
|
||||
|
||||
Reference in New Issue
Block a user