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

KT-7357 JS: extension functions from external KJS library couldn't be called in some cases

Browse Source 
#KT-7357 Fixed
#KT-7382 Fixed
This commit is contained in:
Michael Nedzelsky
2015-04-10 18:29:36 +03:00
parent 6842c98285
commit 08e92ac746
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java
+10 -2
View File
@@ -120,6 +120,10 @@ public abstract class Config {
for(KotlinJavascriptMetadata metadataEntry : metadata) { for(KotlinJavascriptMetadata metadataEntry : metadata) {
moduleDescriptors.add(createModuleDescriptor(metadataEntry)); moduleDescriptors.add(createModuleDescriptor(metadataEntry));
} }
for(ModuleDescriptorImpl module : moduleDescriptors) {
setDependencies(module, moduleDescriptors);
module.seal();
}
return moduleDescriptors; return moduleDescriptors;
} }
@@ -150,13 +154,17 @@ public abstract class Config {
CompositePackageFragmentProvider compositePackageFragmentProvider = new CompositePackageFragmentProvider(providers); CompositePackageFragmentProvider compositePackageFragmentProvider = new CompositePackageFragmentProvider(providers);
moduleDescriptor.initialize(compositePackageFragmentProvider); moduleDescriptor.initialize(compositePackageFragmentProvider);
moduleDescriptor.addDependencyOnModule(moduleDescriptor);
moduleDescriptor.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule()); moduleDescriptor.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule());
moduleDescriptor.seal();
return moduleDescriptor; return moduleDescriptor;
} }
private static void setDependencies(ModuleDescriptorImpl module, List<ModuleDescriptorImpl> modules) {
for(ModuleDescriptorImpl moduleItem : modules) {
module.addDependencyOnModule(moduleItem);
}
}
@NotNull @NotNull
public static Collection<JetFile> withJsLibAdded(@NotNull Collection<JetFile> files, @NotNull Config config) { public static Collection<JetFile> withJsLibAdded(@NotNull Collection<JetFile> files, @NotNull Config config) {
Collection<JetFile> allFiles = Lists.newArrayList(); Collection<JetFile> allFiles = Lists.newArrayList();