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

Introduce language feature for refined sam adapters priority

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2016-12-26 01:00:50 +03:00
parent b4051c4577
commit e448695578
17 changed files with 365 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java
+33 -13
View File
@@ -19,6 +19,8 @@ package org.jetbrains.kotlin.resolve.calls.results;
import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.config.LanguageFeature;
import org.jetbrains.kotlin.config.LanguageVersionSettings;
import org.jetbrains.kotlin.descriptors.CallableDescriptor;
import org.jetbrains.kotlin.resolve.BindingTrace;
import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt;
@@ -26,11 +28,9 @@ import org.jetbrains.kotlin.resolve.calls.context.CallResolutionContext;
import org.jetbrains.kotlin.resolve.calls.context.CheckArgumentTypesMode;
import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall;
import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy;
import org.jetbrains.kotlin.resolve.calls.tower.TowerUtilsKt;
import java.util.Collection;
import java.util.EnumSet;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.*;
import static org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus.*;
@@ -49,7 +49,8 @@ public class ResolutionResultsHandler {
public <D extends CallableDescriptor> OverloadResolutionResultsImpl<D> computeResultAndReportErrors(
@NotNull CallResolutionContext context,
@NotNull TracingStrategy tracing,
@NotNull Collection<MutableResolvedCall<D>> candidates
@NotNull Collection<MutableResolvedCall<D>> candidates,
@NotNull LanguageVersionSettings languageVersionSettings
) {
Set<MutableResolvedCall<D>> successfulCandidates = Sets.newLinkedHashSet();
Set<MutableResolvedCall<D>> failedCandidates = Sets.newLinkedHashSet();
@@ -74,10 +75,11 @@ public class ResolutionResultsHandler {
// TODO : maybe it's better to filter overrides out first, and only then look for the maximally specific
if (!successfulCandidates.isEmpty() || !incompleteCandidates.isEmpty()) {
return computeSuccessfulResult(context, tracing, successfulCandidates, incompleteCandidates, context.checkArguments);
return computeSuccessfulResult(
context, tracing, successfulCandidates, incompleteCandidates, context.checkArguments, languageVersionSettings);
}
else if (!failedCandidates.isEmpty()) {
return computeFailedResult(tracing, context.trace, failedCandidates, context.checkArguments);
return computeFailedResult(tracing, context.trace, failedCandidates, context.checkArguments, languageVersionSettings);
}
if (!candidatesWithWrongReceiver.isEmpty()) {
tracing.unresolvedReferenceWrongReceiver(context.trace, candidatesWithWrongReceiver);
@@ -93,13 +95,14 @@ public class ResolutionResultsHandler {
@NotNull TracingStrategy tracing,
@NotNull Set<MutableResolvedCall<D>> successfulCandidates,
@NotNull Set<MutableResolvedCall<D>> incompleteCandidates,
@NotNull CheckArgumentTypesMode checkArgumentsMode
@NotNull CheckArgumentTypesMode checkArgumentsMode,
@NotNull LanguageVersionSettings languageVersionSettings
) {
Set<MutableResolvedCall<D>> successfulAndIncomplete = Sets.newLinkedHashSet();
successfulAndIncomplete.addAll(successfulCandidates);
successfulAndIncomplete.addAll(incompleteCandidates);
OverloadResolutionResultsImpl<D> results = chooseAndReportMaximallySpecific(
successfulAndIncomplete, true, context.isDebuggerContext, checkArgumentsMode);
successfulAndIncomplete, true, context.isDebuggerContext, checkArgumentsMode, languageVersionSettings);
if (results.isSingleResult()) {
MutableResolvedCall<D> resultingCall = results.getResultingCall();
resultingCall.getTrace().moveAllMyDataTo(context.trace);
@@ -133,7 +136,8 @@ public class ResolutionResultsHandler {
@NotNull TracingStrategy tracing,
@NotNull BindingTrace trace,
@NotNull Set<MutableResolvedCall<D>> failedCandidates,
@NotNull CheckArgumentTypesMode checkArgumentsMode
@NotNull CheckArgumentTypesMode checkArgumentsMode,
@NotNull LanguageVersionSettings languageVersionSettings
) {
if (failedCandidates.size() == 1) {
return recordFailedInfo(tracing, trace, failedCandidates);
@@ -152,7 +156,8 @@ public class ResolutionResultsHandler {
OverloadingConflictResolver<MutableResolvedCall<D>> myResolver = (OverloadingConflictResolver) overloadingConflictResolver;
return recordFailedInfo(tracing, trace, myResolver.filterOutEquivalentCalls(new LinkedHashSet<MutableResolvedCall<D>>(thisLevel)));
}
OverloadResolutionResultsImpl<D> results = chooseAndReportMaximallySpecific(thisLevel, false, false, checkArgumentsMode);
OverloadResolutionResultsImpl<D> results = chooseAndReportMaximallySpecific(
thisLevel, false, false, checkArgumentsMode, languageVersionSettings);
return recordFailedInfo(tracing, trace, results.getResultingCalls());
}
}
@@ -188,12 +193,27 @@ public class ResolutionResultsHandler {
@NotNull Set<MutableResolvedCall<D>> candidates,
boolean discriminateGenerics,
boolean isDebuggerContext,
@NotNull CheckArgumentTypesMode checkArgumentsMode
@NotNull CheckArgumentTypesMode checkArgumentsMode,
@NotNull LanguageVersionSettings languageVersionSettings
) {
OverloadingConflictResolver<MutableResolvedCall<D>> myResolver = (OverloadingConflictResolver) overloadingConflictResolver;
Set<MutableResolvedCall<D>> refinedCandidates = candidates;
if (!languageVersionSettings.supportsFeature(LanguageFeature.RefinedSamAdaptersPriority)) {
Set<MutableResolvedCall<D>> nonSynthesized = new HashSet<MutableResolvedCall<D>>();
for (MutableResolvedCall<D> candidate : candidates) {
if (!TowerUtilsKt.isSynthesized(candidate.getCandidateDescriptor())) {
nonSynthesized.add(candidate);
}
}
if (!nonSynthesized.isEmpty()) {
refinedCandidates = nonSynthesized;
}
}
Set<MutableResolvedCall<D>> specificCalls =
myResolver.chooseMaximallySpecificCandidates(candidates, checkArgumentsMode, discriminateGenerics, isDebuggerContext);
myResolver.chooseMaximallySpecificCandidates(refinedCandidates, checkArgumentsMode, discriminateGenerics, isDebuggerContext);
if (specificCalls.size() == 1) {
return OverloadResolutionResultsImpl.success(specificCalls.iterator().next());
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt
+5 -4
View File
@@ -191,7 +191,7 @@ class NewResolutionOldInference(
}
}
val overloadResults = convertToOverloadResults(candidates, tracing, context)
val overloadResults = convertToOverloadResults(candidates, tracing, context, languageVersionSettings)
coroutineInferenceSupport.checkCoroutineCalls(context, tracing, overloadResults)
return overloadResults
}
@@ -227,7 +227,7 @@ class NewResolutionOldInference(
val processedCandidates = towerResolver.runWithEmptyTowerData(KnownResultProcessor(resolvedCandidates),
TowerResolver.SuccessfulResultCollector { it.candidateStatus }, useOrder = true)
return convertToOverloadResults(processedCandidates, tracing, basicCallContext)
return convertToOverloadResults(processedCandidates, tracing, basicCallContext, languageVersionSettings)
}
private fun <D: CallableDescriptor> allCandidatesResult(allCandidates: Collection<MyCandidate<D>>)
@@ -238,7 +238,8 @@ class NewResolutionOldInference(
private fun <D : CallableDescriptor> convertToOverloadResults(
candidates: Collection<MyCandidate<D>>,
tracing: TracingStrategy,
basicCallContext: BasicCallResolutionContext
basicCallContext: BasicCallResolutionContext,
languageVersionSettings: LanguageVersionSettings
): OverloadResolutionResultsImpl<D> {
val resolvedCalls = candidates.mapNotNull {
val (status, resolvedCall) = it
@@ -274,7 +275,7 @@ class NewResolutionOldInference(
resolvedCall
}
return resolutionResultsHandler.computeResultAndReportErrors(basicCallContext, tracing, resolvedCalls)
return resolutionResultsHandler.computeResultAndReportErrors(basicCallContext, tracing, resolvedCalls, languageVersionSettings)
}
// true if we found something
compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.kt
Vendored
+37
View File
@@ -0,0 +1,37 @@
// !LANGUAGE: -RefinedSamAdaptersPriority
// !CHECK_TYPE
// FILE: A.java
public class A {
public static int foo(Runnable r) { return 0; }
public static String foo(Object r) { return null;}
public static int bar(Runnable r) { return 1; }
public static String bar(CharSequence r) { return null; }
}
// FILE: 1.kt
fun fn() {}
fun x(r: Runnable) {
A.foo(::fn) checkType { _<String>() }
A.foo {} checkType { _<String>() }
A.foo(null) checkType { _<Int>() }
A.foo(Runnable { }) checkType { _<Int>() }
A.foo(r) checkType { _<Int>() }
A.foo(123) checkType { _<String>() }
A.foo("") checkType { _<String>() }
A.bar(::fn) checkType { _<Int>() }
A.bar {} checkType { _<Int>() }
A.bar(r) checkType { _<Int>() }
A.<!OVERLOAD_RESOLUTION_AMBIGUITY!>bar<!>(null)
A.bar(null as Runnable?) checkType { _<Int>() }
A.bar(null as CharSequence?) checkType { _<String>() }
A.bar("") checkType { _<String>() }
A.<!NONE_APPLICABLE!>bar<!>(123)
}
compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.txt
Vendored
+19
View File
@@ -0,0 +1,19 @@
package
public fun fn(): kotlin.Unit
public fun x(/*0*/ r: java.lang.Runnable): kotlin.Unit
public open class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun bar(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Int
public open fun bar(/*0*/ r: java.lang.Runnable!): kotlin.Int
public open fun bar(/*0*/ r: kotlin.CharSequence!): kotlin.String!
public final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Int
public open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Int
public open fun foo(/*0*/ r: kotlin.Any!): kotlin.String!
}
compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.kt
Vendored
+37
View File
@@ -0,0 +1,37 @@
// !LANGUAGE: -RefinedSamAdaptersPriority
// !CHECK_TYPE
// FILE: A.java
public class A {
public int foo(Runnable r) { return 0; }
public String foo(Object r) { return null;}
public int bar(Runnable r) { return 1; }
public String bar(CharSequence r) { return null; }
}
// FILE: 1.kt
fun fn() {}
fun x(a: A, r: Runnable) {
a.foo(::fn) checkType { _<String>() }
a.foo {} checkType { _<String>() }
a.foo(null) checkType { _<Int>() }
a.foo(Runnable { }) checkType { _<Int>() }
a.foo(r) checkType { _<Int>() }
a.foo(123) checkType { _<String>() }
a.foo("") checkType { _<String>() }
a.bar(::fn) checkType { _<Int>() }
a.bar {} checkType { _<Int>() }
a.bar(r) checkType { _<Int>() }
a.<!OVERLOAD_RESOLUTION_AMBIGUITY!>bar<!>(null)
a.bar(null as Runnable?) checkType { _<Int>() }
a.bar(null as CharSequence?) checkType { _<String>() }
a.bar("") checkType { _<String>() }
a.<!NONE_APPLICABLE!>bar<!>(123)
}
compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.txt
Vendored
+15
View File
@@ -0,0 +1,15 @@
package
public fun fn(): kotlin.Unit
public fun x(/*0*/ a: A, /*1*/ r: java.lang.Runnable): kotlin.Unit
public open class A {
public constructor A()
public open fun bar(/*0*/ r: java.lang.Runnable!): kotlin.Int
public open fun bar(/*0*/ r: kotlin.CharSequence!): kotlin.String!
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Int
public open fun foo(/*0*/ r: kotlin.Any!): kotlin.String!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.kt
Vendored
+24
View File
@@ -0,0 +1,24 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !CHECK_TYPE
// FILE: Foo.java
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
class Foo {
interface FObject<T> {
void invoke(T i);
}
public String foo(FObject<Integer> f) { return ""; }
public int foo(Function1<Integer, Unit> f) { return 1; }
public String bar(FObject<Object> f) { return ""; }
public int bar(Function1<Integer, Unit> f) { return 1; }
}
// FILE: 1.kt
fun test() {
Foo().foo {} checkType { _<Int>() }
Foo().bar {} checkType { _<String>() }
}
compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.txt
Vendored
+24
View File
@@ -0,0 +1,24 @@
package
public fun test(): kotlin.Unit
public/*package*/ open class Foo {
public/*package*/ constructor Foo()
public open fun bar(/*0*/ f: ((kotlin.Int!) -> kotlin.Unit!)!): kotlin.Int
public open fun bar(/*0*/ f: Foo.FObject<kotlin.Any!>!): kotlin.String!
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ f: ((kotlin.Int!) -> kotlin.Unit!)!): kotlin.Int
public open fun foo(/*0*/ f: Foo.FObject<kotlin.Int!>!): kotlin.String!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public/*package*/ interface FObject</*0*/ T : kotlin.Any!> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract operator fun invoke(/*0*/ i: T!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
// Static members
public/*package*/ final /*synthesized*/ fun </*0*/ T : kotlin.Any!> FObject(/*0*/ function: (i: T!) -> kotlin.Unit): Foo.FObject<T>
}
compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt
Vendored
+25
View File
@@ -0,0 +1,25 @@
// !LANGUAGE: -RefinedSamAdaptersPriority
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !CHECK_TYPE
// FILE: Foo.java
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
class Foo {
interface FObject<T> {
void invoke(T i);
}
public String foo(FObject<Integer> f) { return ""; }
public int foo(Function1<Integer, Unit> f) { return 1; }
public String bar(FObject<Object> f) { return ""; }
public int bar(Function1<Integer, Unit> f) { return 1; }
}
// FILE: 1.kt
fun test() {
Foo().foo {} checkType { _<Int>() }
Foo().bar {} checkType { _<Int>() }
}
compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.txt
Vendored
+24
View File
@@ -0,0 +1,24 @@
package
public fun test(): kotlin.Unit
public/*package*/ open class Foo {
public/*package*/ constructor Foo()
public open fun bar(/*0*/ f: ((kotlin.Int!) -> kotlin.Unit!)!): kotlin.Int
public open fun bar(/*0*/ f: Foo.FObject<kotlin.Any!>!): kotlin.String!
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(/*0*/ f: ((kotlin.Int!) -> kotlin.Unit!)!): kotlin.Int
public open fun foo(/*0*/ f: Foo.FObject<kotlin.Int!>!): kotlin.String!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public/*package*/ interface FObject</*0*/ T : kotlin.Any!> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract operator fun invoke(/*0*/ i: T!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
// Static members
public/*package*/ final /*synthesized*/ fun </*0*/ T : kotlin.Any!> FObject(/*0*/ function: (i: T!) -> kotlin.Unit): Foo.FObject<T>
}
compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !CHECK_TYPE
// FILE: Foo.java
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
public class Foo {
interface FObject {
void invoke(Object i);
}
public String test(FObject f) { return ""; }
public int test(Function1<Integer, Unit> f) { return 1; }
}
// FILE: 1.kt
fun bar() {
Foo().test {} checkType { _<String>() }
}
compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.txt
Vendored
+22
View File
@@ -0,0 +1,22 @@
package
public fun bar(): kotlin.Unit
public open class Foo {
public constructor Foo()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open fun test(/*0*/ f: ((kotlin.Int!) -> kotlin.Unit!)!): kotlin.Int
public open fun test(/*0*/ f: Foo.FObject!): kotlin.String!
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public/*package*/ interface FObject {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract operator fun invoke(/*0*/ i: kotlin.Any!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
// Static members
public/*package*/ final /*synthesized*/ fun FObject(/*0*/ function: (i: kotlin.Any!) -> kotlin.Unit): Foo.FObject
}
compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// !LANGUAGE: -RefinedSamAdaptersPriority
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !CHECK_TYPE
// FILE: Foo.java
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
public class Foo {
interface FObject {
void invoke(Object i);
}
public String test(FObject f) { return ""; }
public int test(Function1<Integer, Unit> f) { return 1; }
}
// FILE: 1.kt
fun bar() {
Foo().test {} checkType { _<Int>() }
}
compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.txt
Vendored
+22
View File
@@ -0,0 +1,22 @@
package
public fun bar(): kotlin.Unit
public open class Foo {
public constructor Foo()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open fun test(/*0*/ f: ((kotlin.Int!) -> kotlin.Unit!)!): kotlin.Int
public open fun test(/*0*/ f: Foo.FObject!): kotlin.String!
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public/*package*/ interface FObject {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract operator fun invoke(/*0*/ i: kotlin.Any!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
// Static members
public/*package*/ final /*synthesized*/ fun FObject(/*0*/ function: (i: kotlin.Any!) -> kotlin.Unit): Foo.FObject
}
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+12
View File
@@ -21414,6 +21414,18 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("overloadResolutionStaticWithoutRefinedSams.kt")
public void testOverloadResolutionStaticWithoutRefinedSams() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.kt");
doTest(fileName);
}
@TestMetadata("overloadResolutionWithoutRefinedSams.kt")
public void testOverloadResolutionWithoutRefinedSams() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.kt");
doTest(fileName);
}
@TestMetadata("PackageLocal.kt")
public void testPackageLocal() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PackageLocal.kt");
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
+24
View File
@@ -1195,6 +1195,30 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/resolve/samConstructorVsFun.kt");
doTest(fileName);
}
@TestMetadata("samOverloadsWithGenerics.kt")
public void testSamOverloadsWithGenerics() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.kt");
doTest(fileName);
}
@TestMetadata("samOverloadsWithGenericsWithoutRefinedSams.kt")
public void testSamOverloadsWithGenericsWithoutRefinedSams() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt");
doTest(fileName);
}
@TestMetadata("samOverloadsWithKtFunction.kt")
public void testSamOverloadsWithKtFunction() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.kt");
doTest(fileName);
}
@TestMetadata("samOverloadsWithKtFunctionWithoutRefinedSams.kt")
public void testSamOverloadsWithKtFunctionWithoutRefinedSams() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt");
doTest(fileName);
}
}
@TestMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts")
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+1
View File
@@ -38,6 +38,7 @@ enum class LanguageFeature(val sinceVersion: LanguageVersion?) {
OperatorRem(KOTLIN_1_1),
OperatorProvideDelegate(KOTLIN_1_1),
ShortSyntaxForPropertyGetters(KOTLIN_1_1),
RefinedSamAdaptersPriority(KOTLIN_1_1),
// Experimental features
MultiPlatformProjects(null),