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

Get rid of some targetPlatform.builtIns usages

Browse Source 
Retrieve builtIns from module itself when adding dependencies on them
This commit is contained in:
Denis Zharkov
2016-04-01 12:47:40 +03:00
parent e97fa929ea
commit c4a899d9a4
5 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java
+1 -1
View File
@@ -163,7 +163,7 @@ public enum TopDownAnalyzerFacadeForJVM {
MutableModuleContext context = ContextKt.ContextForNewModule(
project, Name.special("<" + moduleName + ">"), JvmPlatform.INSTANCE
);
context.setDependencies(context.getModule(), JvmPlatform.INSTANCE.getBuiltIns().getBuiltInsModule());
context.setDependencies(context.getModule(), context.getBuiltIns().getBuiltInsModule());
return context;
}
}
compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java
+2 -7
View File
@@ -342,18 +342,13 @@ public abstract class AbstractDiagnosticsTest extends BaseDiagnosticsTest {
dependencies.add(modules.get(dependency));
}
dependencies.add(getPlatform().getBuiltIns().getBuiltInsModule());
dependencies.add(module.getBuiltIns().getBuiltInsModule());
module.setDependencies(dependencies);
}
return modules;
}
@NotNull
protected TargetPlatform getPlatform() {
return JvmPlatform.INSTANCE;
}
@NotNull
protected ModuleDescriptorImpl createModule(@NotNull String moduleName, @NotNull StorageManager storageManager) {
return TargetPlatformKt.createModule(JvmPlatform.INSTANCE, Name.special(moduleName), storageManager);
@@ -362,7 +357,7 @@ public abstract class AbstractDiagnosticsTest extends BaseDiagnosticsTest {
@NotNull
protected ModuleDescriptorImpl createSealedModule(@NotNull StorageManager storageManager) {
ModuleDescriptorImpl moduleDescriptor = createModule("<test-module>", storageManager);
moduleDescriptor.setDependencies(moduleDescriptor, getPlatform().getBuiltIns().getBuiltInsModule());
moduleDescriptor.setDependencies(moduleDescriptor, moduleDescriptor.getBuiltIns().getBuiltInsModule());
return moduleDescriptor;
}
compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java
+1 -8
View File
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.js.resolve.JsPlatform;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.resolve.BindingTrace;
import org.jetbrains.kotlin.resolve.TargetPlatform;
import org.jetbrains.kotlin.resolve.TargetPlatformKt;
import org.jetbrains.kotlin.storage.StorageManager;
@@ -88,7 +87,7 @@ public abstract class AbstractDiagnosticsTestWithJsStdLib extends AbstractDiagno
dependencies.add(moduleDescriptor);
}
dependencies.add(getPlatform().getBuiltIns().getBuiltInsModule());
dependencies.add(module.getBuiltIns().getBuiltInsModule());
module.setDependencies(dependencies);
return module;
@@ -97,10 +96,4 @@ public abstract class AbstractDiagnosticsTestWithJsStdLib extends AbstractDiagno
protected Config getConfig() {
return config;
}
@NotNull
@Override
protected TargetPlatform getPlatform() {
return JsPlatform.INSTANCE;
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java
+1 -2
View File
@@ -38,7 +38,6 @@ import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.kotlin.asJava.LightClassUtilsKt;
import org.jetbrains.kotlin.builtins.DefaultBuiltIns;
import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor;
import org.jetbrains.kotlin.context.ContextKt;
@@ -250,7 +249,7 @@ public class SourceNavigationHelper {
DefaultBuiltIns.getInstance()
);
newModuleContext.setDependencies(newModuleContext.getModule(), platform.getBuiltIns().getBuiltInsModule());
newModuleContext.setDependencies(newModuleContext.getModule(), newModuleContext.getModule().getBuiltIns().getBuiltInsModule());
FileBasedDeclarationProviderFactory providerFactory = new FileBasedDeclarationProviderFactory(
newModuleContext.getStorageManager(),
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompilerBase.kt
+1 -1
View File
@@ -64,7 +64,7 @@ abstract class DeserializerForDecompilerBase(
init {
moduleDescriptor.initialize(packageFragmentProvider)
moduleDescriptor.setDependencies(moduleDescriptor, targetPlatform.builtIns.builtInsModule)
moduleDescriptor.setDependencies(moduleDescriptor, moduleDescriptor.builtIns.builtInsModule)
}
}