Skip to content

Commit 69b7b9b

Browse files
Googlercopybara-github
authored andcommitted
[J2KT] Uncomment readable which is passing after https://youtrack.jetbrains.com/issue/KT-70816 is fixed.
PiperOrigin-RevId: 863240410
1 parent a769597 commit 69b7b9b

File tree

8 files changed

+114
-110
lines changed

8 files changed

+114
-110
lines changed

transpiler/javatests/com/google/j2cl/readable/java/j2kt/ExplicitNotNullable.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ DependentTypeParameters<E, T> getThis() {
2727
}
2828
}
2929

30-
// TODO(b/255955130): Uncomment when fixed.
31-
// DependentTypeParameters<?, ?> testDependentWildcards(DependentTypeParameters<?, ?> x) {
32-
// return x.getThis();
33-
// }
30+
DependentTypeParameters<?, ?> testDependentWildcards(DependentTypeParameters<?, ?> x) {
31+
return x.getThis();
32+
}
3433
}

transpiler/javatests/com/google/j2cl/readable/java/j2kt/output_kt/ExplicitNotNullable.kt.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ import kotlin.Any
2424
import kotlin.Suppress
2525

2626
open class ExplicitNotNullable {
27+
internal open fun testDependentWildcards_pp_j2kt(x: DependentTypeParameters<*, *>): DependentTypeParameters<*, *> {
28+
return x.getThis_pp_j2kt() as DependentTypeParameters<*, *>
29+
}
30+
2731
open class DependentTypeParameters<E: Any, T: E?> internal constructor() {
2832
internal open fun getThis_pp_j2kt(): DependentTypeParameters<E, T> {
2933
return this

transpiler/javatests/com/google/j2cl/readable/java/j2ktjdt/ExplicitNotNullable.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ DependentTypeParameters<E, T> getThis() {
2727
}
2828
}
2929

30-
// TODO(b/255955130): Uncomment when fixed.
31-
// DependentTypeParameters<?, ?> testDependentWildcards(DependentTypeParameters<?, ?> x) {
32-
// return x.getThis();
33-
// }
30+
DependentTypeParameters<?, ?> testDependentWildcards(DependentTypeParameters<?, ?> x) {
31+
return x.getThis();
32+
}
3433
}

transpiler/javatests/com/google/j2cl/readable/java/j2ktjdt/output_kt/ExplicitNotNullable.kt.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ import kotlin.Any
2424
import kotlin.Suppress
2525

2626
open class ExplicitNotNullable {
27+
internal open fun testDependentWildcards_pp_j2ktjdt(x: DependentTypeParameters<*, *>): DependentTypeParameters<*, *> {
28+
return x.getThis_pp_j2ktjdt() as DependentTypeParameters<*, *>
29+
}
30+
2731
open class DependentTypeParameters<E: Any, T: E?> internal constructor() {
2832
internal open fun getThis_pp_j2ktjdt(): DependentTypeParameters<E, T> {
2933
return this

transpiler/javatests/com/google/j2cl/readable/java/nullability/explicitnotnullable/ExplicitNotNullable.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,7 @@ DependentTypeParameters<E, T> getThis() {
405405
}
406406

407407
DependentTypeParameters<?, ?> testDependentWildcards(DependentTypeParameters<?, ?> x) {
408-
return x;
409-
// TODO(b/255955130): This is not yet working. Uncomment when fixed.
410-
// return x.getThis();
408+
return x.getThis();
411409
}
412410

413411
static void testLocalNullability() {
@@ -454,7 +452,7 @@ class DefaultNullable {
454452
static void nullableAccept(String s) {}
455453
}
456454

457-
// Repros fixed incosistency adding the outer parameter in ResolveCaptures.
455+
// Repros fixed inconsistency adding the outer parameter in ResolveCaptures.
458456
@NullMarked
459457
class OuterClass<E> {
460458
class InnerClass<E> {}

transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable.impl.java.js.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ class ExplicitNotNullable extends j_l_Object {
338338
}
339339
/** @nodts @return {!DependentTypeParameters<?, ?>} */
340340
m_testDependentWildcards__nullability_explicitnotnullable_ExplicitNotNullable_DependentTypeParameters__nullability_explicitnotnullable_ExplicitNotNullable_DependentTypeParameters_$pp_nullability_explicitnotnullable(/** !DependentTypeParameters<?, ?> */ x) {
341-
return x;
341+
return x.m_getThis__nullability_explicitnotnullable_ExplicitNotNullable_DependentTypeParameters_$pp_nullability_explicitnotnullable();
342342
}
343343
/** @nodts */
344344
static m_testLocalNullability__void() {

transpiler/javatests/com/google/j2cl/readable/java/nullability/output_kt/explicitnotnullable/ExplicitNotNullable.kt.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ open class ExplicitNotNullable {
151151
}
152152

153153
internal open fun testDependentWildcards_pp_nullability_explicitnotnullable(x: DependentTypeParameters<*, *>): DependentTypeParameters<*, *> {
154-
return x
154+
return x.getThis_pp_nullability_explicitnotnullable() as DependentTypeParameters<*, *>
155155
}
156156

157157
companion object {

transpiler/javatests/com/google/j2cl/readable/java/nullability/output_wasm/contents.wat.txt

Lines changed: 96 additions & 96 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)