Skip to content

Commit 7ff0e14

Browse files
committed
Update MockJDK to include Pattern.class required in tests for #KT-7732
1 parent 4ae2491 commit 7ff0e14

File tree

4 files changed

+3
-9
lines changed

4 files changed

+3
-9
lines changed
80.6 KB
Binary file not shown.

compiler/testData/mockJDK/src.zip

38.1 KB
Binary file not shown.

generators/src/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ public class GenerateMockJdk {
254254
"java/util/Properties.class",
255255
"java/util/Random.class",
256256
"java/util/RandomAccess.class",
257+
"java/util/regex/Pattern.class",
257258
"java/util/Objects.class",
258259
"java/util/Set.class",
259260
"java/util/SortedMap.class",

j2k/testData/fileOrElement/methodCallExpression/stringMethods.kt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
// ERROR: Overload resolution ambiguity: public fun kotlin.String.split(regex: [ERROR : java.util.regex.Pattern], limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin public fun kotlin.String.split(pattern: kotlin.text.Regex, limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin
2-
// ERROR: Unresolved reference: it
3-
// ERROR: Overload resolution ambiguity: public fun kotlin.String.split(regex: [ERROR : java.util.regex.Pattern], limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin public fun kotlin.String.split(pattern: kotlin.text.Regex, limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin
4-
// ERROR: Unresolved reference: it
5-
// ERROR: Overload resolution ambiguity: public fun kotlin.String.split(regex: [ERROR : java.util.regex.Pattern], limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin public fun kotlin.String.split(pattern: kotlin.text.Regex, limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin
6-
// ERROR: Overload resolution ambiguity: public fun kotlin.String.split(regex: [ERROR : java.util.regex.Pattern], limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin public fun kotlin.String.split(pattern: kotlin.text.Regex, limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin
7-
// ERROR: Overload resolution ambiguity: public fun kotlin.String.split(regex: [ERROR : java.util.regex.Pattern], limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin public fun kotlin.String.split(pattern: kotlin.text.Regex, limit: kotlin.Int = ...): kotlin.List<kotlin.String> defined in kotlin
81
import java.nio.charset.Charset
92
import java.util.*
103

@@ -84,8 +77,8 @@ internal class A {
8477
s.matches("\\w+".toRegex())
8578
s.replace("\\w+".toRegex(), "---")
8679
s.replaceFirst("([s-t])".toRegex(), "A$1")
87-
useSplit(s.split("\\s+".toRegex()).dropLastWhile({ it.isEmpty() }).toTypedArray())
88-
useSplit(s.split("\\s+".toRegex()).dropLastWhile({ it.isEmpty() }).toTypedArray())
80+
useSplit(s.split("\\s+".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray())
81+
useSplit(s.split("\\s+".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray())
8982
useSplit(s.split("\\s+".toRegex()).toTypedArray())
9083
useSplit(s.split("\\s+".toRegex(), 2).toTypedArray())
9184
val limit = 5

0 commit comments

Comments
 (0)