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
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)
}
}