azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug in import directives converter (light tree to FIR)

Browse Source
This commit is contained in:
Ivan Cilcic
2019-07-29 11:59:54 +03:00
committed by Mikhail Glukhikh
parent 1af7063a47
commit 084bad4c25
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
+2 -8
View File
@@ -157,14 +157,8 @@ class DeclarationsConverter(
var aliasName: String? = null var aliasName: String? = null
importDirective.forEachChildren { importDirective.forEachChildren {
when (it.tokenType) { when (it.tokenType) {
DOT_QUALIFIED_EXPRESSION, REFERENCE_EXPRESSION -> { DOT_QUALIFIED_EXPRESSION, REFERENCE_EXPRESSION -> importedFqName = FqName(it.getAsString())
var importName = it.getAsString() MUL -> isAllUnder = true
if (importName.endsWith(".*")) {
isAllUnder = true
importName = importName.replace(".*", "")
}
importedFqName = FqName(importName)
}
IMPORT_ALIAS -> aliasName = convertImportAlias(it) IMPORT_ALIAS -> aliasName = convertImportAlias(it)
} }
} }