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

JS: fix module references in case of @JsModule annotation

Browse Source
This commit is contained in:
Anton Bannykh
2018-12-18 14:48:38 +03:00
parent a1649e9e4d
commit 3a258ad08a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java
+2 -3
View File
@@ -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())) {