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

Refactor setting dependencies for ModuleDescriptors

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-06-10 20:14:06 +03:00
parent 1d696c2e54
commit 705f35450f
12 changed files with 52 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java
+6 -7
View File
@@ -327,13 +327,14 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
if (testModule == null) continue;
ModuleDescriptorImpl module = modules.get(testModule);
module.addDependencyOnModule(module);
List<ModuleDescriptorImpl> dependencies = new ArrayList<ModuleDescriptorImpl>();
dependencies.add(module);
for (TestModule dependency : testModule.getDependencies()) {
module.addDependencyOnModule(modules.get(dependency));
dependencies.add(modules.get(dependency));
}
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule());
module.seal();
dependencies.add(KotlinBuiltIns.getInstance().getBuiltInsModule());
module.setDependencies(dependencies);
}
return modules;
@@ -349,9 +350,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
@NotNull
protected ModuleDescriptorImpl createSealedModule(@NotNull StorageManager storageManager) {
ModuleDescriptorImpl moduleDescriptor = createModule("<test-module>", storageManager);
moduleDescriptor.addDependencyOnModule(moduleDescriptor);
moduleDescriptor.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule());
moduleDescriptor.seal();
moduleDescriptor.setDependencies(moduleDescriptor, KotlinBuiltIns.getInstance().getBuiltInsModule());
return moduleDescriptor;
}
compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java
+7 -6
View File
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.resolve.BindingTrace;
import org.jetbrains.kotlin.storage.StorageManager;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -81,15 +82,15 @@ public abstract class AbstractJetDiagnosticsTestWithJsStdLib extends AbstractJet
protected ModuleDescriptorImpl createSealedModule(@NotNull StorageManager storageManager) {
ModuleDescriptorImpl module = createModule("<kotlin-js-test-module>", storageManager);
module.addDependencyOnModule(module);
List<ModuleDescriptorImpl> dependencies = new ArrayList<ModuleDescriptorImpl>();;
dependencies.add(module);
for(ModuleDescriptorImpl moduleDescriptor : config.getModuleDescriptors()) {
module.addDependencyOnModule(moduleDescriptor);
for (ModuleDescriptorImpl moduleDescriptor : config.getModuleDescriptors()) {
dependencies.add(moduleDescriptor);
}
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule());
module.seal();
dependencies.add(KotlinBuiltIns.getInstance().getBuiltInsModule());
module.setDependencies(dependencies);
return module;
}
compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt
+1 -3
View File
@@ -48,9 +48,7 @@ public class BuiltInsSerializerTest : TestCaseWithTmpdir() {
}
module.initialize(packageFragmentProvider)
module.addDependencyOnModule(module)
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule())
module.seal()
module.setDependencies(module, KotlinBuiltIns.getInstance().getBuiltInsModule())
RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile(
module.getPackage(TEST_PACKAGE_FQNAME)!!,
compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt
+1 -3
View File
@@ -86,9 +86,7 @@ public class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
.sure { "No package fragment provider was created" }
module.initialize(provider)
module.addDependencyOnModule(module)
module.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule())
module.seal()
module.setDependencies(module, KotlinBuiltIns.getInstance().getBuiltInsModule())
return module
}