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

[Test] Fix diagnostics arguments rendering when quotes are present

Browse Source 
Non-capturing `(?:)` was now needed to avoid
getting an additional group that only
contains the last symbol before the closing `"`.

^KT-62711 Fixed
This commit is contained in:
Nikolay Lunyak
2023-10-19 15:19:03 +03:00
committed by Space Team
parent 54de11cb58
commit b8e2a17de1
7 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes/recursiveTypeWithTwoTypeParams.kt
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ interface BodySpec<B, S : BodySpec<B, S>> {
fun test(b: BodySpec<String, *>) {
val x = b.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>isEqualTo<!>("")
<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, DEBUG_INFO_EXPRESSION_TYPE("[Error type: Not found recorded type for b.isEqualTo("")]")!>x<!>
<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, DEBUG_INFO_EXPRESSION_TYPE("[Error type: Not found recorded type for b.isEqualTo(\"\")]")!>x<!>
}
compiler/testData/diagnostics/tests/multiplatform/annotationMatching/annotationArgRendering.kt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ expect fun onType(): @Ann2("") Any?
// FILE: jvm.kt
actual annotation class <!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT("annotation class Ann : Annotation defined in root package in file common.kt; annotation class Ann : Annotation defined in root package in file jvm.kt; Annotation `@Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.CLASS})` is missing on actual declaration")!>Ann<!>
actual fun <!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT("fun stringConcat(): Unit defined in root package in file common.kt; fun stringConcat(): Unit defined in root package in file jvm.kt; Annotation `@Ann2(s = "12")` is missing on actual declaration")!>stringConcat<!>() {}
actual fun <!ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT("fun stringConcat(): Unit defined in root package in file common.kt; fun stringConcat(): Unit defined in root package in file jvm.kt; Annotation `@Ann2(s = \"12\")` is missing on actual declaration")!>stringConcat<!>() {}
// Not reported in K1, because supported starting from K2
actual fun onType(): Any? = null
compiler/testData/diagnostics/tests/operatorsOverloading/until/customDisabled.kt
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
// !LANGUAGE: -RangeUntilOperator
class A {
<!UNSUPPORTED_FEATURE("The feature "range until operator" is disabled")!>operator<!> fun rangeUntil(other: A): Iterable<A> = TODO()
<!UNSUPPORTED_FEATURE("The feature \"range until operator\" is disabled")!>operator<!> fun rangeUntil(other: A): Iterable<A> = TODO()
}
fun main(n: A, f: A) {
for (i in f<!UNSUPPORTED_FEATURE("The feature "range until operator" is disabled")!>..<<!>n) {
for (i in f<!UNSUPPORTED_FEATURE("The feature \"range until operator\" is disabled")!>..<<!>n) {
}
}
compiler/testData/diagnostics/tests/unitConversion/kt49394.kt
Vendored
+1 -1
View File
@@ -11,5 +11,5 @@ val x = {
}
fun test() {
handle(<!UNSUPPORTED_FEATURE("The feature "unit conversions on arbitrary expressions" is experimental and should be enabled explicitly. You can also change the original type of this expression to (...) -> Unit")!>x<!>)
handle(<!UNSUPPORTED_FEATURE("The feature \"unit conversions on arbitrary expressions\" is experimental and should be enabled explicitly. You can also change the original type of this expression to (...) -> Unit")!>x<!>)
}