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

[NI] Allow capturing type projections with type variables

Browse Source 
#KT-25302 Fixed
This commit is contained in:
Mikhail Zarechenskiy
2019-04-22 17:56:55 +03:00
parent abd1c3df26
commit d40313a8d7
15 changed files with 93 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsSmokeTestGenerated.java
Generated
+5
View File
@@ -9795,6 +9795,11 @@ public class FirDiagnosticsSmokeTestGenerated extends AbstractFirDiagnosticsSmok
runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt");
}
@TestMetadata("kt25302.kt")
public void testKt25302() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/kt25302.kt");
}
@TestMetadata("kt2570.kt")
public void testKt2570() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.kt");
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewCallArguments.kt
+1 -3
View File
@@ -307,9 +307,7 @@ internal fun createSimplePSICallArgument(
ExpressionReceiver.create(ktExpression, baseType, bindingContext),
languageVersionSettings,
dataFlowValueFactory
).let {
if (onlyResolvedCall == null) it.prepareReceiverRegardingCaptureTypes() else it
}
).prepareReceiverRegardingCaptureTypes()
return if (onlyResolvedCall == null) {
ExpressionKotlinCallArgumentImpl(valueArgument, dataFlowInfoBeforeThisArgument, typeInfoForArgument.dataFlowInfo, receiverToCast)
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/model/NewConstraintSystemImpl.kt
+13 -13
View File
@@ -5,28 +5,21 @@
package org.jetbrains.kotlin.resolve.calls.inference.model
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.resolve.calls.components.BuiltInsProvider
import org.jetbrains.kotlin.resolve.calls.components.PostponedArgumentsAnalyzer
import org.jetbrains.kotlin.resolve.calls.inference.*
import org.jetbrains.kotlin.resolve.calls.inference.components.*
import org.jetbrains.kotlin.resolve.calls.inference.components.ConstraintInjector
import org.jetbrains.kotlin.resolve.calls.inference.components.KotlinConstraintSystemCompleter
import org.jetbrains.kotlin.resolve.calls.inference.components.NewTypeSubstitutor
import org.jetbrains.kotlin.resolve.calls.inference.components.ResultTypeResolver
import org.jetbrains.kotlin.resolve.calls.model.KotlinCallDiagnostic
import org.jetbrains.kotlin.types.StubType
import org.jetbrains.kotlin.types.TypeConstructor
import org.jetbrains.kotlin.types.TypeProjectionImpl
import org.jetbrains.kotlin.types.UnwrappedType
import org.jetbrains.kotlin.types.checker.ClassicTypeSystemContext
import org.jetbrains.kotlin.types.checker.NewCapturedType
import org.jetbrains.kotlin.types.checker.NewCapturedTypeConstructor
import org.jetbrains.kotlin.types.model.*
import org.jetbrains.kotlin.utils.SmartList
import org.jetbrains.kotlin.utils.addToStdlib.cast
import kotlin.math.max
class NewConstraintSystemImpl(
private val constraintInjector: ConstraintInjector,
val typeSystemContext: TypeSystemInferenceExtensionContext//,
//override val builtIns: KotlinBuiltIns
val typeSystemContext: TypeSystemInferenceExtensionContext
) :
TypeSystemInferenceExtensionContext by typeSystemContext,
NewConstraintSystem,
@@ -184,7 +177,14 @@ class NewConstraintSystemImpl(
override fun isProperType(type: KotlinTypeMarker): Boolean {
checkState(State.BUILDING, State.COMPLETION, State.TRANSACTION)
return !type.contains {
storage.allTypeVariables.containsKey(it.typeConstructor())
val capturedType = it.asSimpleType()?.asCapturedType()
// TODO: change NewCapturedType to markered one for FE-IR
val typeToCheck = if (capturedType is NewCapturedType && capturedType.captureStatus() == CaptureStatus.FROM_EXPRESSION)
capturedType.constructor.projection.type
else
it
storage.allTypeVariables.containsKey(typeToCheck.typeConstructor())
}
}
compiler/testData/diagnostics/tests/generics/kt9203.kt
Vendored
+1 -1
View File
@@ -6,6 +6,6 @@ import java.util.stream.IntStream
fun main() {
val xs = IntStream.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>range<!>(0, 10).mapToObj { it.toString() }
.collect(<!NI;NEW_INFERENCE_ERROR!>Collectors.toList()<!>)
.collect(Collectors.toList())
xs[0]
}
compiler/testData/diagnostics/tests/inference/capturedTypes/kt25302.kt
Vendored
+18
View File
@@ -0,0 +1,18 @@
// !LANGUAGE: +NewInference
// !DIAGNOSTICS: -UNUSED_PARAMETER
interface CollectorMock<A, R>
interface StreamMock {
fun <R, A> collect(collector: CollectorMock<A, R>): R
}
fun <T> accept(s: T) {}
fun ofK(t: String): StreamMock = TODO()
fun <T> toSetK(): CollectorMock<*, T> = TODO()
class KotlinCollectionUser1 {
fun use() {
accept(ofK("").collect(toSetK<String>()))
}
}
compiler/testData/diagnostics/tests/inference/capturedTypes/kt25302.txt
Vendored
+26
View File
@@ -0,0 +1,26 @@
package
public fun </*0*/ T> accept(/*0*/ s: T): kotlin.Unit
public fun ofK(/*0*/ t: kotlin.String): StreamMock
public fun </*0*/ T> toSetK(): CollectorMock<*, T>
public interface CollectorMock</*0*/ A, /*1*/ R> {
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
}
public final class KotlinCollectionUser1 {
public constructor KotlinCollectionUser1()
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
public final fun use(): kotlin.Unit
}
public interface StreamMock {
public abstract fun </*0*/ R, /*1*/ A> collect(/*0*/ collector: CollectorMock<A, R>): R
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
}
compiler/testData/diagnostics/tests/inference/capturedTypes/topLevelCapturingInsideReturnType.kt
Vendored
+4 -5
View File
@@ -1,12 +1,11 @@
// !LANGUAGE: +NewInference
// !DIAGNOSTICS: -UNUSED_PARAMETER
class Inv<T, K>
class Inv2<T, K>
fun <K> createInv(): Inv<*, K> = TODO()
fun <K> createInv(): Inv2<*, K> = TODO()
fun <T> foo(i: Inv<T, String>) {}
fun <T> foo(i: Inv2<T, String>) {}
fun foo() {
foo(<!NEW_INFERENCE_ERROR!>createInv()<!>)
foo(createInv())
}
compiler/testData/diagnostics/tests/inference/capturedTypes/topLevelCapturingInsideReturnType.txt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
package
public fun </*0*/ K> createInv(): Inv<*, K>
public fun </*0*/ K> createInv(): Inv2<*, K>
public fun foo(): kotlin.Unit
public fun </*0*/ T> foo(/*0*/ i: Inv<T, kotlin.String>): kotlin.Unit
public fun </*0*/ T> foo(/*0*/ i: Inv2<T, kotlin.String>): kotlin.Unit
public final class Inv</*0*/ T, /*1*/ K> {
public constructor Inv</*0*/ T, /*1*/ K>()
public final class Inv2</*0*/ T, /*1*/ K> {
public constructor Inv2</*0*/ T, /*1*/ K>()
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
compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt
Vendored
+2 -2
View File
@@ -59,9 +59,9 @@ fun test1(int: Int, any: Any) {
writeToMyList(getMyListToWriteTo(any), int)
<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>writeToMyList<!>(getMyListToWriteTo(int), any)
readFromMyList(<!NI;NEW_INFERENCE_ERROR!>getMyListToWriteTo(any)<!>, any)
readFromMyList(getMyListToWriteTo(any), any)
<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>writeToMyList<!>(<!NI;NEW_INFERENCE_ERROR!>getMyListToReadFrom(any)<!>, any)
<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>writeToMyList<!>(getMyListToReadFrom(any), <!NI;TYPE_MISMATCH!>any<!>)
use(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13)
}
compiler/testData/diagnostics/tests/j+k/collectorInference.kt
Vendored
+2 -2
View File
@@ -7,8 +7,8 @@ import java.util.stream.Collectors
import java.util.stream.Stream
fun test(a: Stream<String>) {
a.collect(<!NI;NEW_INFERENCE_ERROR!>Collectors.toList()<!>) checkType { _<MutableList<String>>() }
a.collect(Collectors.toList()) checkType { _<MutableList<String>>() }
// actually the inferred type is platform
a.collect(<!NI;NEW_INFERENCE_ERROR!>Collectors.toList()<!>) checkType { _<List<String?>>() }
a.collect(Collectors.toList()) checkType { _<List<String?>>() }
}
compiler/testData/diagnostics/tests/targetedBuiltIns/stream.kt
Vendored
+1 -1
View File
@@ -8,6 +8,6 @@ interface A : Collection<String> {
}
fun foo(x: List<String>, y: A) {
x.stream().filter { it.length > 0 }.collect(<!NI;NEW_INFERENCE_ERROR!>Collectors.toList()<!>)
x.stream().filter { it.length > 0 }.collect(Collectors.toList())
y.stream().filter { it.length > 0 }
}
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
Generated
+5
View File
@@ -9802,6 +9802,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt");
}
@TestMetadata("kt25302.kt")
public void testKt25302() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/kt25302.kt");
}
@TestMetadata("kt2570.kt")
public void testKt2570() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.kt");
compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
Generated
+5
View File
@@ -9797,6 +9797,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt");
}
@TestMetadata("kt25302.kt")
public void testKt25302() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/kt25302.kt");
}
@TestMetadata("kt2570.kt")
public void testKt2570() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.kt");
core/descriptors/src/org/jetbrains/kotlin/types/checker/ClassicTypeSystemContext.kt
+5
View File
@@ -370,6 +370,11 @@ interface ClassicTypeSystemContext : TypeSystemInferenceExtensionContext {
return this.constructor.projection
}
override fun CapturedTypeMarker.captureStatus(): CaptureStatus {
require(this is NewCapturedType, this::errorMessage)
return this.captureStatus
}
override fun KotlinTypeMarker.isNullableType(): Boolean {
require(this is KotlinType, this::errorMessage)
return TypeUtils.isNullableType(this)
core/type-system/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
+1
View File
@@ -118,6 +118,7 @@ interface TypeSystemInferenceExtensionContext : TypeSystemContext, TypeSystemBui
fun CapturedTypeMarker.typeConstructorProjection(): TypeArgumentMarker
fun CapturedTypeMarker.captureStatus(): CaptureStatus
fun KotlinTypeMarker.isNullableType(): Boolean