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

FIR: forbid java.lang.String(String) constructor in JvmMappedScope

Browse Source 
#KT-49135 Fixed
This commit is contained in:
Mikhail Glukhikh
2021-10-14 17:44:47 +03:00
committed by TeamCityServer
parent 09bc729b0e
commit f4067f05a2
6 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java
Generated
+6
View File
@@ -5111,6 +5111,12 @@ public class DiagnosisCompilerFirTestdataTestGenerated extends AbstractDiagnosis
runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/PersistentStateComponent.kt");
}
@Test
@TestMetadata("typeAliasAmbiguity.kt")
public void testTypeAliasAmbiguity() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/typeAliasAmbiguity.kt");
}
@Test
@TestMetadata("UastPatterns.kt")
public void testUastPatterns() throws Exception {
compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/typeAliasAmbiguity.fir.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
FILE: typeAliasAmbiguity.kt
public final typealias ServiceId = R|kotlin/String|
public final fun ServiceId(serviceId: R|kotlin/String|): R|ServiceId| {
^ServiceId R|<local>/serviceId|
}
public final val GaugeSpecTmsIntegrationServiceId: R|ServiceId| = R|/ServiceId|(String(Gauge))
public get(): R|ServiceId|
compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/typeAliasAmbiguity.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
typealias ServiceId = String
fun ServiceId(serviceId: String): ServiceId = serviceId
// FE 1.0 resolves this to function
val GaugeSpecTmsIntegrationServiceId = ServiceId("Gauge")
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
Generated
+6
View File
@@ -5111,6 +5111,12 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest {
runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/PersistentStateComponent.kt");
}
@Test
@TestMetadata("typeAliasAmbiguity.kt")
public void testTypeAliasAmbiguity() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/typeAliasAmbiguity.kt");
}
@Test
@TestMetadata("UastPatterns.kt")
public void testUastPatterns() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
Generated
+6
View File
@@ -5111,6 +5111,12 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/PersistentStateComponent.kt");
}
@Test
@TestMetadata("typeAliasAmbiguity.kt")
public void testTypeAliasAmbiguity() throws Exception {
runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/typeAliasAmbiguity.kt");
}
@Test
@TestMetadata("UastPatterns.kt")
public void testUastPatterns() throws Exception {
compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt
+1
View File
@@ -146,6 +146,7 @@ class JvmMappedScope(
"Lkotlin/IntArray;II",
"Ljava/lang/StringBuffer;",
"Ljava/lang/StringBuilder;",
"Ljava/lang/String;",
).mapTo(this) { arguments -> "java/lang/String.<init>($arguments)V" }
listOf(