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

Put the type inference on calls with self types under the compiler flag

Browse Source
This commit is contained in:
Victor Petukhov
2021-07-06 13:56:28 +03:00
parent 51c5a54e31
commit 3787099a38
30 changed files with 365 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+51 -13
View File
@@ -14185,22 +14185,60 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("basicInferenceForImplicitSelfType.kt")
public void testBasicInferenceForImplicitSelfType() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/basicInferenceForImplicitSelfType.kt");
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes")
@TestDataPath("$PROJECT_ROOT")
public class DisabledInferenceOnSelfTypes {
@Test
public void testAllFilesPresentInDisabledInferenceOnSelfTypes() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("basicInferenceForImplicitSelfType.kt")
public void testBasicInferenceForImplicitSelfType() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes/basicInferenceForImplicitSelfType.kt");
}
@Test
@TestMetadata("recursiveTypeWithTwoTypeParams.kt")
public void testRecursiveTypeWithTwoTypeParams() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes/recursiveTypeWithTwoTypeParams.kt");
}
@Test
@TestMetadata("writerAppenderExampleRecursive.kt")
public void testWriterAppenderExampleRecursive() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes/writerAppenderExampleRecursive.kt");
}
}
@Test
@TestMetadata("recursiveTypeWithTwoTypeParams.kt")
public void testRecursiveTypeWithTwoTypeParams() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/recursiveTypeWithTwoTypeParams.kt");
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes")
@TestDataPath("$PROJECT_ROOT")
public class EnabledInferenceOnSelfTypes {
@Test
public void testAllFilesPresentInEnabledInferenceOnSelfTypes() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("writerAppenderExampleRecursive.kt")
public void testWriterAppenderExampleRecursive() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/writerAppenderExampleRecursive.kt");
@Test
@TestMetadata("basicInferenceForImplicitSelfType.kt")
public void testBasicInferenceForImplicitSelfType() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes/basicInferenceForImplicitSelfType.kt");
}
@Test
@TestMetadata("recursiveTypeWithTwoTypeParams.kt")
public void testRecursiveTypeWithTwoTypeParams() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes/recursiveTypeWithTwoTypeParams.kt");
}
@Test
@TestMetadata("writerAppenderExampleRecursive.kt")
public void testWriterAppenderExampleRecursive() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes/writerAppenderExampleRecursive.kt");
}
}
}
}
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+51 -13
View File
@@ -14185,22 +14185,60 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("basicInferenceForImplicitSelfType.kt")
public void testBasicInferenceForImplicitSelfType() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/basicInferenceForImplicitSelfType.kt");
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes")
@TestDataPath("$PROJECT_ROOT")
public class DisabledInferenceOnSelfTypes {
@Test
public void testAllFilesPresentInDisabledInferenceOnSelfTypes() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("basicInferenceForImplicitSelfType.kt")
public void testBasicInferenceForImplicitSelfType() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes/basicInferenceForImplicitSelfType.kt");
}
@Test
@TestMetadata("recursiveTypeWithTwoTypeParams.kt")
public void testRecursiveTypeWithTwoTypeParams() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes/recursiveTypeWithTwoTypeParams.kt");
}
@Test
@TestMetadata("writerAppenderExampleRecursive.kt")
public void testWriterAppenderExampleRecursive() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes/writerAppenderExampleRecursive.kt");
}
}
@Test
@TestMetadata("recursiveTypeWithTwoTypeParams.kt")
public void testRecursiveTypeWithTwoTypeParams() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/recursiveTypeWithTwoTypeParams.kt");
}
@Nested
@TestMetadata("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes")
@TestDataPath("$PROJECT_ROOT")
public class EnabledInferenceOnSelfTypes {
@Test
public void testAllFilesPresentInEnabledInferenceOnSelfTypes() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
}
@Test
@TestMetadata("writerAppenderExampleRecursive.kt")
public void testWriterAppenderExampleRecursive() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/writerAppenderExampleRecursive.kt");
@Test
@TestMetadata("basicInferenceForImplicitSelfType.kt")
public void testBasicInferenceForImplicitSelfType() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes/basicInferenceForImplicitSelfType.kt");
}
@Test
@TestMetadata("recursiveTypeWithTwoTypeParams.kt")
public void testRecursiveTypeWithTwoTypeParams() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes/recursiveTypeWithTwoTypeParams.kt");
}
@Test
@TestMetadata("writerAppenderExampleRecursive.kt")
public void testWriterAppenderExampleRecursive() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/enabledInferenceOnSelfTypes/writerAppenderExampleRecursive.kt");
}
}
}
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/InferenceComponents.kt
+1 -1
View File
@@ -26,7 +26,7 @@ class InferenceComponents(val session: FirSession) : FirSessionComponent {
approximator,
session.languageVersionSettings,
)
val resultTypeResolver = ResultTypeResolver(approximator, trivialConstraintTypeInferenceOracle)
val resultTypeResolver = ResultTypeResolver(approximator, trivialConstraintTypeInferenceOracle, session.languageVersionSettings)
val variableFixationFinder = VariableFixationFinder(trivialConstraintTypeInferenceOracle, session.languageVersionSettings)
val postponedArgumentInputTypesResolver =
PostponedArgumentInputTypesResolver(resultTypeResolver, variableFixationFinder, ConeConstraintSystemUtilContext)