From 084bad4c25b7154921465529c55d0be10c463f45 Mon Sep 17 00:00:00 2001 From: Ivan Cilcic Date: Mon, 29 Jul 2019 11:59:54 +0300 Subject: [PATCH] Fix bug in import directives converter (light tree to FIR) --- .../fir/lightTree/converter/DeclarationsConverter.kt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt index 9777d1d336c..825e95899d7 100644 --- a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt +++ b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt @@ -157,14 +157,8 @@ class DeclarationsConverter( var aliasName: String? = null importDirective.forEachChildren { when (it.tokenType) { - DOT_QUALIFIED_EXPRESSION, REFERENCE_EXPRESSION -> { - var importName = it.getAsString() - if (importName.endsWith(".*")) { - isAllUnder = true - importName = importName.replace(".*", "") - } - importedFqName = FqName(importName) - } + DOT_QUALIFIED_EXPRESSION, REFERENCE_EXPRESSION -> importedFqName = FqName(it.getAsString()) + MUL -> isAllUnder = true IMPORT_ALIAS -> aliasName = convertImportAlias(it) } }