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

[FIR] Revert workaround for IC issue surfaced by KT-58335

Browse Source 
#KT-28233
This commit is contained in:
Kirill Rakhman
2023-05-11 17:42:43 +02:00
committed by Space Team
parent 878dd67d92
commit a50ae9db9d
16 changed files with 6 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated.java
Generated
-5
View File
@@ -72,11 +72,6 @@ public class IncrementalFirICLightTreeJvmCompilerRunnerTestGenerated extends Abs
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java
Generated
-5
View File
@@ -72,11 +72,6 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirLightTreeJvmCompilerRunnerTestGenerated.java
Generated
-5
View File
@@ -72,11 +72,6 @@ public class IncrementalFirLightTreeJvmCompilerRunnerTestGenerated extends Abstr
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated.java
Generated
+3 -13
View File
@@ -76,11 +76,6 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");
@@ -921,12 +916,7 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
}
public void testAllFilesPresentInScopeExpansion() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^protectedBecomesPublicAccessedTroughChild.*"), true);
}
@TestMetadata("changeTypeAliasAndUsage")
public void testChangeTypeAliasAndUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/");
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^(protectedBecomesPublicAccessedTroughChild|changeTypeAliasAndUsage).*"), true);
}
@TestMetadata("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage")
@@ -938,7 +928,7 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
}
public void testAllFilesPresentInChangeTypeAliasAndUsage() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^protectedBecomesPublicAccessedTroughChild.*"), true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^(protectedBecomesPublicAccessedTroughChild|changeTypeAliasAndUsage).*"), true);
}
}
@@ -951,7 +941,7 @@ public class IncrementalJsFirKlibCompilerWithScopeExpansionRunnerTestGenerated e
}
public void testAllFilesPresentInProtectedBecomesPublicAccessedTroughChild() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^protectedBecomesPublicAccessedTroughChild.*"), true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild"), Pattern.compile("^([^\\.]+)$"), Pattern.compile("^(protectedBecomesPublicAccessedTroughChild|changeTypeAliasAndUsage).*"), true);
}
}
}
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java
Generated
-5
View File
@@ -76,11 +76,6 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
}
@TestMetadata("changeTypealiasSinceK2")
public void testChangeTypealiasSinceK2() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeTypealiasSinceK2/");
}
@TestMetadata("changeWithRemovingUsage")
public void testChangeWithRemovingUsage() throws Exception {
runTest("jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/");