From 3a258ad08abd4571488b5e9a993591874f00583d Mon Sep 17 00:00:00 2001 From: Anton Bannykh Date: Tue, 18 Dec 2018 14:48:38 +0300 Subject: [PATCH] JS: fix module references in case of @JsModule annotation --- .../kotlin/js/translate/context/TranslationContext.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java index acaa35eb22b..70e86b629d8 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java @@ -418,9 +418,8 @@ public class TranslationContext { SuggestedName suggested = staticContext.suggestName(descriptor); if (suggested != null && getConfig().getModuleKind() != ModuleKind.PLAIN && isPublicInlineFunction()) { String moduleId = AnnotationsUtils.getModuleName(suggested.getDescriptor()); - JsImportedModule importedModule = staticContext.getJsImportedModuleModule(suggested.getDescriptor()); - if (moduleId != null && importedModule != null) { - JsExpression replacement = staticContext.exportModuleForInline(moduleId, importedModule); + if (moduleId != null) { + JsExpression replacement = staticContext.exportModuleForInline(moduleId, new JsImportedModule(moduleId, name, null)); result = replaceModuleReference(result, name, replacement); } else if (isNativeObject(suggested.getDescriptor()) && DescriptorUtils.isTopLevelDeclaration(suggested.getDescriptor())) {