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

Tests: Replace some usages of KotlinBuiltIns.getInstance()

Browse Source 
In cases where platform is either unimportant or predefined in test code
This commit is contained in:
Pavel V. Talanov
2015-09-22 19:36:05 +03:00
parent af3bb80a54
commit 767950fea3
21 changed files with 69 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt
+2 -1
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.InstructionWithValu
import org.jetbrains.kotlin.psi.JetElement
import org.jetbrains.kotlin.psi.JetTreeVisitorVoid
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
import java.util.*
public abstract class AbstractPseudoValueTest : AbstractPseudocodeTest() {
@@ -51,7 +52,7 @@ public abstract class AbstractPseudoValueTest : AbstractPseudocodeTest() {
fun valueDecl(value: PseudoValue): String {
val typePredicate = expectedTypePredicateMap.getOrPut(value) {
getExpectedTypePredicate(value, bindingContext, KotlinBuiltIns.getInstance())
getExpectedTypePredicate(value, bindingContext, JvmPlatform.builtIns)
}
return "${value.debugName}: $typePredicate"
}
compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java
+10 -4
View File
@@ -26,8 +26,8 @@ import kotlin.KotlinPackage;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport;
import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider;
import org.jetbrains.kotlin.context.GlobalContext;
import org.jetbrains.kotlin.context.ModuleContext;
import org.jetbrains.kotlin.context.SimpleGlobalContext;
@@ -44,11 +44,12 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.resolve.AnalyzingUtils;
import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.BindingTrace;
import org.jetbrains.kotlin.resolve.TargetPlatform;
import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall;
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics;
import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM;
import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil;
import org.jetbrains.kotlin.storage.ExceptionTracker;
import org.jetbrains.kotlin.storage.LockBasedStorageManager;
@@ -345,13 +346,18 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
dependencies.add(modules.get(dependency));
}
dependencies.add(KotlinBuiltIns.getInstance().getBuiltInsModule());
dependencies.add(getPlatform().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 new ModuleDescriptorImpl(Name.special(moduleName),
@@ -362,7 +368,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
@NotNull
protected ModuleDescriptorImpl createSealedModule(@NotNull StorageManager storageManager) {
ModuleDescriptorImpl moduleDescriptor = createModule("<test-module>", storageManager);
moduleDescriptor.setDependencies(moduleDescriptor, KotlinBuiltIns.getInstance().getBuiltInsModule());
moduleDescriptor.setDependencies(moduleDescriptor, getPlatform().getBuiltIns().getBuiltInsModule());
return moduleDescriptor;
}
compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java
+9 -2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.checkers;
import com.intellij.openapi.Disposable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.config.CompilerConfiguration;
@@ -27,9 +26,11 @@ import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS;
import org.jetbrains.kotlin.js.config.Config;
import org.jetbrains.kotlin.js.config.LibrarySourcesConfig;
import org.jetbrains.kotlin.js.resolve.JsPlatform;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.resolve.BindingTrace;
import org.jetbrains.kotlin.resolve.TargetPlatform;
import org.jetbrains.kotlin.storage.StorageManager;
import java.util.ArrayList;
@@ -89,7 +90,7 @@ public abstract class AbstractJetDiagnosticsTestWithJsStdLib extends AbstractJet
dependencies.add(moduleDescriptor);
}
dependencies.add(KotlinBuiltIns.getInstance().getBuiltInsModule());
dependencies.add(JsPlatform.INSTANCE$.getBuiltIns().getBuiltInsModule());
module.setDependencies(dependencies);
return module;
@@ -98,4 +99,10 @@ public abstract class AbstractJetDiagnosticsTestWithJsStdLib extends AbstractJet
protected Config getConfig() {
return config;
}
@NotNull
@Override
protected TargetPlatform getPlatform() {
return JsPlatform.INSTANCE$;
}
}
compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
+2 -1
View File
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter;
import org.jetbrains.kotlin.resolve.AnalyzingUtils;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.Variance;
@@ -131,7 +132,7 @@ public class CodegenTestFiles {
Object value;
JetType jetType;
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
KotlinBuiltIns builtIns = JvmPlatform.INSTANCE$.getBuiltIns();
if (type.equals("kotlin.String")) {
value = valueString;
jetType = builtIns.getStringType();
compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java
+2 -1
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.parsing.JetScriptDefinition;
import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.org.objectweb.asm.Opcodes;
@@ -31,7 +32,7 @@ import java.lang.reflect.Method;
public class ScriptGenTest extends CodegenTestCase {
private static final JetScriptDefinition FIB_SCRIPT_DEFINITION =
new JetScriptDefinition(".lang.kt",
new AnalyzerScriptParameter(Name.identifier("num"), KotlinBuiltIns.getInstance().getIntType()));
new AnalyzerScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType()));
@Override
protected void setUp() throws Exception {
compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java
+2 -1
View File
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.renderer.DescriptorRenderer;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
import org.jetbrains.kotlin.types.ErrorUtils;
import org.jetbrains.kotlin.types.JetType;
@@ -144,7 +145,7 @@ public abstract class ExpectedResolveData {
}
public final void checkResult(BindingContext bindingContext) {
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
KotlinBuiltIns builtIns = JvmPlatform.INSTANCE$.getBuiltIns();
Set<PsiElement> unresolvedReferences = Sets.newHashSet();
for (Diagnostic diagnostic : bindingContext.getDiagnostics()) {
compiler/tests/org/jetbrains/kotlin/resolve/JetExpectedResolveDataUtil.java
+2 -1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults;
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil;
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage;
@@ -52,7 +53,7 @@ public class JetExpectedResolveDataUtil {
}
public static Map<String, DeclarationDescriptor> prepareDefaultNameToDescriptors(Project project, KotlinCoreEnvironment environment) {
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
KotlinBuiltIns builtIns = JvmPlatform.INSTANCE$.getBuiltIns();
Map<String, DeclarationDescriptor> nameToDescriptor = new HashMap<String, DeclarationDescriptor>();
nameToDescriptor.put("kotlin::Int.plus(Int)", standardFunction(builtIns.getInt(), "plus", project, builtIns.getIntType()));
compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt
+2 -1
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.resolve.annotation.AbstractAnnotationDescriptorResol
import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant
import org.jetbrains.kotlin.resolve.constants.ConstantValueFactory
import org.jetbrains.kotlin.resolve.constants.StringValue
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.JetTestUtils
import java.io.File
@@ -66,7 +67,7 @@ public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescrip
private fun evaluateInitializer(context: BindingContext, property: VariableDescriptor): CompileTimeConstant<*>? {
val propertyDeclaration = DescriptorToSourceUtils.descriptorToDeclaration(property) as JetProperty
val compileTimeConstant = ConstantExpressionEvaluator(KotlinBuiltIns.getInstance()).evaluateExpression(
val compileTimeConstant = ConstantExpressionEvaluator(JvmPlatform.builtIns).evaluateExpression(
propertyDeclaration.getInitializer()!!,
DelegatingBindingTrace(context, "trace for evaluating compile time constant"),
property.getType()
compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt
+2 -1
View File
@@ -29,6 +29,7 @@ import java.util.regex.Pattern
import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstructor
import org.jetbrains.kotlin.types.JetTypeImpl
import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
import org.jetbrains.kotlin.resolve.scopes.LexicalScope
public class ConstraintSystemTestData(
@@ -62,7 +63,7 @@ public class ConstraintSystemTestData(
if (matcher.find()) {
val number = matcher.group(1)!!
return JetTypeImpl.create(
Annotations.EMPTY, IntegerValueTypeConstructor(number.toLong(), KotlinBuiltIns.getInstance()), false, listOf(),
Annotations.EMPTY, IntegerValueTypeConstructor(number.toLong(), JvmPlatform.builtIns), false, listOf(),
JetScope.Empty
)
}
compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt
+4 -2
View File
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.types.typesApproximation.approximateCapturedTypesIfN
import java.util.ArrayList
import org.jetbrains.kotlin.types.TypeProjection
import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
public class CapturedTypeApproximationTest() : JetLiteFixture() {
@@ -65,8 +66,9 @@ public class CapturedTypeApproximationTest() : JetLiteFixture() {
}
fun createTestSubstitutions(typeParameters: List<TypeParameterDescriptor>) = run {
val intType = KotlinBuiltIns.getInstance().getIntType()
val stringType = KotlinBuiltIns.getInstance().getStringType()
val builtIns = JvmPlatform.builtIns
val intType = builtIns.intType
val stringType = builtIns.stringType
val t = typeParameters[0]
val r = typeParameters[1]
if (oneTypeVariable)
compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java
+2 -1
View File
@@ -34,6 +34,7 @@ import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.parsing.JetScriptDefinition;
import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.TestJdkKind;
@@ -112,6 +113,6 @@ public class ScriptTest {
@NotNull
private static List<AnalyzerScriptParameter> numIntParam() {
return Collections.singletonList(new AnalyzerScriptParameter(Name.identifier("num"), KotlinBuiltIns.getInstance().getIntType()));
return Collections.singletonList(new AnalyzerScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType()));
}
}
compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt
+2 -1
View File
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.config.addKotlinSourceRoots
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS
import org.jetbrains.kotlin.js.config.LibrarySourcesConfig
import org.jetbrains.kotlin.js.resolve.JsPlatform
import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME
import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil
import org.jetbrains.kotlin.storage.LockBasedStorageManager
@@ -86,7 +87,7 @@ public class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
.sure { "No package fragment provider was created" }
module.initialize(provider)
module.setDependencies(module, KotlinBuiltIns.getInstance().getBuiltInsModule())
module.setDependencies(module, JsPlatform.builtIns.builtInsModule)
return module
}
compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java
+2 -1
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.*;
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
import org.jetbrains.kotlin.resolve.lazy.ResolveSession;
import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory;
@@ -77,7 +78,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture {
ContainerForTests containerForTests = DiPackage.createContainerForTests(getProject(), root);
descriptorResolver = containerForTests.getDescriptorResolver();
functionDescriptorResolver = containerForTests.getFunctionDescriptorResolver();
scope = createScope(KotlinBuiltIns.getInstance().getBuiltInsPackageScope());
scope = createScope(JvmPlatform.INSTANCE$.getBuiltIns().getBuiltInsPackageScope());
}
public void tearDown() throws Exception {
compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java
+2 -1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.psi.JetNamedFunction;
import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver;
import org.jetbrains.kotlin.resolve.OverloadUtil;
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.scopes.FileScope;
import org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage;
import org.jetbrains.kotlin.test.ConfigurationKind;
@@ -174,7 +175,7 @@ public class JetOverloadTest extends JetLiteFixture {
private FunctionDescriptor makeFunction(String funDecl) {
JetNamedFunction function = JetPsiFactory(getProject()).createFunction(funDecl);
FileScope scope = UtilsPackage.memberScopeAsFileScope(KotlinBuiltIns.getInstance().getBuiltInsPackageScope());
FileScope scope = UtilsPackage.memberScopeAsFileScope(JvmPlatform.INSTANCE$.getBuiltIns().getBuiltInsPackageScope());
return functionDescriptorResolver.resolveFunctionDescriptor(root, scope, function, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY);
}
}
compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java
+2 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.types;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
import org.jetbrains.kotlin.descriptors.ModuleDescriptor;
@@ -24,6 +23,7 @@ import org.jetbrains.kotlin.psi.JetNamedFunction;
import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver;
import org.jetbrains.kotlin.resolve.OverridingUtil;
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.scopes.LexicalScope;
import org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage;
import org.jetbrains.kotlin.test.ConfigurationKind;
@@ -165,7 +165,7 @@ public class JetOverridingTest extends JetLiteFixture {
private FunctionDescriptor makeFunction(String funDecl) {
JetNamedFunction function = JetPsiFactory(getProject()).createFunction(funDecl);
LexicalScope scope = UtilsPackage.asLexicalScope(KotlinBuiltIns.getInstance().getBuiltInsPackageScope());
LexicalScope scope = UtilsPackage.asLexicalScope(JvmPlatform.INSTANCE$.getBuiltIns().getBuiltInsPackageScope());
return functionDescriptorResolver.resolveFunctionDescriptor(root, scope, function,
JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY);
}
compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java
+7 -6
View File
@@ -36,6 +36,7 @@ import org.jetbrains.kotlin.resolve.BindingTraceContext;
import org.jetbrains.kotlin.resolve.ImportPath;
import org.jetbrains.kotlin.resolve.TypeResolver;
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil;
import org.jetbrains.kotlin.resolve.scopes.*;
import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver;
@@ -75,7 +76,7 @@ public class JetTypeCheckerTest extends JetLiteFixture {
public void setUp() throws Exception {
super.setUp();
builtIns = KotlinBuiltIns.getInstance();
builtIns = JvmPlatform.INSTANCE$.getBuiltIns();
ModuleDescriptorImpl module = JetTestUtils.createEmptyModule();
ContainerForTests container = DiPackage.createContainerForTests(getProject(), module);
@@ -123,9 +124,9 @@ public class JetTypeCheckerTest extends JetLiteFixture {
assertType("\"d\"", builtIns.getStringType());
assertType("\"\"\"d\"\"\"", builtIns.getStringType());
assertType("Unit", KotlinBuiltIns.getInstance().getUnitType());
assertType("Unit", builtIns.getUnitType());
assertType("null", KotlinBuiltIns.getInstance().getNullableNothingType());
assertType("null", builtIns.getNullableNothingType());
}
public void testTypeInfo() throws Exception {
@@ -135,9 +136,9 @@ public class JetTypeCheckerTest extends JetLiteFixture {
}
public void testJumps() throws Exception {
assertType("throw java.lang.Exception()", KotlinBuiltIns.getInstance().getNothingType());
assertType("continue", KotlinBuiltIns.getInstance().getNothingType());
assertType("break", KotlinBuiltIns.getInstance().getNothingType());
assertType("throw java.lang.Exception()", builtIns.getNothingType());
assertType("continue", builtIns.getNothingType());
assertType("break", builtIns.getNothingType());
}
public void testIf() throws Exception {
compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java
+2 -1
View File
@@ -40,6 +40,7 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer;
import org.jetbrains.kotlin.resolve.AnalyzingUtils;
import org.jetbrains.kotlin.resolve.BindingTrace;
import org.jetbrains.kotlin.resolve.BindingTraceContext;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment;
import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil;
import org.jetbrains.kotlin.resolve.scopes.*;
@@ -100,7 +101,7 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment {
topLevelDeclarations,
typeParameters,
contextClass.getDefaultType().getMemberScope(),
KotlinBuiltIns.getInstance().getBuiltInsPackageScope());
JvmPlatform.INSTANCE$.getBuiltIns().getBuiltInsPackageScope());
}
private void doTest(@Nullable String expectedTypeStr, String initialTypeStr, Pair<String, String>... substitutionStrs) {
compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java
+4 -3
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.JetTypeProjection;
import org.jetbrains.kotlin.psi.JetTypeReference;
import org.jetbrains.kotlin.resolve.TypeResolver;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.scopes.JetScope;
import org.jetbrains.kotlin.resolve.scopes.RedeclarationHandler;
import org.jetbrains.kotlin.resolve.scopes.WritableScope;
@@ -63,7 +64,7 @@ public class TypeUnifierTest extends JetLiteFixture {
public void setUp() throws Exception {
super.setUp();
builtIns = KotlinBuiltIns.getInstance();
builtIns = JvmPlatform.INSTANCE$.getBuiltIns();
typeResolver = DiPackage.createContainerForTests(getProject(), JetTestUtils.createEmptyModule()).getTypeResolver();
x = createTypeVariable("X");
@@ -71,9 +72,9 @@ public class TypeUnifierTest extends JetLiteFixture {
variables = Sets.newHashSet(x.getTypeConstructor(), y.getTypeConstructor());
}
private static TypeParameterDescriptor createTypeVariable(String name) {
private TypeParameterDescriptor createTypeVariable(String name) {
return TypeParameterDescriptorImpl.createWithDefaultBound(
KotlinBuiltIns.getInstance().getBuiltInsModule(), Annotations.EMPTY, false, Variance.INVARIANT,
builtIns.getBuiltInsModule(), Annotations.EMPTY, false, Variance.INVARIANT,
Name.identifier(name), 0);
}
idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt
+6 -1
View File
@@ -28,6 +28,7 @@ import com.intellij.psi.util.PsiTreeUtil
import com.intellij.testFramework.LightProjectDescriptor
import com.intellij.util.SmartList
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler
import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideImplementMembersHandler
import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMemberChooserObject
@@ -127,7 +128,11 @@ public abstract class AbstractOverrideImplementTest : JetLightCodeInsightFixture
val chooserObjects = handler.collectMembersToGenerate(classOrObject)
val singleToOverride = if (memberToOverride == null) {
val filtered = chooserObjects.filter { it.descriptor.containingDeclaration != KotlinBuiltIns.getInstance().any }
val filtered = chooserObjects.filter {
(it.descriptor.containingDeclaration as? ClassDescriptor)?.let {
!KotlinBuiltIns.isAny(it)
} ?: true
}
assertEquals(1, filtered.size(), "Invalid number of available chooserObjects for override")
filtered.single()
}
idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt
+2 -1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager
import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor
import org.jetbrains.kotlin.idea.vfilefinder.JsVirtualFileFinder
import org.jetbrains.kotlin.js.resolve.JsPlatform
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
@@ -64,7 +65,7 @@ public class KotlinJavaScriptDecompiledTextConsistencyTest : TextConsistencyBase
.sure { "No package fragment provider was created" }
module.initialize(provider)
module.setDependencies(module, KotlinBuiltIns.getInstance().builtInsModule)
module.setDependencies(module, JsPlatform.builtIns.builtInsModule)
return module
}
idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt
+1 -1
View File
@@ -81,7 +81,7 @@ public abstract class TextConsistencyBaseTest : JetLightCodeInsightFixtureTestCa
override fun resolveDeclarationsInFacade(facadeFqName: FqName): Collection<DeclarationDescriptor> =
module.getPackage(facadeFqName.parent()).memberScope.getAllDescriptors().filter {
it is CallableMemberDescriptor &&
it.module != KotlinBuiltIns.getInstance().builtInsModule &&
it.module != module.builtIns.builtInsModule &&
isFromFacade(it, facadeFqName)
}.sortedWith(MemberComparator.INSTANCE)
}