From 558b06b12fbf37c661d9a70c3984f248376fee6d Mon Sep 17 00:00:00 2001 From: Goktug Gokdogan Date: Tue, 10 Dec 2024 11:05:33 -0800 Subject: [PATCH] [JS] Workaround JsCompiler handling of interface constructor in a more general way. PiperOrigin-RevId: 704775914 --- jre/java/java/lang/Class.java | 4 +- jre/java/javaemul/internal/Casts.native.js | 7 ++- .../nativebootstrap/Util.impl.java.js | 3 +- ...tlinThrowsInJsFunction.stacktrace_j2cl.txt | 2 +- ...sInJsFunction.stacktrace_j2cl_compiled.txt | 2 +- .../ThrowsInJsFunction.stacktrace_j2cl.txt | 2 +- ...sInJsFunction.stacktrace_j2cl_compiled.txt | 2 +- .../j2cl/transpiler/backend/Backend.java | 2 + .../passes/AddInterfaceConstructorCasts.java | 46 +++++++++++++++++++ .../passes/ImplementInstanceOfs.java | 8 +--- .../InnerClasses$A.impl.java.js.txt | 2 +- .../MyInterface.impl.java.js.txt | 2 +- ...ctMethodOverrideDefault$I.impl.java.js.txt | 2 +- ...ctMethodOverrideDefault$J.impl.java.js.txt | 2 +- .../SuperInterface.impl.java.js.txt | 2 +- .../output_closure/Main$Foo.impl.java.js.txt | 2 +- .../output_closure/Main$Zoo.impl.java.js.txt | 2 +- .../SomeInterface.impl.java.js.txt | 2 +- .../output_closure/Main$G.impl.java.js.txt | 2 +- .../output_closure/Main$I.impl.java.js.txt | 2 +- .../output_closure/Main$J.impl.java.js.txt | 2 +- .../output_closure/Main$M.impl.java.js.txt | 2 +- .../output_closure/Main$P.impl.java.js.txt | 2 +- .../BridgeMethodDefault$I.impl.java.js.txt | 2 +- .../BridgeMethodDefault$II.impl.java.js.txt | 2 +- .../BridgeMethodDefault$JJ.impl.java.js.txt | 2 +- ...MethodShadowedSignature$I.impl.java.js.txt | 2 +- .../output_closure/Getter.impl.java.js.txt | 2 +- .../output_closure/I.impl.java.js.txt | 2 +- ...ceOverridingDefaultMethod.impl.java.js.txt | 2 +- ...nterfaceWithDefaultMethod.impl.java.js.txt | 2 +- .../J2ktIncompatible.impl.java.js.txt | 2 +- .../output_closure/Map.impl.java.js.txt | 2 +- .../SomeInterface.impl.java.js.txt | 2 +- .../SomeOtherFooInterface.impl.java.js.txt | 2 +- .../SpecializedInterface.impl.java.js.txt | 2 +- ...ecializingReturnInterface.impl.java.js.txt | 2 +- .../StringConsumer.impl.java.js.txt | 2 +- .../TestCase10036$BI1.impl.java.js.txt | 2 +- .../TestCase10036$BI2.impl.java.js.txt | 2 +- .../TestCase10036$BI3.impl.java.js.txt | 2 +- .../TestCase102$BI1.impl.java.js.txt | 2 +- .../TestCase102$BI2.impl.java.js.txt | 2 +- .../CastGenerics$A.impl.java.js.txt | 2 +- .../CastGenerics$B.impl.java.js.txt | 2 +- .../CastGenerics$Empty1.impl.java.js.txt | 2 +- .../CastGenerics$Empty2.impl.java.js.txt | 2 +- .../CastGenerics.impl.java.js.txt | 32 ++++++------- .../output_closure/Casts.impl.java.js.txt | 2 +- ...ample$DeprecatedInterface.impl.java.js.txt | 2 +- .../EmptyInterface.impl.java.js.txt | 2 +- .../BothInInterface.impl.java.js.txt | 2 +- .../NeitherInInterface.impl.java.js.txt | 2 +- ...hStatement$StringIterable.impl.java.js.txt | 2 +- ...hStatement$StringIterator.impl.java.js.txt | 2 +- .../ForEachStatement.impl.java.js.txt | 12 ++--- ...nterfaces$NonParametrized.impl.java.js.txt | 2 +- ...alInterfaces$Parametrized.impl.java.js.txt | 2 +- ...nalInterfaces$Specialized.impl.java.js.txt | 2 +- ...erfaces$WithDefaultMethod.impl.java.js.txt | 2 +- ...Interfaces$WithKtProperty.impl.java.js.txt | 2 +- ...erfaces$WithObjectMethods.impl.java.js.txt | 2 +- ...es$WithParametrizedMethod.impl.java.js.txt | 2 +- .../output_closure/Function.impl.java.js.txt | 2 +- .../InterfaceWithDefault.impl.java.js.txt | 2 +- .../MyInterface.impl.java.js.txt | 2 +- .../GenericMethod$Consumer.impl.java.js.txt | 2 +- .../GenericMethod$Supplier.impl.java.js.txt | 2 +- .../GenericInterface.impl.java.js.txt | 2 +- .../GenericSubInterface.impl.java.js.txt | 2 +- .../MyInterface.impl.java.js.txt | 2 +- .../MyInterface.impl.java.js.txt | 2 +- .../MyJsInterface.impl.java.js.txt | 2 +- .../SubInterface.impl.java.js.txt | 2 +- .../Main$Interface.impl.java.js.txt | 2 +- .../Main$SubInterface.impl.java.js.txt | 2 +- .../output_closure/Cmp.impl.java.js.txt | 2 +- .../output_closure/Cmp2.impl.java.js.txt | 2 +- .../output_closure/Getable.impl.java.js.txt | 2 +- ...tersectionTypeTest$EmptyA.impl.java.js.txt | 2 +- ...tersectionTypeTest$EmptyB.impl.java.js.txt | 2 +- ...rsectionTypeTest$MapEntry.impl.java.js.txt | 2 +- .../IntersectionTypeTest.impl.java.js.txt | 26 +++++------ .../output_closure/Serial.impl.java.js.txt | 2 +- .../output_closure/Setable.impl.java.js.txt | 2 +- .../Main$AsyncInterface.impl.java.js.txt | 2 +- .../Main$BaseInterface.impl.java.js.txt | 2 +- ...aceWithAsyncDefaultMethod.impl.java.js.txt | 2 +- .../MyInterface.impl.java.js.txt | 2 +- .../OtherInterface.impl.java.js.txt | 2 +- .../MyJsInterface.impl.java.js.txt | 2 +- ...bleJsEnumSupplierConsumer.impl.java.js.txt | 2 +- .../Main$Consumer.impl.java.js.txt | 2 +- .../Main$Supplier.impl.java.js.txt | 2 +- ...rningParametricJsFunction.impl.java.js.txt | 2 +- .../JsMethodExample$I.impl.java.js.txt | 2 +- ...nterfaceExposingJsMethods.impl.java.js.txt | 2 +- ...ample$InterfaceWithMethod.impl.java.js.txt | 2 +- .../Main$NonNullableTemplate.impl.java.js.txt | 2 +- ...onNullableTemplatedReturn.impl.java.js.txt | 2 +- .../output_closure/Main$I.impl.java.js.txt | 2 +- ...ceWithDefaultJsProperties.impl.java.js.txt | 2 +- .../output_closure/Interface.impl.java.js.txt | 2 +- ...nterfaceMethodWithVarargs.impl.java.js.txt | 2 +- .../output_closure/Main.impl.java.js.txt | 4 +- .../Lambdas$BiFunction.impl.java.js.txt | 2 +- .../Lambdas$EmptyInterface.impl.java.js.txt | 2 +- ...as$EmptyInterfaceProvider.impl.java.js.txt | 2 +- .../Lambdas$Equals.impl.java.js.txt | 2 +- .../Lambdas$Function.impl.java.js.txt | 2 +- .../Lambdas$Functional.impl.java.js.txt | 2 +- ...mbdas$FunctionalInterface.impl.java.js.txt | 2 +- ...ceWithMethodReturningVoid.impl.java.js.txt | 2 +- ...enericFunctionalInterface.impl.java.js.txt | 2 +- .../Lambdas$JsSupplier.impl.java.js.txt | 2 +- .../Lambdas$JustADefaultS.impl.java.js.txt | 2 +- .../Lambdas$JustADefaultT.impl.java.js.txt | 2 +- ...s$MarkerWithDefaultMethod.impl.java.js.txt | 2 +- .../Lambdas$Runnable.impl.java.js.txt | 2 +- ...Main$FunctionnalInterface.impl.java.js.txt | 2 +- ...sibleFunctionnalInterface.impl.java.js.txt | 2 +- .../Main$JsTypeInterface.impl.java.js.txt | 2 +- .../RegularInterface.impl.java.js.txt | 2 +- .../SubNativeInterface.impl.java.js.txt | 2 +- ...dReferences$ArrayProducer.impl.java.js.txt | 2 +- ...thodReferences$BiFunction.impl.java.js.txt | 2 +- ...MethodReferences$Function.impl.java.js.txt | 2 +- ...ethodReferences$Predicate.impl.java.js.txt | 2 +- ...MethodReferences$Producer.impl.java.js.txt | 2 +- .../MyInterface.impl.java.js.txt | 2 +- ...bstractParents$Collection.impl.java.js.txt | 2 +- ...stractParents$IStringList.impl.java.js.txt | 2 +- ...tipleAbstractParents$List.impl.java.js.txt | 2 +- ...nterfaceWithThisReference.impl.java.js.txt | 2 +- .../output_closure/Entry.impl.java.js.txt | 2 +- .../output_closure/Marker.impl.java.js.txt | 2 +- ...y$NullableTemplatedReturn.impl.java.js.txt | 2 +- .../Nullability$StringList.impl.java.js.txt | 2 +- ...faultNotNullable$Consumer.impl.java.js.txt | 2 +- ...lBoundWithNonNullArgument.impl.java.js.txt | 2 +- ...BoundWithNullableArgument.impl.java.js.txt | 2 +- ...Nullable$NonNullableBound.impl.java.js.txt | 2 +- ...NotNullable$NullableBound.impl.java.js.txt | 2 +- ...eBoundWithNonNullArgument.impl.java.js.txt | 2 +- ...BoundWithNullableArgument.impl.java.js.txt | 2 +- ...le$ParameterizedInterface.impl.java.js.txt | 2 +- .../DefaultNullable$Consumer.impl.java.js.txt | 2 +- ...lBoundWithNonNullArgument.impl.java.js.txt | 2 +- ...BoundWithNullableArgument.impl.java.js.txt | 2 +- ...Nullable$NonNullableBound.impl.java.js.txt | 2 +- ...llable$NullMarkedConsumer.impl.java.js.txt | 2 +- ...ble$NullMarkedIntFunction.impl.java.js.txt | 2 +- ...llable$NullMarkedSupplier.impl.java.js.txt | 2 +- ...ultNullable$NullableBound.impl.java.js.txt | 2 +- ...eBoundWithNonNullArgument.impl.java.js.txt | 2 +- ...BoundWithNullableArgument.impl.java.js.txt | 2 +- ...licitNotNullable$Consumer.impl.java.js.txt | 2 +- ...licitNotNullable$Function.impl.java.js.txt | 2 +- ...itNotNullable$IntFunction.impl.java.js.txt | 2 +- ...lBoundWithNonNullArgument.impl.java.js.txt | 2 +- ...BoundWithNullableArgument.impl.java.js.txt | 2 +- ...Nullable$NonNullableBound.impl.java.js.txt | 2 +- ...NotNullable$NullableBound.impl.java.js.txt | 2 +- ...eBoundWithNonNullArgument.impl.java.js.txt | 2 +- ...BoundWithNullableArgument.impl.java.js.txt | 2 +- ...licitNotNullable$Supplier.impl.java.js.txt | 2 +- .../SomeInterface.impl.java.js.txt | 2 +- .../HashFunction.impl.java.js.txt | 2 +- .../MyFunction.impl.java.js.txt | 2 +- .../ParameterizedType.impl.java.js.txt | 2 +- .../ParameterizedType.impl.java.js.txt | 2 +- .../package1/Interface.impl.java.js.txt | 2 +- .../output_closure/Main$Fn.impl.java.js.txt | 2 +- .../Main$FnObjectVarargs.impl.java.js.txt | 2 +- .../Main$FnPrimitiveVarargs.impl.java.js.txt | 2 +- .../google/protobuf/EnumLite.impl.java.js.txt | 2 +- .../Internal$ProtoNonnullApi.impl.java.js.txt | 2 +- ...RawType$GenericSuperclass.impl.java.js.txt | 2 +- .../output_closure/Callable.impl.java.js.txt | 2 +- .../SimpleGenericInterface.impl.java.js.txt | 2 +- .../GrandParentInterface.impl.java.js.txt | 2 +- .../output_closure/I1.impl.java.js.txt | 2 +- .../output_closure/I2.impl.java.js.txt | 2 +- .../output_closure/I3.impl.java.js.txt | 2 +- .../ParentInterface.impl.java.js.txt | 2 +- .../DeepRecursiveType.impl.java.js.txt | 2 +- .../output_closure/Function.impl.java.js.txt | 2 +- .../output_closure/List.impl.java.js.txt | 2 +- .../TypeWildCards$HasKey.impl.java.js.txt | 2 +- ...WildCards$IntegerSupplier.impl.java.js.txt | 2 +- ...dCards$RecursiveInterface.impl.java.js.txt | 2 +- .../TypeWildCards$X.impl.java.js.txt | 2 +- .../TypeWildCards$Y.impl.java.js.txt | 2 +- .../TypeWildCards.impl.java.js.txt | 6 +-- .../output_closure/I.impl.java.js.txt | 2 +- .../output_closure/J.impl.java.js.txt | 2 +- ...rargs$FunctionalInterface.impl.java.js.txt | 2 +- 197 files changed, 280 insertions(+), 242 deletions(-) create mode 100644 transpiler/java/com/google/j2cl/transpiler/passes/AddInterfaceConstructorCasts.java diff --git a/jre/java/java/lang/Class.java b/jre/java/java/lang/Class.java index 0ffee8a5bc..0d3011f866 100644 --- a/jre/java/java/lang/Class.java +++ b/jre/java/java/lang/Class.java @@ -35,9 +35,7 @@ public final class Class implements Type, Serializable { */ @JsMethod @HasNoSideEffects - private static Class $get(Object obj, @JsOptional Double opt_dimensionCount) { - // TODO(b/79389970): Change the argument to Constructor. - Constructor ctor = JsUtils.uncheckedCast(obj); + private static Class $get(Constructor ctor, @JsOptional Double opt_dimensionCount) { int dimensionCount = JsUtils.coerceToInt(opt_dimensionCount); return ctor.cache("$$class/" + dimensionCount, () -> new Class(ctor, dimensionCount)); } diff --git a/jre/java/javaemul/internal/Casts.native.js b/jre/java/javaemul/internal/Casts.native.js index 11a1a198ec..643f13707a 100644 --- a/jre/java/javaemul/internal/Casts.native.js +++ b/jre/java/javaemul/internal/Casts.native.js @@ -1,11 +1,10 @@ /** - * // TODO(b/79389970): change castType to Function. * @param {*} instance - * @param {Object} castType + * @param {!Constructor} castType * @return {*} */ $Casts.$to = function(instance, castType) { return $Casts.$toInternal( - instance, /** @type {function(*):boolean} */ (castType.$isInstance), - /** @type {Constructor} */ (castType)); + instance, /** @type {function(*):boolean} */ + (/** @type {?} */ (castType).$isInstance), castType); }; diff --git a/jre/java/javaemul/internal/nativebootstrap/Util.impl.java.js b/jre/java/javaemul/internal/nativebootstrap/Util.impl.java.js index f1a34096fa..2fb5ec7f64 100644 --- a/jre/java/javaemul/internal/nativebootstrap/Util.impl.java.js +++ b/jre/java/javaemul/internal/nativebootstrap/Util.impl.java.js @@ -50,8 +50,7 @@ class Util { } /** - * // TODO(b/79389970): change ctor to Function - * @param {Object} ctor + * @param {!Constructor} ctor * @param {string} name * @public */ diff --git a/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/KotlinThrowsInJsFunction.stacktrace_j2cl.txt b/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/KotlinThrowsInJsFunction.stacktrace_j2cl.txt index 5326b6aeab..5f57c5b67a 100644 --- a/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/KotlinThrowsInJsFunction.stacktrace_j2cl.txt +++ b/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/KotlinThrowsInJsFunction.stacktrace_j2cl.txt @@ -1,6 +1,6 @@ java.lang.RuntimeException: __the_message__! at com.google.j2cl.junit.integration.stacktrace.data.KotlinThrowsInJsFunction$MyFunctionImpl.run(KotlinThrowsInJsFunction.kt:50) - at lambda(jre/java/jre.js/javaemul/internal/nativebootstrap/Util.impl.java.js:208:31) + at lambda(jre/java/jre.js/javaemul/internal/nativebootstrap/Util.impl.java.js:207:31) at com.google.j2cl.junit.integration.stacktrace.data.KotlinThrowsInJsFunction.executesFunction(KotlinThrowsInJsFunction.kt:55) at com.google.j2cl.junit.integration.stacktrace.data.KotlinThrowsInJsFunction$1.run(KotlinThrowsInJsFunction.kt:41) at com.google.j2cl.junit.integration.stacktrace.data.KotlinThrowsInJsFunction.executesFunction(KotlinThrowsInJsFunction.kt:55) diff --git a/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/KotlinThrowsInJsFunction.stacktrace_j2cl_compiled.txt b/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/KotlinThrowsInJsFunction.stacktrace_j2cl_compiled.txt index afab079c82..74543b27c9 100644 --- a/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/KotlinThrowsInJsFunction.stacktrace_j2cl_compiled.txt +++ b/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/KotlinThrowsInJsFunction.stacktrace_j2cl_compiled.txt @@ -1,6 +1,6 @@ java.lang.RuntimeException: __the_message__! at com.google.j2cl.junit.integration.stacktrace.data.KotlinThrowsInJsFunction$MyFunctionImpl.run(KotlinThrowsInJsFunction.kt:50) - at apply(/jre/java/jre.js/javaemul/internal/nativebootstrap/Util.impl.java.js:208:31) + at apply(/jre/java/jre.js/javaemul/internal/nativebootstrap/Util.impl.java.js:207:31) at com.google.j2cl.junit.integration.stacktrace.data.KotlinThrowsInJsFunction.executesFunction(KotlinThrowsInJsFunction.kt:55) at com.google.j2cl.junit.integration.stacktrace.data.KotlinThrowsInJsFunction$1.run(KotlinThrowsInJsFunction.kt:41) at com.google.j2cl.junit.integration.stacktrace.data.KotlinThrowsInJsFunction.executesFunction(KotlinThrowsInJsFunction.kt:55) diff --git a/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/ThrowsInJsFunction.stacktrace_j2cl.txt b/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/ThrowsInJsFunction.stacktrace_j2cl.txt index 36d9a3f882..182dc204d7 100644 --- a/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/ThrowsInJsFunction.stacktrace_j2cl.txt +++ b/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/ThrowsInJsFunction.stacktrace_j2cl.txt @@ -1,6 +1,6 @@ java.lang.RuntimeException: __the_message__! at com.google.j2cl.junit.integration.stacktrace.data.ThrowsInJsFunction$MyFunctionImpl.run(ThrowsInJsFunction.java:55) - at lambda(jre/java/jre.js/javaemul/internal/nativebootstrap/Util.impl.java.js:208:31) + at lambda(jre/java/jre.js/javaemul/internal/nativebootstrap/Util.impl.java.js:207:31) at com.google.j2cl.junit.integration.stacktrace.data.ThrowsInJsFunction.executesFunction(ThrowsInJsFunction.java:60) at com.google.j2cl.junit.integration.stacktrace.data.ThrowsInJsFunction$1.run(ThrowsInJsFunction.java:46) at com.google.j2cl.junit.integration.stacktrace.data.ThrowsInJsFunction.executesFunction(ThrowsInJsFunction.java:60) diff --git a/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/ThrowsInJsFunction.stacktrace_j2cl_compiled.txt b/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/ThrowsInJsFunction.stacktrace_j2cl_compiled.txt index b5d14aab50..341ea1f8c3 100644 --- a/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/ThrowsInJsFunction.stacktrace_j2cl_compiled.txt +++ b/junit/generator/javatests/com/google/j2cl/junit/integration/stacktrace/data/ThrowsInJsFunction.stacktrace_j2cl_compiled.txt @@ -1,6 +1,6 @@ java.lang.RuntimeException: __the_message__! at com.google.j2cl.junit.integration.stacktrace.data.ThrowsInJsFunction$MyFunctionImpl.run(ThrowsInJsFunction.java:55) - at apply(/jre/java/jre.js/javaemul/internal/nativebootstrap/Util.impl.java.js:208:31) + at apply(/jre/java/jre.js/javaemul/internal/nativebootstrap/Util.impl.java.js:207:31) at com.google.j2cl.junit.integration.stacktrace.data.ThrowsInJsFunction.executesFunction(ThrowsInJsFunction.java:60) at com.google.j2cl.junit.integration.stacktrace.data.ThrowsInJsFunction$1.run(ThrowsInJsFunction.java:46) at com.google.j2cl.junit.integration.stacktrace.data.ThrowsInJsFunction.executesFunction(ThrowsInJsFunction.java:60) diff --git a/transpiler/java/com/google/j2cl/transpiler/backend/Backend.java b/transpiler/java/com/google/j2cl/transpiler/backend/Backend.java index 9962dc67b9..1cf54ea32e 100644 --- a/transpiler/java/com/google/j2cl/transpiler/backend/Backend.java +++ b/transpiler/java/com/google/j2cl/transpiler/backend/Backend.java @@ -28,6 +28,7 @@ import com.google.j2cl.transpiler.passes.AddDisambiguatingSuperMethodForwardingStubs; import com.google.j2cl.transpiler.passes.AddEntryPointBridgesWasm; import com.google.j2cl.transpiler.passes.AddEnumImplicitMethods; +import com.google.j2cl.transpiler.passes.AddInterfaceConstructorCasts; import com.google.j2cl.transpiler.passes.AddJavaLangObjectForwardingMethods; import com.google.j2cl.transpiler.passes.AddNothingReturnStatements; import com.google.j2cl.transpiler.passes.AddVisibilityMethodBridgesJ2kt; @@ -349,6 +350,7 @@ public ImmutableList> getPassFactories(BackendOption // variable motion. NormalizeMultiExpressions::new, RemoveUnneededJsDocCasts::new, + AddInterfaceConstructorCasts::new, NormalizeJsDocCastExpressions::new, NormalizeJsAwaitMethodInvocations::new, RemoveUnneededNotNullChecks::new, diff --git a/transpiler/java/com/google/j2cl/transpiler/passes/AddInterfaceConstructorCasts.java b/transpiler/java/com/google/j2cl/transpiler/passes/AddInterfaceConstructorCasts.java new file mode 100644 index 0000000000..a5c4490ab5 --- /dev/null +++ b/transpiler/java/com/google/j2cl/transpiler/passes/AddInterfaceConstructorCasts.java @@ -0,0 +1,46 @@ +/* + * Copyright 2024 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.j2cl.transpiler.passes; + +import com.google.j2cl.transpiler.ast.AbstractRewriter; +import com.google.j2cl.transpiler.ast.JavaScriptConstructorReference; +import com.google.j2cl.transpiler.ast.JsDocCastExpression; +import com.google.j2cl.transpiler.ast.Node; +import com.google.j2cl.transpiler.ast.Type; +import com.google.j2cl.transpiler.ast.TypeDescriptors; + +/** Adds jsdoc casts to workaround JsCompiler handling of interface constructor (b/79389970). */ +public final class AddInterfaceConstructorCasts extends NormalizationPass { + + @Override + public void applyTo(Type type) { + type.accept( + new AbstractRewriter() { + @Override + public Node rewriteJavaScriptConstructorReference( + JavaScriptConstructorReference constructorReference) { + if (!constructorReference.getReferencedTypeDeclaration().isInterface()) { + return constructorReference; + } + + return JsDocCastExpression.newBuilder() + .setCastTypeDescriptor(TypeDescriptors.get().nativeFunction) + .setExpression(constructorReference) + .build(); + } + }); + } +} diff --git a/transpiler/java/com/google/j2cl/transpiler/passes/ImplementInstanceOfs.java b/transpiler/java/com/google/j2cl/transpiler/passes/ImplementInstanceOfs.java index 04e4492c43..97a3b19c0b 100644 --- a/transpiler/java/com/google/j2cl/transpiler/passes/ImplementInstanceOfs.java +++ b/transpiler/java/com/google/j2cl/transpiler/passes/ImplementInstanceOfs.java @@ -27,7 +27,6 @@ import com.google.j2cl.transpiler.ast.FieldAccess; import com.google.j2cl.transpiler.ast.InstanceOfExpression; import com.google.j2cl.transpiler.ast.JavaScriptConstructorReference; -import com.google.j2cl.transpiler.ast.JsDocCastExpression; import com.google.j2cl.transpiler.ast.Method; import com.google.j2cl.transpiler.ast.MethodCall; import com.google.j2cl.transpiler.ast.MethodDescriptor; @@ -72,12 +71,7 @@ private static void synthesizeMarkImplementorCalls(Type type) { // Type.$markImplementor(Type); type.addLoadTimeStatement( createMarkImplementorCall( - type.getTypeDescriptor(), - // TODO(b/79389970): remove cast after b/79389970 is handled in Closure. - JsDocCastExpression.newBuilder() - .setCastTypeDescriptor(TypeDescriptors.get().nativeFunction) - .setExpression(new JavaScriptConstructorReference(type.getDeclaration())) - .build())); + type.getTypeDescriptor(), new JavaScriptConstructorReference(type.getDeclaration()))); } else { // Call markImplementor on all interfaces that are directly implemented by the class to // implement the support instanceOf Interface. diff --git a/transpiler/javatests/com/google/j2cl/readable/java/abstractinnerclass/output_closure/InnerClasses$A.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/abstractinnerclass/output_closure/InnerClasses$A.impl.java.js.txt index 7616e9cd2d..6da3d435c0 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/abstractinnerclass/output_closure/InnerClasses$A.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/abstractinnerclass/output_closure/InnerClasses$A.impl.java.js.txt @@ -35,7 +35,7 @@ class A { } } A.$markImplementor(/**@type {Function}*/ (A)); -$Util.$setClassMetadataForInterface(A, 'abstractinnerclass.InnerClasses$A'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (A), 'abstractinnerclass.InnerClasses$A'); exports = A; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/abstractinterfaceimpl/output_closure/MyInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/abstractinterfaceimpl/output_closure/MyInterface.impl.java.js.txt index d031330079..f45473b7cb 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/abstractinterfaceimpl/output_closure/MyInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/abstractinterfaceimpl/output_closure/MyInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class MyInterface { } } MyInterface.$markImplementor(/**@type {Function}*/ (MyInterface)); -$Util.$setClassMetadataForInterface(MyInterface, 'abstractinterfaceimpl.MyInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (MyInterface), 'abstractinterfaceimpl.MyInterface'); exports = MyInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/abstractmethodoverridedefault/output_closure/AbstractMethodOverrideDefault$I.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/abstractmethodoverridedefault/output_closure/AbstractMethodOverrideDefault$I.impl.java.js.txt index 367267a08f..558ca20f94 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/abstractmethodoverridedefault/output_closure/AbstractMethodOverrideDefault$I.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/abstractmethodoverridedefault/output_closure/AbstractMethodOverrideDefault$I.impl.java.js.txt @@ -41,7 +41,7 @@ class I { } } I.$markImplementor(/**@type {Function}*/ (I)); -$Util.$setClassMetadataForInterface(I, 'abstractmethodoverridedefault.AbstractMethodOverrideDefault$I'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (I), 'abstractmethodoverridedefault.AbstractMethodOverrideDefault$I'); exports = I; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/abstractmethodoverridedefault/output_closure/AbstractMethodOverrideDefault$J.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/abstractmethodoverridedefault/output_closure/AbstractMethodOverrideDefault$J.impl.java.js.txt index ed965515a9..8da753100d 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/abstractmethodoverridedefault/output_closure/AbstractMethodOverrideDefault$J.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/abstractmethodoverridedefault/output_closure/AbstractMethodOverrideDefault$J.impl.java.js.txt @@ -41,7 +41,7 @@ class J { } } J.$markImplementor(/**@type {Function}*/ (J)); -$Util.$setClassMetadataForInterface(J, 'abstractmethodoverridedefault.AbstractMethodOverrideDefault$J'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (J), 'abstractmethodoverridedefault.AbstractMethodOverrideDefault$J'); exports = J; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/accidentaloverride/output_closure/SuperInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/accidentaloverride/output_closure/SuperInterface.impl.java.js.txt index f1005abcc9..6485d5fc14 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/accidentaloverride/output_closure/SuperInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/accidentaloverride/output_closure/SuperInterface.impl.java.js.txt @@ -29,7 +29,7 @@ class SuperInterface { static $loadModules() {} } SuperInterface.$markImplementor(/**@type {Function}*/ (SuperInterface)); -$Util.$setClassMetadataForInterface(SuperInterface, 'accidentaloverride.SuperInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (SuperInterface), 'accidentaloverride.SuperInterface'); exports = SuperInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/annotation/output_closure/Main$Foo.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/annotation/output_closure/Main$Foo.impl.java.js.txt index 64ff66c0b6..a2537e52e9 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/annotation/output_closure/Main$Foo.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/annotation/output_closure/Main$Foo.impl.java.js.txt @@ -31,7 +31,7 @@ class Foo { /**@const {number} @nodts*/ Foo.f_CONSTANT__annotation_Main_Foo = 123; Foo.$markImplementor(/**@type {Function}*/ (Foo)); -$Util.$setClassMetadataForInterface(Foo, 'annotation.Main$Foo'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Foo), 'annotation.Main$Foo'); exports = Foo; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/annotation/output_closure/Main$Zoo.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/annotation/output_closure/Main$Zoo.impl.java.js.txt index 9624292edf..d6595cccab 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/annotation/output_closure/Main$Zoo.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/annotation/output_closure/Main$Zoo.impl.java.js.txt @@ -27,7 +27,7 @@ class Zoo { static $loadModules() {} } Zoo.$markImplementor(/**@type {Function}*/ (Zoo)); -$Util.$setClassMetadataForInterface(Zoo, 'annotation.Main$Zoo'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Zoo), 'annotation.Main$Zoo'); exports = Zoo; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/anonymousclass/output_closure/SomeInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/anonymousclass/output_closure/SomeInterface.impl.java.js.txt index fe5971a5e4..81d9ad9ce0 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/anonymousclass/output_closure/SomeInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/anonymousclass/output_closure/SomeInterface.impl.java.js.txt @@ -36,7 +36,7 @@ class SomeInterface { /**@private {SomeClass} @nodts*/ SomeInterface.$static_implicitlyStatic__anonymousclass_SomeInterface; SomeInterface.$markImplementor(/**@type {Function}*/ (SomeInterface)); -$Util.$setClassMetadataForInterface(SomeInterface, 'anonymousclass.SomeInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (SomeInterface), 'anonymousclass.SomeInterface'); exports = SomeInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$G.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$G.impl.java.js.txt index 20f3980469..da035c6603 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$G.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$G.impl.java.js.txt @@ -36,7 +36,7 @@ class G { } } G.$markImplementor(/**@type {Function}*/ (G)); -$Util.$setClassMetadataForInterface(G, 'bridgejsmethod.Main$G'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (G), 'bridgejsmethod.Main$G'); exports = G; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$I.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$I.impl.java.js.txt index bf3ba6211b..cff507a127 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$I.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$I.impl.java.js.txt @@ -37,7 +37,7 @@ class I { } } I.$markImplementor(/**@type {Function}*/ (I)); -$Util.$setClassMetadataForInterface(I, 'bridgejsmethod.Main$I'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (I), 'bridgejsmethod.Main$I'); exports = I; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$J.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$J.impl.java.js.txt index 3ef6837a78..cc78631529 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$J.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$J.impl.java.js.txt @@ -36,7 +36,7 @@ class J { } } J.$markImplementor(/**@type {Function}*/ (J)); -$Util.$setClassMetadataForInterface(J, 'bridgejsmethod.Main$J'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (J), 'bridgejsmethod.Main$J'); exports = J; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$M.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$M.impl.java.js.txt index 4f9a3e14f5..d2f2579a15 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$M.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$M.impl.java.js.txt @@ -36,7 +36,7 @@ class M { } } M.$markImplementor(/**@type {Function}*/ (M)); -$Util.$setClassMetadataForInterface(M, 'bridgejsmethod.Main$M'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (M), 'bridgejsmethod.Main$M'); exports = M; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$P.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$P.impl.java.js.txt index 2c0477ec49..9c2d191597 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$P.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgejsmethod/output_closure/Main$P.impl.java.js.txt @@ -35,7 +35,7 @@ class P { } } P.$markImplementor(/**@type {Function}*/ (P)); -$Util.$setClassMetadataForInterface(P, 'bridgejsmethod.Main$P'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (P), 'bridgejsmethod.Main$P'); exports = P; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodDefault$I.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodDefault$I.impl.java.js.txt index acb6a5122e..0f055736ef 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodDefault$I.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodDefault$I.impl.java.js.txt @@ -36,7 +36,7 @@ class I { } } I.$markImplementor(/**@type {Function}*/ (I)); -$Util.$setClassMetadataForInterface(I, 'bridgemethods.BridgeMethodDefault$I'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (I), 'bridgemethods.BridgeMethodDefault$I'); exports = I; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodDefault$II.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodDefault$II.impl.java.js.txt index ac7f24642a..e3926026de 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodDefault$II.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodDefault$II.impl.java.js.txt @@ -33,7 +33,7 @@ class II { static $loadModules() {} } II.$markImplementor(/**@type {Function}*/ (II)); -$Util.$setClassMetadataForInterface(II, 'bridgemethods.BridgeMethodDefault$II'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (II), 'bridgemethods.BridgeMethodDefault$II'); exports = II; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodDefault$JJ.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodDefault$JJ.impl.java.js.txt index 8b895d2a12..02ff8cbac7 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodDefault$JJ.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodDefault$JJ.impl.java.js.txt @@ -33,7 +33,7 @@ class JJ { static $loadModules() {} } JJ.$markImplementor(/**@type {Function}*/ (JJ)); -$Util.$setClassMetadataForInterface(JJ, 'bridgemethods.BridgeMethodDefault$JJ'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (JJ), 'bridgemethods.BridgeMethodDefault$JJ'); exports = JJ; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodShadowedSignature$I.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodShadowedSignature$I.impl.java.js.txt index 2bfa27116c..f6eaf1692e 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodShadowedSignature$I.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/BridgeMethodShadowedSignature$I.impl.java.js.txt @@ -37,7 +37,7 @@ class I { } } I.$markImplementor(/**@type {Function}*/ (I)); -$Util.$setClassMetadataForInterface(I, 'bridgemethods.BridgeMethodShadowedSignature$I'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (I), 'bridgemethods.BridgeMethodShadowedSignature$I'); exports = I; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/Getter.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/Getter.impl.java.js.txt index 4c7d0ba404..40c603b557 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/Getter.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/Getter.impl.java.js.txt @@ -35,7 +35,7 @@ class Getter { } } Getter.$markImplementor(/**@type {Function}*/ (Getter)); -$Util.$setClassMetadataForInterface(Getter, 'bridgemethods.Getter'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Getter), 'bridgemethods.Getter'); exports = Getter; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/I.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/I.impl.java.js.txt index 916f64eec4..592f78b56e 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/I.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/I.impl.java.js.txt @@ -36,7 +36,7 @@ class I { } } I.$markImplementor(/**@type {Function}*/ (I)); -$Util.$setClassMetadataForInterface(I, 'bridgemethods.I'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (I), 'bridgemethods.I'); exports = I; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/InterfaceOverridingDefaultMethod.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/InterfaceOverridingDefaultMethod.impl.java.js.txt index 7b57fdfc0e..ff9ee92c34 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/InterfaceOverridingDefaultMethod.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/InterfaceOverridingDefaultMethod.impl.java.js.txt @@ -39,7 +39,7 @@ class InterfaceOverridingDefaultMethod { } } InterfaceOverridingDefaultMethod.$markImplementor(/**@type {Function}*/ (InterfaceOverridingDefaultMethod)); -$Util.$setClassMetadataForInterface(InterfaceOverridingDefaultMethod, 'bridgemethods.InterfaceOverridingDefaultMethod'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (InterfaceOverridingDefaultMethod), 'bridgemethods.InterfaceOverridingDefaultMethod'); exports = InterfaceOverridingDefaultMethod; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/InterfaceWithDefaultMethod.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/InterfaceWithDefaultMethod.impl.java.js.txt index b12de6660a..fe21c66dd3 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/InterfaceWithDefaultMethod.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/InterfaceWithDefaultMethod.impl.java.js.txt @@ -31,7 +31,7 @@ class InterfaceWithDefaultMethod { static $loadModules() {} } InterfaceWithDefaultMethod.$markImplementor(/**@type {Function}*/ (InterfaceWithDefaultMethod)); -$Util.$setClassMetadataForInterface(InterfaceWithDefaultMethod, 'bridgemethods.InterfaceWithDefaultMethod'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (InterfaceWithDefaultMethod), 'bridgemethods.InterfaceWithDefaultMethod'); exports = InterfaceWithDefaultMethod; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/J2ktIncompatible.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/J2ktIncompatible.impl.java.js.txt index 75023f2183..86b38d6461 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/J2ktIncompatible.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/J2ktIncompatible.impl.java.js.txt @@ -27,7 +27,7 @@ class J2ktIncompatible { static $loadModules() {} } J2ktIncompatible.$markImplementor(/**@type {Function}*/ (J2ktIncompatible)); -$Util.$setClassMetadataForInterface(J2ktIncompatible, 'bridgemethods.J2ktIncompatible'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (J2ktIncompatible), 'bridgemethods.J2ktIncompatible'); exports = J2ktIncompatible; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/Map.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/Map.impl.java.js.txt index 9f7bf2b269..6b4b076af3 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/Map.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/Map.impl.java.js.txt @@ -36,7 +36,7 @@ class Map { } } Map.$markImplementor(/**@type {Function}*/ (Map)); -$Util.$setClassMetadataForInterface(Map, 'bridgemethods.Map'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Map), 'bridgemethods.Map'); exports = Map; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SomeInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SomeInterface.impl.java.js.txt index cd039122d0..34af6d7b92 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SomeInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SomeInterface.impl.java.js.txt @@ -31,7 +31,7 @@ class SomeInterface { static $loadModules() {} } SomeInterface.$markImplementor(/**@type {Function}*/ (SomeInterface)); -$Util.$setClassMetadataForInterface(SomeInterface, 'bridgemethods.SomeInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (SomeInterface), 'bridgemethods.SomeInterface'); exports = SomeInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SomeOtherFooInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SomeOtherFooInterface.impl.java.js.txt index dca962f796..85cd61e4ea 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SomeOtherFooInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SomeOtherFooInterface.impl.java.js.txt @@ -36,7 +36,7 @@ class SomeOtherFooInterface { } } SomeOtherFooInterface.$markImplementor(/**@type {Function}*/ (SomeOtherFooInterface)); -$Util.$setClassMetadataForInterface(SomeOtherFooInterface, 'bridgemethods.SomeOtherFooInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (SomeOtherFooInterface), 'bridgemethods.SomeOtherFooInterface'); exports = SomeOtherFooInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SpecializedInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SpecializedInterface.impl.java.js.txt index 449b54f1fc..fca20f9f79 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SpecializedInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SpecializedInterface.impl.java.js.txt @@ -28,7 +28,7 @@ class SpecializedInterface { static $loadModules() {} } SpecializedInterface.$markImplementor(/**@type {Function}*/ (SpecializedInterface)); -$Util.$setClassMetadataForInterface(SpecializedInterface, 'bridgemethods.SpecializedInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (SpecializedInterface), 'bridgemethods.SpecializedInterface'); exports = SpecializedInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SpecializingReturnInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SpecializingReturnInterface.impl.java.js.txt index a549bf1509..567b3bedcd 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SpecializingReturnInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/SpecializingReturnInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class SpecializingReturnInterface { } } SpecializingReturnInterface.$markImplementor(/**@type {Function}*/ (SpecializingReturnInterface)); -$Util.$setClassMetadataForInterface(SpecializingReturnInterface, 'bridgemethods.SpecializingReturnInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (SpecializingReturnInterface), 'bridgemethods.SpecializingReturnInterface'); exports = SpecializingReturnInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/StringConsumer.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/StringConsumer.impl.java.js.txt index a6fc9eeaf0..56d218ef2a 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/StringConsumer.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/StringConsumer.impl.java.js.txt @@ -35,7 +35,7 @@ class StringConsumer { } } StringConsumer.$markImplementor(/**@type {Function}*/ (StringConsumer)); -$Util.$setClassMetadataForInterface(StringConsumer, 'bridgemethods.StringConsumer'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (StringConsumer), 'bridgemethods.StringConsumer'); exports = StringConsumer; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase10036$BI1.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase10036$BI1.impl.java.js.txt index 3b3fe30922..d7a3eb9505 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase10036$BI1.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase10036$BI1.impl.java.js.txt @@ -39,7 +39,7 @@ class BI1 { } } BI1.$markImplementor(/**@type {Function}*/ (BI1)); -$Util.$setClassMetadataForInterface(BI1, 'bridgemethods.TestCase10036$BI1'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (BI1), 'bridgemethods.TestCase10036$BI1'); exports = BI1; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase10036$BI2.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase10036$BI2.impl.java.js.txt index 33d5c648b0..3f08408775 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase10036$BI2.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase10036$BI2.impl.java.js.txt @@ -35,7 +35,7 @@ class BI2 { } } BI2.$markImplementor(/**@type {Function}*/ (BI2)); -$Util.$setClassMetadataForInterface(BI2, 'bridgemethods.TestCase10036$BI2'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (BI2), 'bridgemethods.TestCase10036$BI2'); exports = BI2; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase10036$BI3.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase10036$BI3.impl.java.js.txt index 50a4b46b14..8e8396a6e1 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase10036$BI3.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase10036$BI3.impl.java.js.txt @@ -31,7 +31,7 @@ class BI3 { static $loadModules() {} } BI3.$markImplementor(/**@type {Function}*/ (BI3)); -$Util.$setClassMetadataForInterface(BI3, 'bridgemethods.TestCase10036$BI3'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (BI3), 'bridgemethods.TestCase10036$BI3'); exports = BI3; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase102$BI1.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase102$BI1.impl.java.js.txt index 5c8c452cd3..0a828bf516 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase102$BI1.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase102$BI1.impl.java.js.txt @@ -35,7 +35,7 @@ class BI1 { } } BI1.$markImplementor(/**@type {Function}*/ (BI1)); -$Util.$setClassMetadataForInterface(BI1, 'bridgemethods.TestCase102$BI1'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (BI1), 'bridgemethods.TestCase102$BI1'); exports = BI1; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase102$BI2.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase102$BI2.impl.java.js.txt index 48b07ce779..95d155d15f 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase102$BI2.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/bridgemethods/output_closure/TestCase102$BI2.impl.java.js.txt @@ -35,7 +35,7 @@ class BI2 { } } BI2.$markImplementor(/**@type {Function}*/ (BI2)); -$Util.$setClassMetadataForInterface(BI2, 'bridgemethods.TestCase102$BI2'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (BI2), 'bridgemethods.TestCase102$BI2'); exports = BI2; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$A.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$A.impl.java.js.txt index ef437530e1..9109ad2701 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$A.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$A.impl.java.js.txt @@ -35,7 +35,7 @@ class A { } } A.$markImplementor(/**@type {Function}*/ (A)); -$Util.$setClassMetadataForInterface(A, 'cast.CastGenerics$A'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (A), 'cast.CastGenerics$A'); exports = A; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$B.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$B.impl.java.js.txt index 817e0b7617..c549453591 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$B.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$B.impl.java.js.txt @@ -35,7 +35,7 @@ class B { } } B.$markImplementor(/**@type {Function}*/ (B)); -$Util.$setClassMetadataForInterface(B, 'cast.CastGenerics$B'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (B), 'cast.CastGenerics$B'); exports = B; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$Empty1.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$Empty1.impl.java.js.txt index 9990a62c17..744b780759 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$Empty1.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$Empty1.impl.java.js.txt @@ -24,7 +24,7 @@ class Empty1 { static $loadModules() {} } Empty1.$markImplementor(/**@type {Function}*/ (Empty1)); -$Util.$setClassMetadataForInterface(Empty1, 'cast.CastGenerics$Empty1'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Empty1), 'cast.CastGenerics$Empty1'); exports = Empty1; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$Empty2.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$Empty2.impl.java.js.txt index 52b979e579..f57d38e407 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$Empty2.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics$Empty2.impl.java.js.txt @@ -25,7 +25,7 @@ class Empty2 { static $loadModules() {} } Empty2.$markImplementor(/**@type {Function}*/ (Empty2)); -$Util.$setClassMetadataForInterface(Empty2, 'cast.CastGenerics$Empty2'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Empty2), 'cast.CastGenerics$Empty2'); exports = Empty2; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics.impl.java.js.txt index 19f790f121..3d5c3623ce 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/CastGenerics.impl.java.js.txt @@ -51,23 +51,23 @@ class CastGenerics extends j_l_Object { let str = /**@type {?string}*/ ($Casts.$to(/**@type {!CastGenerics}*/ (CastGenerics.$create__()).f_field__cast_CastGenerics, j_l_String)); str = /**@type {?string}*/ ($Casts.$to(/**@type {!CastGenerics}*/ (CastGenerics.$create__()).m_method__java_lang_Object_$pp_cast(), j_l_String)); let containerT = null; - /**@type {!A}*/ ($Casts.$to(containerT.m_get__java_lang_Object_$pp_cast(), A)).m_mA__void(); - /**@type {!B}*/ ($Casts.$to(containerT.m_get__java_lang_Object_$pp_cast(), B)).m_mB__void(); + /**@type {!A}*/ ($Casts.$to(containerT.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (A))).m_mA__void(); + /**@type {!B}*/ ($Casts.$to(containerT.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (B))).m_mB__void(); let containerU = null; - /**@type {!A}*/ ($Casts.$to(containerU.m_get__java_lang_Object_$pp_cast(), A)).m_mA__void(); - /**@type {!B}*/ ($Casts.$to(containerU.m_get__java_lang_Object_$pp_cast(), B)).m_mB__void(); + /**@type {!A}*/ ($Casts.$to(containerU.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (A))).m_mA__void(); + /**@type {!B}*/ ($Casts.$to(containerU.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (B))).m_mB__void(); let containerArrT = null; - let arrT = /**@type {Array}*/ ($Arrays.$castTo(containerArrT.m_get__java_lang_Object_$pp_cast(), A, 1)); + let arrT = /**@type {Array}*/ ($Arrays.$castTo(containerArrT.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (A), 1)); /**@type {!A}*/ (arrT[0]).m_mA__void(); - /**@type {!B}*/ ($Casts.$to(arrT[0], B)).m_mB__void(); - let arrA = /**@type {Array}*/ ($Arrays.$castTo(containerArrT.m_get__java_lang_Object_$pp_cast(), A, 1)); - let arrB = /**@type {Array}*/ ($Arrays.$castTo(containerArrT.m_get__java_lang_Object_$pp_cast(), B, 1)); + /**@type {!B}*/ ($Casts.$to(arrT[0], /**@type {Function}*/ (B))).m_mB__void(); + let arrA = /**@type {Array}*/ ($Arrays.$castTo(containerArrT.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (A), 1)); + let arrB = /**@type {Array}*/ ($Arrays.$castTo(containerArrT.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (B), 1)); let containerArrU = null; - let arrU = /**@type {Array}*/ ($Arrays.$castTo(containerArrU.m_get__java_lang_Object_$pp_cast(), A, 1)); + let arrU = /**@type {Array}*/ ($Arrays.$castTo(containerArrU.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (A), 1)); /**@type {!A}*/ (arrU[0]).m_mA__void(); - /**@type {!B}*/ ($Casts.$to(arrU[0], B)).m_mB__void(); - arrA = /**@type {Array}*/ ($Arrays.$castTo(containerArrU.m_get__java_lang_Object_$pp_cast(), A, 1)); - arrB = /**@type {Array}*/ ($Arrays.$castTo(containerArrU.m_get__java_lang_Object_$pp_cast(), B, 1)); + /**@type {!B}*/ ($Casts.$to(arrU[0], /**@type {Function}*/ (B))).m_mB__void(); + arrA = /**@type {Array}*/ ($Arrays.$castTo(containerArrU.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (A), 1)); + arrB = /**@type {Array}*/ ($Arrays.$castTo(containerArrU.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (B), 1)); let containerBase = null; /**@type {BaseImplementor}*/ ($Casts.$to(containerBase.m_get__java_lang_Object_$pp_cast(), BaseImplementor)).m_mA__void(); /**@type {BaseImplementor}*/ ($Casts.$to(containerBase.m_get__java_lang_Object_$pp_cast(), BaseImplementor)).m_mB__void(); @@ -75,11 +75,11 @@ class CastGenerics extends j_l_Object { /**@type {Implementor}*/ ($Casts.$to(containerImplementor.m_get__java_lang_Object_$pp_cast(), Implementor)).m_mA__void(); /**@type {Implementor}*/ ($Casts.$to(containerImplementor.m_get__java_lang_Object_$pp_cast(), Implementor)).m_mB__void(); let strictlyA = null; - let oA = /**@type {A}*/ ($Casts.$to(strictlyA.m_get__java_lang_Object_$pp_cast(), A)); - let a = /**@type {A}*/ ($Casts.$to(strictlyA.m_get__java_lang_Object_$pp_cast(), A)); + let oA = /**@type {A}*/ ($Casts.$to(strictlyA.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (A))); + let a = /**@type {A}*/ ($Casts.$to(strictlyA.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (A))); let extendsA = null; oA = extendsA.m_get__java_lang_Object_$pp_cast(); - a = /**@type {A}*/ ($Casts.$to(extendsA.m_get__java_lang_Object_$pp_cast(), A)); + a = /**@type {A}*/ ($Casts.$to(extendsA.m_get__java_lang_Object_$pp_cast(), /**@type {Function}*/ (A))); let superA = null; oA = superA.m_get__java_lang_Object_$pp_cast(); let strictlyString = null; @@ -123,7 +123,7 @@ class CastGenerics extends j_l_Object { /** @nodts @template EE @return {EE} */ m_method__java_lang_Object__cast_CastGenerics_Empty1(/** * */ o) { if (Empty1.$isInstance(o)) { - return /**@type {EE}*/ ($Casts.$to($Casts.$to(o, Empty1), Empty2)); + return /**@type {EE}*/ ($Casts.$to($Casts.$to(o, /**@type {Function}*/ (Empty1)), /**@type {Function}*/ (Empty2))); } return null; } diff --git a/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/Casts.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/Casts.impl.java.js.txt index ff14f111e6..0f4d0ec015 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/Casts.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/cast/output_closure/Casts.impl.java.js.txt @@ -41,7 +41,7 @@ class Casts extends j_l_Object { /** @nodts */ m_testCasToInterface__void() { let o = j_l_Object.$create__(); - let s = /**@type {(Serializable|Array)}*/ ($Casts.$to(o, Serializable)); + let s = /**@type {(Serializable|Array)}*/ ($Casts.$to(o, /**@type {Function}*/ (Serializable))); } /** @nodts */ m_testCastToBoxedType__void() { diff --git a/transpiler/javatests/com/google/j2cl/readable/java/deprecated/output_closure/DeprecatedExample$DeprecatedInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/deprecated/output_closure/DeprecatedExample$DeprecatedInterface.impl.java.js.txt index d6cd6e46ee..3456de1bbd 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/deprecated/output_closure/DeprecatedExample$DeprecatedInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/deprecated/output_closure/DeprecatedExample$DeprecatedInterface.impl.java.js.txt @@ -36,7 +36,7 @@ class DeprecatedInterface { } } DeprecatedInterface.$markImplementor(/**@type {Function}*/ (DeprecatedInterface)); -$Util.$setClassMetadataForInterface(DeprecatedInterface, 'deprecated.DeprecatedExample$DeprecatedInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (DeprecatedInterface), 'deprecated.DeprecatedExample$DeprecatedInterface'); exports = DeprecatedInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/emptyinterface/output_closure/EmptyInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/emptyinterface/output_closure/EmptyInterface.impl.java.js.txt index 535f7c1d06..8801d10e53 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/emptyinterface/output_closure/EmptyInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/emptyinterface/output_closure/EmptyInterface.impl.java.js.txt @@ -24,7 +24,7 @@ class EmptyInterface { static $loadModules() {} } EmptyInterface.$markImplementor(/**@type {Function}*/ (EmptyInterface)); -$Util.$setClassMetadataForInterface(EmptyInterface, 'emptyinterface.EmptyInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (EmptyInterface), 'emptyinterface.EmptyInterface'); exports = EmptyInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/equalsandhashcodeininterface/output_closure/BothInInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/equalsandhashcodeininterface/output_closure/BothInInterface.impl.java.js.txt index c133e39d9d..51d50f9697 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/equalsandhashcodeininterface/output_closure/BothInInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/equalsandhashcodeininterface/output_closure/BothInInterface.impl.java.js.txt @@ -28,7 +28,7 @@ class BothInInterface { static $loadModules() {} } BothInInterface.$markImplementor(/**@type {Function}*/ (BothInInterface)); -$Util.$setClassMetadataForInterface(BothInInterface, 'equalsandhashcodeininterface.BothInInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (BothInInterface), 'equalsandhashcodeininterface.BothInInterface'); exports = BothInInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/equalsandhashcodeininterface/output_closure/NeitherInInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/equalsandhashcodeininterface/output_closure/NeitherInInterface.impl.java.js.txt index c4514765e3..ee75b5bc6f 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/equalsandhashcodeininterface/output_closure/NeitherInInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/equalsandhashcodeininterface/output_closure/NeitherInInterface.impl.java.js.txt @@ -24,7 +24,7 @@ class NeitherInInterface { static $loadModules() {} } NeitherInInterface.$markImplementor(/**@type {Function}*/ (NeitherInInterface)); -$Util.$setClassMetadataForInterface(NeitherInInterface, 'equalsandhashcodeininterface.NeitherInInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NeitherInInterface), 'equalsandhashcodeininterface.NeitherInInterface'); exports = NeitherInInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/foreachstatement/output_closure/ForEachStatement$StringIterable.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/foreachstatement/output_closure/ForEachStatement$StringIterable.impl.java.js.txt index 1475437bcf..d14636504d 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/foreachstatement/output_closure/ForEachStatement$StringIterable.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/foreachstatement/output_closure/ForEachStatement$StringIterable.impl.java.js.txt @@ -40,7 +40,7 @@ class StringIterable { } } StringIterable.$markImplementor(/**@type {Function}*/ (StringIterable)); -$Util.$setClassMetadataForInterface(StringIterable, 'foreachstatement.ForEachStatement$StringIterable'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (StringIterable), 'foreachstatement.ForEachStatement$StringIterable'); exports = StringIterable; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/foreachstatement/output_closure/ForEachStatement$StringIterator.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/foreachstatement/output_closure/ForEachStatement$StringIterator.impl.java.js.txt index e04ff65290..4cb07acc92 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/foreachstatement/output_closure/ForEachStatement$StringIterator.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/foreachstatement/output_closure/ForEachStatement$StringIterator.impl.java.js.txt @@ -28,7 +28,7 @@ class StringIterator { static $loadModules() {} } StringIterator.$markImplementor(/**@type {Function}*/ (StringIterator)); -$Util.$setClassMetadataForInterface(StringIterator, 'foreachstatement.ForEachStatement$StringIterator'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (StringIterator), 'foreachstatement.ForEachStatement$StringIterator'); exports = StringIterator; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/foreachstatement/output_closure/ForEachStatement.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/foreachstatement/output_closure/ForEachStatement.impl.java.js.txt index 1d31195380..aba1aa9739 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/foreachstatement/output_closure/ForEachStatement.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/foreachstatement/output_closure/ForEachStatement.impl.java.js.txt @@ -60,12 +60,12 @@ class ForEachStatement extends j_l_Object { let __$exc = $Exceptions.toJava(__$jsexc); if (Exception1.$isInstance(__$exc) || Exception2.$isInstance(__$exc)) { let e = /**@type {(Exception1|Exception2)}*/ (__$exc); - for (let $iterator = /**@type {Iterable<(Number|number)>}*/ ($Casts.$to(e, Iterable)).m_iterator__java_util_Iterator(); $iterator.m_hasNext__boolean(); ) { + for (let $iterator = /**@type {Iterable<(Number|number)>}*/ ($Casts.$to(e, /**@type {Function}*/ (Iterable))).m_iterator__java_util_Iterator(); $iterator.m_hasNext__boolean(); ) { let o = /**@type {(Number|number)}*/ ($Casts.$to($iterator.m_next__java_lang_Object(), Number)); } } else if (Exception3.$isInstance(__$exc) || Exception4.$isInstance(__$exc)) { let e_1 = /**@type {(Exception3|Exception4)}*/ (__$exc); - for (let $iterator_1 = /**@type {Iterable<*>}*/ ($Casts.$to(e_1, Iterable)).m_iterator__java_util_Iterator(); $iterator_1.m_hasNext__boolean(); ) { + for (let $iterator_1 = /**@type {Iterable<*>}*/ ($Casts.$to(e_1, /**@type {Function}*/ (Iterable))).m_iterator__java_util_Iterator(); $iterator_1.m_hasNext__boolean(); ) { let o_1 = $iterator_1.m_next__java_lang_Object(); } } else { @@ -78,7 +78,7 @@ class ForEachStatement extends j_l_Object { let __$exc_1 = $Exceptions.toJava(__$jsexc_1); if (Exception2.$isInstance(__$exc_1) || Exception3.$isInstance(__$exc_1)) { let e_2 = /**@type {(Exception2|Exception3)}*/ (__$exc_1); - for (let $iterator_2 = /**@type {Iterable}*/ ($Casts.$to(e_2, Iterable)).m_iterator__java_util_Iterator(); $iterator_2.m_hasNext__boolean(); ) { + for (let $iterator_2 = /**@type {Iterable}*/ ($Casts.$to(e_2, /**@type {Function}*/ (Iterable))).m_iterator__java_util_Iterator(); $iterator_2.m_hasNext__boolean(); ) { let o_2 = $Primitives.widenIntToLong(/**@type {Integer}*/ ($Casts.$to($iterator_2.m_next__java_lang_Object(), Integer)).m_intValue__int()); } } else { @@ -89,7 +89,7 @@ class ForEachStatement extends j_l_Object { /** @nodts @template T, U, V */ m_testTypeVariable__void_$p_foreachstatement_ForEachStatement() { let iterable = null; - for (let $iterator = /**@type {!Iterable}*/ ($Casts.$to(iterable, Iterable)).m_iterator__java_util_Iterator(); $iterator.m_hasNext__boolean(); ) { + for (let $iterator = /**@type {!Iterable}*/ ($Casts.$to(iterable, /**@type {Function}*/ (Iterable))).m_iterator__java_util_Iterator(); $iterator.m_hasNext__boolean(); ) { let s = /**@type {?string}*/ ($Casts.$to($iterator.m_next__java_lang_Object(), j_l_String)); } let anotherIterable = null; @@ -97,10 +97,10 @@ class ForEachStatement extends j_l_Object { let s_1 = /**@type {Integer}*/ ($Casts.$to(/**@type {!Iterator}*/ ($iterator_1).m_next__java_lang_Object(), Integer)).m_intValue__int(); } let integerIterable = null; - for (let $iterator_2 = /**@type {!Iterable}*/ ($Casts.$to(integerIterable, Iterable)).m_iterator__java_util_Iterator(); $iterator_2.m_hasNext__boolean(); ) { + for (let $iterator_2 = /**@type {!Iterable}*/ ($Casts.$to(integerIterable, /**@type {Function}*/ (Iterable))).m_iterator__java_util_Iterator(); $iterator_2.m_hasNext__boolean(); ) { let i = /**@type {Integer}*/ ($Casts.$to($iterator_2.m_next__java_lang_Object(), Integer)).m_intValue__int(); } - for (let $iterator_3 = /**@type {!Iterable}*/ ($Casts.$to(integerIterable, Iterable)).m_iterator__java_util_Iterator(); $iterator_3.m_hasNext__boolean(); ) { + for (let $iterator_3 = /**@type {!Iterable}*/ ($Casts.$to(integerIterable, /**@type {Function}*/ (Iterable))).m_iterator__java_util_Iterator(); $iterator_3.m_hasNext__boolean(); ) { let i_1 = $Primitives.widenIntToLong(/**@type {Integer}*/ ($Casts.$to($iterator_3.m_next__java_lang_Object(), Integer)).m_intValue__int()); } let charIterable = null; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$NonParametrized.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$NonParametrized.impl.java.js.txt index 59e9b1f402..8e9604c726 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$NonParametrized.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$NonParametrized.impl.java.js.txt @@ -35,7 +35,7 @@ class NonParametrized { } } NonParametrized.$markImplementor(/**@type {Function}*/ (NonParametrized)); -$Util.$setClassMetadataForInterface(NonParametrized, 'functionalinterface.FunctionalInterfaces$NonParametrized'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NonParametrized), 'functionalinterface.FunctionalInterfaces$NonParametrized'); exports = NonParametrized; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$Parametrized.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$Parametrized.impl.java.js.txt index cf008978ce..94d5a96cb7 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$Parametrized.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$Parametrized.impl.java.js.txt @@ -36,7 +36,7 @@ class Parametrized { } } Parametrized.$markImplementor(/**@type {Function}*/ (Parametrized)); -$Util.$setClassMetadataForInterface(Parametrized, 'functionalinterface.FunctionalInterfaces$Parametrized'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Parametrized), 'functionalinterface.FunctionalInterfaces$Parametrized'); exports = Parametrized; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$Specialized.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$Specialized.impl.java.js.txt index ff9bdb01ec..d157f0e234 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$Specialized.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$Specialized.impl.java.js.txt @@ -38,7 +38,7 @@ class Specialized { } } Specialized.$markImplementor(/**@type {Function}*/ (Specialized)); -$Util.$setClassMetadataForInterface(Specialized, 'functionalinterface.FunctionalInterfaces$Specialized'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Specialized), 'functionalinterface.FunctionalInterfaces$Specialized'); exports = Specialized; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithDefaultMethod.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithDefaultMethod.impl.java.js.txt index 5d791ce19b..3201c9c73e 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithDefaultMethod.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithDefaultMethod.impl.java.js.txt @@ -42,7 +42,7 @@ class WithDefaultMethod { } } WithDefaultMethod.$markImplementor(/**@type {Function}*/ (WithDefaultMethod)); -$Util.$setClassMetadataForInterface(WithDefaultMethod, 'functionalinterface.FunctionalInterfaces$WithDefaultMethod'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (WithDefaultMethod), 'functionalinterface.FunctionalInterfaces$WithDefaultMethod'); exports = WithDefaultMethod; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithKtProperty.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithKtProperty.impl.java.js.txt index 7117047122..bf32597efc 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithKtProperty.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithKtProperty.impl.java.js.txt @@ -35,7 +35,7 @@ class WithKtProperty { } } WithKtProperty.$markImplementor(/**@type {Function}*/ (WithKtProperty)); -$Util.$setClassMetadataForInterface(WithKtProperty, 'functionalinterface.FunctionalInterfaces$WithKtProperty'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (WithKtProperty), 'functionalinterface.FunctionalInterfaces$WithKtProperty'); exports = WithKtProperty; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithObjectMethods.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithObjectMethods.impl.java.js.txt index 26a479c9b2..efcc3169c4 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithObjectMethods.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithObjectMethods.impl.java.js.txt @@ -41,7 +41,7 @@ class WithObjectMethods { } } WithObjectMethods.$markImplementor(/**@type {Function}*/ (WithObjectMethods)); -$Util.$setClassMetadataForInterface(WithObjectMethods, 'functionalinterface.FunctionalInterfaces$WithObjectMethods'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (WithObjectMethods), 'functionalinterface.FunctionalInterfaces$WithObjectMethods'); exports = WithObjectMethods; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithParametrizedMethod.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithParametrizedMethod.impl.java.js.txt index 2f920ea9b6..b8c379ef09 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithParametrizedMethod.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/functionalinterface/output_closure/FunctionalInterfaces$WithParametrizedMethod.impl.java.js.txt @@ -35,7 +35,7 @@ class WithParametrizedMethod { } } WithParametrizedMethod.$markImplementor(/**@type {Function}*/ (WithParametrizedMethod)); -$Util.$setClassMetadataForInterface(WithParametrizedMethod, 'functionalinterface.FunctionalInterfaces$WithParametrizedMethod'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (WithParametrizedMethod), 'functionalinterface.FunctionalInterfaces$WithParametrizedMethod'); exports = WithParametrizedMethod; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/functiontype/output_closure/Function.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/functiontype/output_closure/Function.impl.java.js.txt index c74ab31fc4..56417aca94 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/functiontype/output_closure/Function.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/functiontype/output_closure/Function.impl.java.js.txt @@ -24,7 +24,7 @@ class functiontype_Function { static $loadModules() {} } functiontype_Function.$markImplementor(/**@type {Function}*/ (functiontype_Function)); -$Util.$setClassMetadataForInterface(functiontype_Function, 'functiontype.Function'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (functiontype_Function), 'functiontype.Function'); exports = functiontype_Function; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/genericanddefaultmethods/output_closure/InterfaceWithDefault.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/genericanddefaultmethods/output_closure/InterfaceWithDefault.impl.java.js.txt index 85d13fdad9..2ba4d08bbb 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/genericanddefaultmethods/output_closure/InterfaceWithDefault.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/genericanddefaultmethods/output_closure/InterfaceWithDefault.impl.java.js.txt @@ -35,7 +35,7 @@ class InterfaceWithDefault { } } InterfaceWithDefault.$markImplementor(/**@type {Function}*/ (InterfaceWithDefault)); -$Util.$setClassMetadataForInterface(InterfaceWithDefault, 'genericanddefaultmethods.InterfaceWithDefault'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (InterfaceWithDefault), 'genericanddefaultmethods.InterfaceWithDefault'); exports = InterfaceWithDefault; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/genericinterfaceabstractimpl/output_closure/MyInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/genericinterfaceabstractimpl/output_closure/MyInterface.impl.java.js.txt index d31dc24a61..73eb6404f3 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/genericinterfaceabstractimpl/output_closure/MyInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/genericinterfaceabstractimpl/output_closure/MyInterface.impl.java.js.txt @@ -29,7 +29,7 @@ class MyInterface { static $loadModules() {} } MyInterface.$markImplementor(/**@type {Function}*/ (MyInterface)); -$Util.$setClassMetadataForInterface(MyInterface, 'genericinterfaceabstractimpl.MyInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (MyInterface), 'genericinterfaceabstractimpl.MyInterface'); exports = MyInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/genericmethod/output_closure/GenericMethod$Consumer.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/genericmethod/output_closure/GenericMethod$Consumer.impl.java.js.txt index 2361463e51..a19e57405a 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/genericmethod/output_closure/GenericMethod$Consumer.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/genericmethod/output_closure/GenericMethod$Consumer.impl.java.js.txt @@ -36,7 +36,7 @@ class Consumer { } } Consumer.$markImplementor(/**@type {Function}*/ (Consumer)); -$Util.$setClassMetadataForInterface(Consumer, 'genericmethod.GenericMethod$Consumer'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Consumer), 'genericmethod.GenericMethod$Consumer'); exports = Consumer; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/genericmethod/output_closure/GenericMethod$Supplier.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/genericmethod/output_closure/GenericMethod$Supplier.impl.java.js.txt index 5bb97c950b..a2d6c8cb61 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/genericmethod/output_closure/GenericMethod$Supplier.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/genericmethod/output_closure/GenericMethod$Supplier.impl.java.js.txt @@ -36,7 +36,7 @@ class Supplier { } } Supplier.$markImplementor(/**@type {Function}*/ (Supplier)); -$Util.$setClassMetadataForInterface(Supplier, 'genericmethod.GenericMethod$Supplier'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Supplier), 'genericmethod.GenericMethod$Supplier'); exports = Supplier; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/implementsgenericinterface/output_closure/GenericInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/implementsgenericinterface/output_closure/GenericInterface.impl.java.js.txt index 3108c804c3..9d7044ef1d 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/implementsgenericinterface/output_closure/GenericInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/implementsgenericinterface/output_closure/GenericInterface.impl.java.js.txt @@ -25,7 +25,7 @@ class GenericInterface { static $loadModules() {} } GenericInterface.$markImplementor(/**@type {Function}*/ (GenericInterface)); -$Util.$setClassMetadataForInterface(GenericInterface, 'implementsgenericinterface.GenericInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (GenericInterface), 'implementsgenericinterface.GenericInterface'); exports = GenericInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/implementsgenericinterface/output_closure/GenericSubInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/implementsgenericinterface/output_closure/GenericSubInterface.impl.java.js.txt index a84ded0788..0a03fa8492 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/implementsgenericinterface/output_closure/GenericSubInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/implementsgenericinterface/output_closure/GenericSubInterface.impl.java.js.txt @@ -28,7 +28,7 @@ class GenericSubInterface { static $loadModules() {} } GenericSubInterface.$markImplementor(/**@type {Function}*/ (GenericSubInterface)); -$Util.$setClassMetadataForInterface(GenericSubInterface, 'implementsgenericinterface.GenericSubInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (GenericSubInterface), 'implementsgenericinterface.GenericSubInterface'); exports = GenericSubInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/instancejsmethods/output_closure/MyInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/instancejsmethods/output_closure/MyInterface.impl.java.js.txt index c11d55c623..fb608f7bbd 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/instancejsmethods/output_closure/MyInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/instancejsmethods/output_closure/MyInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class MyInterface { } } MyInterface.$markImplementor(/**@type {Function}*/ (MyInterface)); -$Util.$setClassMetadataForInterface(MyInterface, 'instancejsmethods.MyInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (MyInterface), 'instancejsmethods.MyInterface'); exports = MyInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/interfacejsbridge/output_closure/MyInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/interfacejsbridge/output_closure/MyInterface.impl.java.js.txt index bbb95a95e0..cd95fdab61 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/interfacejsbridge/output_closure/MyInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/interfacejsbridge/output_closure/MyInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class MyInterface { } } MyInterface.$markImplementor(/**@type {Function}*/ (MyInterface)); -$Util.$setClassMetadataForInterface(MyInterface, 'interfacejsbridge.MyInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (MyInterface), 'interfacejsbridge.MyInterface'); exports = MyInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/interfacejsbridge/output_closure/MyJsInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/interfacejsbridge/output_closure/MyJsInterface.impl.java.js.txt index d5fd30facd..0c8fe34240 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/interfacejsbridge/output_closure/MyJsInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/interfacejsbridge/output_closure/MyJsInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class MyJsInterface { } } MyJsInterface.$markImplementor(/**@type {Function}*/ (MyJsInterface)); -$Util.$setClassMetadataForInterface(MyJsInterface, 'interfacejsbridge.MyJsInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (MyJsInterface), 'interfacejsbridge.MyJsInterface'); exports = MyJsInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/interfacejsbridge/output_closure/SubInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/interfacejsbridge/output_closure/SubInterface.impl.java.js.txt index bf118d8d30..a297a71702 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/interfacejsbridge/output_closure/SubInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/interfacejsbridge/output_closure/SubInterface.impl.java.js.txt @@ -41,7 +41,7 @@ class SubInterface { } } SubInterface.$markImplementor(/**@type {Function}*/ (SubInterface)); -$Util.$setClassMetadataForInterface(SubInterface, 'interfacejsbridge.SubInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (SubInterface), 'interfacejsbridge.SubInterface'); exports = SubInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/interfaces/output_closure/Main$Interface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/interfaces/output_closure/Main$Interface.impl.java.js.txt index 2fe0ad4c73..c005d0eebd 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/interfaces/output_closure/Main$Interface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/interfaces/output_closure/Main$Interface.impl.java.js.txt @@ -55,7 +55,7 @@ Interface.f_a__interfaces_Main_Interface = 1; /**@const {number} @nodts*/ Interface.f_b__interfaces_Main_Interface = 2; Interface.$markImplementor(/**@type {Function}*/ (Interface)); -$Util.$setClassMetadataForInterface(Interface, 'interfaces.Main$Interface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Interface), 'interfaces.Main$Interface'); exports = Interface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/interfaces/output_closure/Main$SubInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/interfaces/output_closure/Main$SubInterface.impl.java.js.txt index 4d512da6ec..4fe594d114 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/interfaces/output_closure/Main$SubInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/interfaces/output_closure/Main$SubInterface.impl.java.js.txt @@ -44,7 +44,7 @@ class SubInterface { } } SubInterface.$markImplementor(/**@type {Function}*/ (SubInterface)); -$Util.$setClassMetadataForInterface(SubInterface, 'interfaces.Main$SubInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (SubInterface), 'interfaces.Main$SubInterface'); exports = SubInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Cmp.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Cmp.impl.java.js.txt index c5bca4bc6f..4d825be8e5 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Cmp.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Cmp.impl.java.js.txt @@ -42,7 +42,7 @@ class Cmp { } } Cmp.$markImplementor(/**@type {Function}*/ (Cmp)); -$Util.$setClassMetadataForInterface(Cmp, 'intersectiontype.Cmp'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Cmp), 'intersectiontype.Cmp'); exports = Cmp; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Cmp2.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Cmp2.impl.java.js.txt index ab6e4629a9..08404d9d7b 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Cmp2.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Cmp2.impl.java.js.txt @@ -36,7 +36,7 @@ class Cmp2 { } } Cmp2.$markImplementor(/**@type {Function}*/ (Cmp2)); -$Util.$setClassMetadataForInterface(Cmp2, 'intersectiontype.Cmp2'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Cmp2), 'intersectiontype.Cmp2'); exports = Cmp2; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Getable.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Getable.impl.java.js.txt index ba124be48d..6a870fb03f 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Getable.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Getable.impl.java.js.txt @@ -36,7 +36,7 @@ class Getable { } } Getable.$markImplementor(/**@type {Function}*/ (Getable)); -$Util.$setClassMetadataForInterface(Getable, 'intersectiontype.Getable'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Getable), 'intersectiontype.Getable'); exports = Getable; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest$EmptyA.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest$EmptyA.impl.java.js.txt index b6ffdbfbe8..4c48de5ff2 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest$EmptyA.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest$EmptyA.impl.java.js.txt @@ -24,7 +24,7 @@ class EmptyA { static $loadModules() {} } EmptyA.$markImplementor(/**@type {Function}*/ (EmptyA)); -$Util.$setClassMetadataForInterface(EmptyA, 'intersectiontype.IntersectionTypeTest$EmptyA'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (EmptyA), 'intersectiontype.IntersectionTypeTest$EmptyA'); exports = EmptyA; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest$EmptyB.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest$EmptyB.impl.java.js.txt index 70c435a329..187cf68af6 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest$EmptyB.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest$EmptyB.impl.java.js.txt @@ -24,7 +24,7 @@ class EmptyB { static $loadModules() {} } EmptyB.$markImplementor(/**@type {Function}*/ (EmptyB)); -$Util.$setClassMetadataForInterface(EmptyB, 'intersectiontype.IntersectionTypeTest$EmptyB'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (EmptyB), 'intersectiontype.IntersectionTypeTest$EmptyB'); exports = EmptyB; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest$MapEntry.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest$MapEntry.impl.java.js.txt index ac54c8c024..79f5d07a67 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest$MapEntry.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest$MapEntry.impl.java.js.txt @@ -32,7 +32,7 @@ class MapEntry extends j_l_Object { } /** @nodts @template T @return {Getable} */ m_method__java_lang_Object__intersectiontype_Getable(/** * */ o) { - return /**@type {Getable}*/ ($Casts.$to($Casts.$to(o, Getable), Setable)); + return /**@type {Getable}*/ ($Casts.$to($Casts.$to(o, /**@type {Function}*/ (Getable)), /**@type {Function}*/ (Setable))); } /** @nodts */ static $clinit() { diff --git a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest.impl.java.js.txt index 36cdec410b..bd4e01ad05 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/IntersectionTypeTest.impl.java.js.txt @@ -40,26 +40,26 @@ class IntersectionTypeTest extends j_l_Object { /** @nodts @template T */ static m_getAndSet__intersectiontype_Getable__void(/** T */ object) { IntersectionTypeTest.$clinit(); - /**@type {!Setable}*/ ($Casts.$to(object, Setable)).m_set__int__void(1); + /**@type {!Setable}*/ ($Casts.$to(object, /**@type {Function}*/ (Setable))).m_set__int__void(1); /**@type {!Getable<*>}*/ (object).m_get__java_lang_Object(); } /** @nodts @template T @return {Getable} */ static m_cast__java_lang_Object__intersectiontype_Getable(/** * */ o) { IntersectionTypeTest.$clinit(); if ($Equality.$same(o, null)) { - return /**@type {Getable}*/ ($Casts.$to($Casts.$to(o, Getable), Setable)); + return /**@type {Getable}*/ ($Casts.$to($Casts.$to(o, /**@type {Function}*/ (Getable)), /**@type {Function}*/ (Setable))); } - return /**@type {Getable}*/ ($Casts.$to($Casts.$to(o, Getable), Setable)); + return /**@type {Getable}*/ ($Casts.$to($Casts.$to(o, /**@type {Function}*/ (Getable)), /**@type {Function}*/ (Setable))); } /** @nodts @template T @return {Getable<(Comparable|boolean|number|string)>} */ static m_cast1__java_lang_Object__intersectiontype_Getable(/** * */ s) { IntersectionTypeTest.$clinit(); - return /**@type {Getable<(Comparable|boolean|number|string)>}*/ ($Casts.$to($Casts.$to(s, Getable), Setable)); + return /**@type {Getable<(Comparable|boolean|number|string)>}*/ ($Casts.$to($Casts.$to(s, /**@type {Function}*/ (Getable)), /**@type {Function}*/ (Setable))); } /** @nodts @template T @return {Getable<(Comparable|boolean|number|string)>} */ static m_cast2__java_lang_Object__intersectiontype_Getable(/** * */ s) { IntersectionTypeTest.$clinit(); - return /**@type {Getable<(Comparable|boolean|number|string)>}*/ ($Casts.$to($Casts.$to(s, Getable), Setable)); + return /**@type {Getable<(Comparable|boolean|number|string)>}*/ ($Casts.$to($Casts.$to(s, /**@type {Function}*/ (Getable)), /**@type {Function}*/ (Setable))); } /** @nodts @return {*} */ m_cast3__java_lang_Object__java_lang_Object(/** * */ s) { @@ -82,9 +82,9 @@ class IntersectionTypeTest extends j_l_Object { /** @nodts */ static m_testClosureAssignment__java_lang_Object__void(/** * */ o) { IntersectionTypeTest.$clinit(); - let e = /**@type {A}*/ ($Casts.$to($Casts.$to($Casts.$to(o, A), EmptyA), EmptyB)); - let g = /**@type {EmptyA}*/ ($Casts.$to($Casts.$to($Casts.$to(o, A), EmptyA), EmptyB)); - let s = /**@type {EmptyB}*/ ($Casts.$to($Casts.$to($Casts.$to(o, A), EmptyA), EmptyB)); + let e = /**@type {A}*/ ($Casts.$to($Casts.$to($Casts.$to(o, A), /**@type {Function}*/ (EmptyA)), /**@type {Function}*/ (EmptyB))); + let g = /**@type {EmptyA}*/ ($Casts.$to($Casts.$to($Casts.$to(o, A), /**@type {Function}*/ (EmptyA)), /**@type {Function}*/ (EmptyB))); + let s = /**@type {EmptyB}*/ ($Casts.$to($Casts.$to($Casts.$to(o, A), /**@type {Function}*/ (EmptyA)), /**@type {Function}*/ (EmptyB))); } /** @nodts @template T @return {T} */ static m_get__java_lang_Object__java_lang_Object(/** T */ t) { @@ -92,7 +92,7 @@ class IntersectionTypeTest extends j_l_Object { } /** @nodts @template T @return {T} */ static m_m__intersectiontype_IntersectionTypeTest_A() { - return /**@type {T}*/ ($Casts.$to($Casts.$to(IntersectionTypeTest.m_get__java_lang_Object__java_lang_Object(j_l_Object.$create__()), A), EmptyA)); + return /**@type {T}*/ ($Casts.$to($Casts.$to(IntersectionTypeTest.m_get__java_lang_Object__java_lang_Object(j_l_Object.$create__()), A), /**@type {Function}*/ (EmptyA))); } /** @nodts @template T @return {Getable} */ static m_n__intersectiontype_Getable() { @@ -103,18 +103,18 @@ class IntersectionTypeTest extends j_l_Object { /** @nodts */ m_testMethodCall__void() { let o = IntersectionTypeTest.m_m__intersectiontype_IntersectionTypeTest_A(); - IntersectionTypeTest.m_set__intersectiontype_IntersectionTypeTest_A__void(/**@type {A}*/ ($Casts.$to($Casts.$to(o, A), EmptyA))); + IntersectionTypeTest.m_set__intersectiontype_IntersectionTypeTest_A__void(/**@type {A}*/ ($Casts.$to($Casts.$to(o, A), /**@type {Function}*/ (EmptyA)))); IntersectionTypeTest.m_set__intersectiontype_IntersectionTypeTest_A__void(IntersectionTypeTest.m_m__intersectiontype_IntersectionTypeTest_A()); let g = /**@type {Getable}*/ (IntersectionTypeTest.m_n__intersectiontype_Getable()); } /** @nodts */ m_testDefaultMethodCall__java_lang_Object__void(/** * */ o) { - /**@type {Cmp}*/ ($Casts.$to($Casts.$to(o, Cmp), EmptyA)).m_defaultM__int(); - /**@type {CmpImpl}*/ ($Casts.$to($Casts.$to(o, CmpImpl), EmptyA)).m_defaultM__int(); + /**@type {Cmp}*/ ($Casts.$to($Casts.$to(o, /**@type {Function}*/ (Cmp)), /**@type {Function}*/ (EmptyA))).m_defaultM__int(); + /**@type {CmpImpl}*/ ($Casts.$to($Casts.$to(o, CmpImpl), /**@type {Function}*/ (EmptyA))).m_defaultM__int(); } /** @nodts @template T */ static m_callOnIntersetionTypes__intersectiontype_IntersectionTypeTest_SomeConcreteType__void(/** T */ t) { - /**@type {!Cmp}*/ ($Casts.$to(t, Cmp)).m_cmp__int(); + /**@type {!Cmp}*/ ($Casts.$to(t, /**@type {Function}*/ (Cmp))).m_cmp__int(); /**@type {!Cmp}*/ (null).m_cmp__int(); } /** @nodts */ diff --git a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Serial.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Serial.impl.java.js.txt index b4e285657f..f05271d93f 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Serial.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Serial.impl.java.js.txt @@ -24,7 +24,7 @@ class Serial { static $loadModules() {} } Serial.$markImplementor(/**@type {Function}*/ (Serial)); -$Util.$setClassMetadataForInterface(Serial, 'intersectiontype.Serial'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Serial), 'intersectiontype.Serial'); exports = Serial; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Setable.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Setable.impl.java.js.txt index be5e3c7357..c779bd7b91 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Setable.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/intersectiontype/output_closure/Setable.impl.java.js.txt @@ -35,7 +35,7 @@ class Setable { } } Setable.$markImplementor(/**@type {Function}*/ (Setable)); -$Util.$setClassMetadataForInterface(Setable, 'intersectiontype.Setable'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Setable), 'intersectiontype.Setable'); exports = Setable; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsasync/output_closure/Main$AsyncInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsasync/output_closure/Main$AsyncInterface.impl.java.js.txt index 7f938ba620..3edc9f5e1d 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsasync/output_closure/Main$AsyncInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsasync/output_closure/Main$AsyncInterface.impl.java.js.txt @@ -39,7 +39,7 @@ class AsyncInterface { } } AsyncInterface.$markImplementor(/**@type {Function}*/ (AsyncInterface)); -$Util.$setClassMetadataForInterface(AsyncInterface, 'jsasync.Main$AsyncInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (AsyncInterface), 'jsasync.Main$AsyncInterface'); exports = AsyncInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsasync/output_closure/Main$BaseInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsasync/output_closure/Main$BaseInterface.impl.java.js.txt index 764895bc24..6ea7f95a60 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsasync/output_closure/Main$BaseInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsasync/output_closure/Main$BaseInterface.impl.java.js.txt @@ -36,7 +36,7 @@ class BaseInterface { } } BaseInterface.$markImplementor(/**@type {Function}*/ (BaseInterface)); -$Util.$setClassMetadataForInterface(BaseInterface, 'jsasync.Main$BaseInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (BaseInterface), 'jsasync.Main$BaseInterface'); exports = BaseInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsasync/output_closure/Main$InterfaceWithAsyncDefaultMethod.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsasync/output_closure/Main$InterfaceWithAsyncDefaultMethod.impl.java.js.txt index d3292a6de6..e0c1fc10b1 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsasync/output_closure/Main$InterfaceWithAsyncDefaultMethod.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsasync/output_closure/Main$InterfaceWithAsyncDefaultMethod.impl.java.js.txt @@ -37,7 +37,7 @@ class InterfaceWithAsyncDefaultMethod { } } InterfaceWithAsyncDefaultMethod.$markImplementor(/**@type {Function}*/ (InterfaceWithAsyncDefaultMethod)); -$Util.$setClassMetadataForInterface(InterfaceWithAsyncDefaultMethod, 'jsasync.Main$InterfaceWithAsyncDefaultMethod'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (InterfaceWithAsyncDefaultMethod), 'jsasync.Main$InterfaceWithAsyncDefaultMethod'); exports = InterfaceWithAsyncDefaultMethod; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsbridgeaccidentaloverride/output_closure/MyInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsbridgeaccidentaloverride/output_closure/MyInterface.impl.java.js.txt index 3243578776..c32a2f5be1 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsbridgeaccidentaloverride/output_closure/MyInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsbridgeaccidentaloverride/output_closure/MyInterface.impl.java.js.txt @@ -28,7 +28,7 @@ class MyInterface { static $loadModules() {} } MyInterface.$markImplementor(/**@type {Function}*/ (MyInterface)); -$Util.$setClassMetadataForInterface(MyInterface, 'jsbridgeaccidentaloverride.MyInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (MyInterface), 'jsbridgeaccidentaloverride.MyInterface'); exports = MyInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsbridgeaccidentaloverride/output_closure/OtherInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsbridgeaccidentaloverride/output_closure/OtherInterface.impl.java.js.txt index 5938b56fc9..8defc29e7b 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsbridgeaccidentaloverride/output_closure/OtherInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsbridgeaccidentaloverride/output_closure/OtherInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class OtherInterface { } } OtherInterface.$markImplementor(/**@type {Function}*/ (OtherInterface)); -$Util.$setClassMetadataForInterface(OtherInterface, 'jsbridgeaccidentaloverride.OtherInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (OtherInterface), 'jsbridgeaccidentaloverride.OtherInterface'); exports = OtherInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsbridgebackward/output_closure/MyJsInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsbridgebackward/output_closure/MyJsInterface.impl.java.js.txt index 6c800e7619..d86f85265c 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsbridgebackward/output_closure/MyJsInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsbridgebackward/output_closure/MyJsInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class MyJsInterface { } } MyJsInterface.$markImplementor(/**@type {Function}*/ (MyJsInterface)); -$Util.$setClassMetadataForInterface(MyJsInterface, 'jsbridgebackward.MyJsInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (MyJsInterface), 'jsbridgebackward.MyJsInterface'); exports = MyJsInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_closure/Main$ComparableJsEnumSupplierConsumer.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_closure/Main$ComparableJsEnumSupplierConsumer.impl.java.js.txt index 82399ba013..ffbe3b8a89 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_closure/Main$ComparableJsEnumSupplierConsumer.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_closure/Main$ComparableJsEnumSupplierConsumer.impl.java.js.txt @@ -37,7 +37,7 @@ class ComparableJsEnumSupplierConsumer { static $loadModules() {} } ComparableJsEnumSupplierConsumer.$markImplementor(/**@type {Function}*/ (ComparableJsEnumSupplierConsumer)); -$Util.$setClassMetadataForInterface(ComparableJsEnumSupplierConsumer, 'jsenum.Main$ComparableJsEnumSupplierConsumer'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (ComparableJsEnumSupplierConsumer), 'jsenum.Main$ComparableJsEnumSupplierConsumer'); exports = ComparableJsEnumSupplierConsumer; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_closure/Main$Consumer.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_closure/Main$Consumer.impl.java.js.txt index 93106e2181..b2140e2957 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_closure/Main$Consumer.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_closure/Main$Consumer.impl.java.js.txt @@ -36,7 +36,7 @@ class Consumer { } } Consumer.$markImplementor(/**@type {Function}*/ (Consumer)); -$Util.$setClassMetadataForInterface(Consumer, 'jsenum.Main$Consumer'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Consumer), 'jsenum.Main$Consumer'); exports = Consumer; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_closure/Main$Supplier.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_closure/Main$Supplier.impl.java.js.txt index 1f7476c650..7b9fafd1dc 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_closure/Main$Supplier.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsenum/output_closure/Main$Supplier.impl.java.js.txt @@ -36,7 +36,7 @@ class Supplier { } } Supplier.$markImplementor(/**@type {Function}*/ (Supplier)); -$Util.$setClassMetadataForInterface(Supplier, 'jsenum.Main$Supplier'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Supplier), 'jsenum.Main$Supplier'); exports = Supplier; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsfunction/output_closure/Main$ApiWithMethodReturningParametricJsFunction.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsfunction/output_closure/Main$ApiWithMethodReturningParametricJsFunction.impl.java.js.txt index bbb08cc5e7..60fce8ab8f 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsfunction/output_closure/Main$ApiWithMethodReturningParametricJsFunction.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsfunction/output_closure/Main$ApiWithMethodReturningParametricJsFunction.impl.java.js.txt @@ -35,7 +35,7 @@ class ApiWithMethodReturningParametricJsFunction { } } ApiWithMethodReturningParametricJsFunction.$markImplementor(/**@type {Function}*/ (ApiWithMethodReturningParametricJsFunction)); -$Util.$setClassMetadataForInterface(ApiWithMethodReturningParametricJsFunction, 'jsfunction.Main$ApiWithMethodReturningParametricJsFunction'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (ApiWithMethodReturningParametricJsFunction), 'jsfunction.Main$ApiWithMethodReturningParametricJsFunction'); exports = ApiWithMethodReturningParametricJsFunction; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsmethod/output_closure/JsMethodExample$I.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsmethod/output_closure/JsMethodExample$I.impl.java.js.txt index 0cab6a56d8..dd40c9859c 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsmethod/output_closure/JsMethodExample$I.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsmethod/output_closure/JsMethodExample$I.impl.java.js.txt @@ -35,7 +35,7 @@ class I { } } I.$markImplementor(/**@type {Function}*/ (I)); -$Util.$setClassMetadataForInterface(I, 'jsmethod.JsMethodExample$I'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (I), 'jsmethod.JsMethodExample$I'); exports = I; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsmethod/output_closure/JsMethodExample$InterfaceExposingJsMethods.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsmethod/output_closure/JsMethodExample$InterfaceExposingJsMethods.impl.java.js.txt index ea2ac01690..dddba86cb7 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsmethod/output_closure/JsMethodExample$InterfaceExposingJsMethods.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsmethod/output_closure/JsMethodExample$InterfaceExposingJsMethods.impl.java.js.txt @@ -44,7 +44,7 @@ class InterfaceExposingJsMethods { } } InterfaceExposingJsMethods.$markImplementor(/**@type {Function}*/ (InterfaceExposingJsMethods)); -$Util.$setClassMetadataForInterface(InterfaceExposingJsMethods, 'jsmethod.JsMethodExample$InterfaceExposingJsMethods'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (InterfaceExposingJsMethods), 'jsmethod.JsMethodExample$InterfaceExposingJsMethods'); exports = InterfaceExposingJsMethods; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsmethod/output_closure/JsMethodExample$InterfaceWithMethod.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsmethod/output_closure/JsMethodExample$InterfaceWithMethod.impl.java.js.txt index 1839d6abeb..cab07b332c 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsmethod/output_closure/JsMethodExample$InterfaceWithMethod.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsmethod/output_closure/JsMethodExample$InterfaceWithMethod.impl.java.js.txt @@ -28,7 +28,7 @@ class InterfaceWithMethod { static $loadModules() {} } InterfaceWithMethod.$markImplementor(/**@type {Function}*/ (InterfaceWithMethod)); -$Util.$setClassMetadataForInterface(InterfaceWithMethod, 'jsmethod.JsMethodExample$InterfaceWithMethod'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (InterfaceWithMethod), 'jsmethod.JsMethodExample$InterfaceWithMethod'); exports = InterfaceWithMethod; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsnonnull/output_closure/Main$NonNullableTemplate.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsnonnull/output_closure/Main$NonNullableTemplate.impl.java.js.txt index 6943297f8c..ea030b78bc 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsnonnull/output_closure/Main$NonNullableTemplate.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsnonnull/output_closure/Main$NonNullableTemplate.impl.java.js.txt @@ -29,7 +29,7 @@ class NonNullableTemplate { static $loadModules() {} } NonNullableTemplate.$markImplementor(/**@type {Function}*/ (NonNullableTemplate)); -$Util.$setClassMetadataForInterface(NonNullableTemplate, 'jsnonnull.Main$NonNullableTemplate'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NonNullableTemplate), 'jsnonnull.Main$NonNullableTemplate'); exports = NonNullableTemplate; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsnonnull/output_closure/Main$NonNullableTemplatedReturn.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsnonnull/output_closure/Main$NonNullableTemplatedReturn.impl.java.js.txt index a8d231e922..4b39f0474d 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsnonnull/output_closure/Main$NonNullableTemplatedReturn.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsnonnull/output_closure/Main$NonNullableTemplatedReturn.impl.java.js.txt @@ -29,7 +29,7 @@ class NonNullableTemplatedReturn { static $loadModules() {} } NonNullableTemplatedReturn.$markImplementor(/**@type {Function}*/ (NonNullableTemplatedReturn)); -$Util.$setClassMetadataForInterface(NonNullableTemplatedReturn, 'jsnonnull.Main$NonNullableTemplatedReturn'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NonNullableTemplatedReturn), 'jsnonnull.Main$NonNullableTemplatedReturn'); exports = NonNullableTemplatedReturn; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_closure/Main$I.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_closure/Main$I.impl.java.js.txt index d2f129aac2..7c01142c34 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_closure/Main$I.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsoptional/output_closure/Main$I.impl.java.js.txt @@ -36,7 +36,7 @@ class I { } } I.$markImplementor(/**@type {Function}*/ (I)); -$Util.$setClassMetadataForInterface(I, 'jsoptional.Main$I'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (I), 'jsoptional.Main$I'); exports = I; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsproperties/output_closure/InterfaceWithDefaultJsProperties.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsproperties/output_closure/InterfaceWithDefaultJsProperties.impl.java.js.txt index ffc2234bed..fa80ec3899 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsproperties/output_closure/InterfaceWithDefaultJsProperties.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsproperties/output_closure/InterfaceWithDefaultJsProperties.impl.java.js.txt @@ -37,7 +37,7 @@ class InterfaceWithDefaultJsProperties { static $loadModules() {} } InterfaceWithDefaultJsProperties.$markImplementor(/**@type {Function}*/ (InterfaceWithDefaultJsProperties)); -$Util.$setClassMetadataForInterface(InterfaceWithDefaultJsProperties, 'jsproperties.InterfaceWithDefaultJsProperties'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (InterfaceWithDefaultJsProperties), 'jsproperties.InterfaceWithDefaultJsProperties'); exports = InterfaceWithDefaultJsProperties; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jstypewithdefault/output_closure/Interface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jstypewithdefault/output_closure/Interface.impl.java.js.txt index 41fd56c0bf..ab505a9081 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jstypewithdefault/output_closure/Interface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jstypewithdefault/output_closure/Interface.impl.java.js.txt @@ -30,7 +30,7 @@ class Interface { static $loadModules() {} } Interface.$markImplementor(/**@type {Function}*/ (Interface)); -$Util.$setClassMetadataForInterface(Interface, 'jstypewithdefault.Interface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Interface), 'jstypewithdefault.Interface'); exports = Interface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsvarargs/output_closure/Main$StaticInterfaceMethodWithVarargs.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsvarargs/output_closure/Main$StaticInterfaceMethodWithVarargs.impl.java.js.txt index eec0b9837c..f638932496 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsvarargs/output_closure/Main$StaticInterfaceMethodWithVarargs.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsvarargs/output_closure/Main$StaticInterfaceMethodWithVarargs.impl.java.js.txt @@ -35,7 +35,7 @@ class StaticInterfaceMethodWithVarargs { } } StaticInterfaceMethodWithVarargs.$markImplementor(/**@type {Function}*/ (StaticInterfaceMethodWithVarargs)); -$Util.$setClassMetadataForInterface(StaticInterfaceMethodWithVarargs, 'jsvarargs.Main$StaticInterfaceMethodWithVarargs'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (StaticInterfaceMethodWithVarargs), 'jsvarargs.Main$StaticInterfaceMethodWithVarargs'); exports = StaticInterfaceMethodWithVarargs; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/jsvarargs/output_closure/Main.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/jsvarargs/output_closure/Main.impl.java.js.txt index 963c8f249f..c43c2f8b93 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/jsvarargs/output_closure/Main.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/jsvarargs/output_closure/Main.impl.java.js.txt @@ -59,13 +59,13 @@ class Main extends j_l_Object { /** @return {Main} */ static parameterizedType(.../** ...List
*/ elements) { Main.$clinit(); - $Arrays.$stampType(elements, List); + $Arrays.$stampType(elements, /**@type {Function}*/ (List)); return /**@type {Main}*/ ($Casts.$to(elements[0].getAtIndex(0), Main)); } /** @template T @return {T} */ static parameterizedByT(.../** ...List */ elements) { Main.$clinit(); - $Arrays.$stampType(elements, List); + $Arrays.$stampType(elements, /**@type {Function}*/ (List)); return elements[0].getAtIndex(0); } /** @nodts */ diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$BiFunction.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$BiFunction.impl.java.js.txt index fd7a17ad38..e94581011e 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$BiFunction.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$BiFunction.impl.java.js.txt @@ -46,7 +46,7 @@ class BiFunction { } } BiFunction.$markImplementor(/**@type {Function}*/ (BiFunction)); -$Util.$setClassMetadataForInterface(BiFunction, 'lambdas.Lambdas$BiFunction'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (BiFunction), 'lambdas.Lambdas$BiFunction'); exports = BiFunction; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$EmptyInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$EmptyInterface.impl.java.js.txt index a82ba56c1b..aeb90dc39c 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$EmptyInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$EmptyInterface.impl.java.js.txt @@ -24,7 +24,7 @@ class EmptyInterface { static $loadModules() {} } EmptyInterface.$markImplementor(/**@type {Function}*/ (EmptyInterface)); -$Util.$setClassMetadataForInterface(EmptyInterface, 'lambdas.Lambdas$EmptyInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (EmptyInterface), 'lambdas.Lambdas$EmptyInterface'); exports = EmptyInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$EmptyInterfaceProvider.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$EmptyInterfaceProvider.impl.java.js.txt index cb3f1764a7..b0bcbfbeaf 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$EmptyInterfaceProvider.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$EmptyInterfaceProvider.impl.java.js.txt @@ -36,7 +36,7 @@ class EmptyInterfaceProvider { } } EmptyInterfaceProvider.$markImplementor(/**@type {Function}*/ (EmptyInterfaceProvider)); -$Util.$setClassMetadataForInterface(EmptyInterfaceProvider, 'lambdas.Lambdas$EmptyInterfaceProvider'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (EmptyInterfaceProvider), 'lambdas.Lambdas$EmptyInterfaceProvider'); exports = EmptyInterfaceProvider; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Equals.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Equals.impl.java.js.txt index 74cd5f09aa..69a427d395 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Equals.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Equals.impl.java.js.txt @@ -34,7 +34,7 @@ class Equals { static $loadModules() {} } Equals.$markImplementor(/**@type {Function}*/ (Equals)); -$Util.$setClassMetadataForInterface(Equals, 'lambdas.Lambdas$Equals'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Equals), 'lambdas.Lambdas$Equals'); exports = Equals; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Function.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Function.impl.java.js.txt index 5f96c43fe6..4559d4b8d6 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Function.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Function.impl.java.js.txt @@ -43,7 +43,7 @@ class Lambdas_Function { } } Lambdas_Function.$markImplementor(/**@type {Function}*/ (Lambdas_Function)); -$Util.$setClassMetadataForInterface(Lambdas_Function, 'lambdas.Lambdas$Function'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Lambdas_Function), 'lambdas.Lambdas$Function'); exports = Lambdas_Function; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Functional.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Functional.impl.java.js.txt index 38372fdc1e..01ac5f21e2 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Functional.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Functional.impl.java.js.txt @@ -36,7 +36,7 @@ class Functional { } } Functional.$markImplementor(/**@type {Function}*/ (Functional)); -$Util.$setClassMetadataForInterface(Functional, 'lambdas.Lambdas$Functional'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Functional), 'lambdas.Lambdas$Functional'); exports = Functional; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$FunctionalInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$FunctionalInterface.impl.java.js.txt index b7d81d7a8b..1d9738e899 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$FunctionalInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$FunctionalInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class FunctionalInterface { } } FunctionalInterface.$markImplementor(/**@type {Function}*/ (FunctionalInterface)); -$Util.$setClassMetadataForInterface(FunctionalInterface, 'lambdas.Lambdas$FunctionalInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (FunctionalInterface), 'lambdas.Lambdas$FunctionalInterface'); exports = FunctionalInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$FunctionalInterfaceWithMethodReturningVoid.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$FunctionalInterfaceWithMethodReturningVoid.impl.java.js.txt index 10cfd79009..f1b7289e9c 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$FunctionalInterfaceWithMethodReturningVoid.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$FunctionalInterfaceWithMethodReturningVoid.impl.java.js.txt @@ -35,7 +35,7 @@ class FunctionalInterfaceWithMethodReturningVoid { } } FunctionalInterfaceWithMethodReturningVoid.$markImplementor(/**@type {Function}*/ (FunctionalInterfaceWithMethodReturningVoid)); -$Util.$setClassMetadataForInterface(FunctionalInterfaceWithMethodReturningVoid, 'lambdas.Lambdas$FunctionalInterfaceWithMethodReturningVoid'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (FunctionalInterfaceWithMethodReturningVoid), 'lambdas.Lambdas$FunctionalInterfaceWithMethodReturningVoid'); exports = FunctionalInterfaceWithMethodReturningVoid; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$GenericFunctionalInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$GenericFunctionalInterface.impl.java.js.txt index bca728ec37..9d65d49a0c 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$GenericFunctionalInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$GenericFunctionalInterface.impl.java.js.txt @@ -36,7 +36,7 @@ class GenericFunctionalInterface { } } GenericFunctionalInterface.$markImplementor(/**@type {Function}*/ (GenericFunctionalInterface)); -$Util.$setClassMetadataForInterface(GenericFunctionalInterface, 'lambdas.Lambdas$GenericFunctionalInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (GenericFunctionalInterface), 'lambdas.Lambdas$GenericFunctionalInterface'); exports = GenericFunctionalInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$JsSupplier.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$JsSupplier.impl.java.js.txt index 062bf7ac07..59d8b49b28 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$JsSupplier.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$JsSupplier.impl.java.js.txt @@ -41,7 +41,7 @@ class JsSupplier { } } JsSupplier.$markImplementor(/**@type {Function}*/ (JsSupplier)); -$Util.$setClassMetadataForInterface(JsSupplier, 'lambdas.Lambdas$JsSupplier'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (JsSupplier), 'lambdas.Lambdas$JsSupplier'); exports = JsSupplier; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$JustADefaultS.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$JustADefaultS.impl.java.js.txt index 2aacb7a958..3d433150f9 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$JustADefaultS.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$JustADefaultS.impl.java.js.txt @@ -31,7 +31,7 @@ class JustADefaultS { static $loadModules() {} } JustADefaultS.$markImplementor(/**@type {Function}*/ (JustADefaultS)); -$Util.$setClassMetadataForInterface(JustADefaultS, 'lambdas.Lambdas$JustADefaultS'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (JustADefaultS), 'lambdas.Lambdas$JustADefaultS'); exports = JustADefaultS; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$JustADefaultT.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$JustADefaultT.impl.java.js.txt index 446619fc5a..cf04b48383 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$JustADefaultT.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$JustADefaultT.impl.java.js.txt @@ -31,7 +31,7 @@ class JustADefaultT { static $loadModules() {} } JustADefaultT.$markImplementor(/**@type {Function}*/ (JustADefaultT)); -$Util.$setClassMetadataForInterface(JustADefaultT, 'lambdas.Lambdas$JustADefaultT'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (JustADefaultT), 'lambdas.Lambdas$JustADefaultT'); exports = JustADefaultT; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$MarkerWithDefaultMethod.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$MarkerWithDefaultMethod.impl.java.js.txt index acfcf11243..34f5e31669 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$MarkerWithDefaultMethod.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$MarkerWithDefaultMethod.impl.java.js.txt @@ -30,7 +30,7 @@ class MarkerWithDefaultMethod { static $loadModules() {} } MarkerWithDefaultMethod.$markImplementor(/**@type {Function}*/ (MarkerWithDefaultMethod)); -$Util.$setClassMetadataForInterface(MarkerWithDefaultMethod, 'lambdas.Lambdas$MarkerWithDefaultMethod'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (MarkerWithDefaultMethod), 'lambdas.Lambdas$MarkerWithDefaultMethod'); exports = MarkerWithDefaultMethod; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Runnable.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Runnable.impl.java.js.txt index ac07448cbd..010e08ab33 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Runnable.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/lambdas/output_closure/Lambdas$Runnable.impl.java.js.txt @@ -35,7 +35,7 @@ class Runnable { } } Runnable.$markImplementor(/**@type {Function}*/ (Runnable)); -$Util.$setClassMetadataForInterface(Runnable, 'lambdas.Lambdas$Runnable'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Runnable), 'lambdas.Lambdas$Runnable'); exports = Runnable; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/libraryinfo/output_closure/Main$FunctionnalInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/libraryinfo/output_closure/Main$FunctionnalInterface.impl.java.js.txt index 4262b625e4..3b3ca34ba6 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/libraryinfo/output_closure/Main$FunctionnalInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/libraryinfo/output_closure/Main$FunctionnalInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class FunctionnalInterface { } } FunctionnalInterface.$markImplementor(/**@type {Function}*/ (FunctionnalInterface)); -$Util.$setClassMetadataForInterface(FunctionnalInterface, 'libraryinfo.Main$FunctionnalInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (FunctionnalInterface), 'libraryinfo.Main$FunctionnalInterface'); exports = FunctionnalInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/libraryinfo/output_closure/Main$JsAccessibleFunctionnalInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/libraryinfo/output_closure/Main$JsAccessibleFunctionnalInterface.impl.java.js.txt index f1e90e9042..8a2ad55c6b 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/libraryinfo/output_closure/Main$JsAccessibleFunctionnalInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/libraryinfo/output_closure/Main$JsAccessibleFunctionnalInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class JsAccessibleFunctionnalInterface { } } JsAccessibleFunctionnalInterface.$markImplementor(/**@type {Function}*/ (JsAccessibleFunctionnalInterface)); -$Util.$setClassMetadataForInterface(JsAccessibleFunctionnalInterface, 'libraryinfo.Main$JsAccessibleFunctionnalInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (JsAccessibleFunctionnalInterface), 'libraryinfo.Main$JsAccessibleFunctionnalInterface'); exports = JsAccessibleFunctionnalInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/libraryinfo/output_closure/Main$JsTypeInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/libraryinfo/output_closure/Main$JsTypeInterface.impl.java.js.txt index 49858b9cc7..0134a46957 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/libraryinfo/output_closure/Main$JsTypeInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/libraryinfo/output_closure/Main$JsTypeInterface.impl.java.js.txt @@ -28,7 +28,7 @@ class JsTypeInterface { static $loadModules() {} } JsTypeInterface.$markImplementor(/**@type {Function}*/ (JsTypeInterface)); -$Util.$setClassMetadataForInterface(JsTypeInterface, 'libraryinfo.Main$JsTypeInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (JsTypeInterface), 'libraryinfo.Main$JsTypeInterface'); exports = JsTypeInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/markimplementornativetypes/output_closure/RegularInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/markimplementornativetypes/output_closure/RegularInterface.impl.java.js.txt index 2fae5b03f3..eb06189d85 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/markimplementornativetypes/output_closure/RegularInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/markimplementornativetypes/output_closure/RegularInterface.impl.java.js.txt @@ -24,7 +24,7 @@ class RegularInterface { static $loadModules() {} } RegularInterface.$markImplementor(/**@type {Function}*/ (RegularInterface)); -$Util.$setClassMetadataForInterface(RegularInterface, 'markimplementornativetypes.RegularInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (RegularInterface), 'markimplementornativetypes.RegularInterface'); exports = RegularInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/markimplementornativetypes/output_closure/SubNativeInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/markimplementornativetypes/output_closure/SubNativeInterface.impl.java.js.txt index 2f1237ad7a..e9eeb0e850 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/markimplementornativetypes/output_closure/SubNativeInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/markimplementornativetypes/output_closure/SubNativeInterface.impl.java.js.txt @@ -30,7 +30,7 @@ class SubNativeInterface { static $loadModules() {} } SubNativeInterface.$markImplementor(/**@type {Function}*/ (SubNativeInterface)); -$Util.$setClassMetadataForInterface(SubNativeInterface, 'markimplementornativetypes.SubNativeInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (SubNativeInterface), 'markimplementornativetypes.SubNativeInterface'); exports = SubNativeInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$ArrayProducer.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$ArrayProducer.impl.java.js.txt index d4ebbc66df..1650b13bf6 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$ArrayProducer.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$ArrayProducer.impl.java.js.txt @@ -36,7 +36,7 @@ class ArrayProducer { } } ArrayProducer.$markImplementor(/**@type {Function}*/ (ArrayProducer)); -$Util.$setClassMetadataForInterface(ArrayProducer, 'methodreferences.MethodReferences$ArrayProducer'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (ArrayProducer), 'methodreferences.MethodReferences$ArrayProducer'); exports = ArrayProducer; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$BiFunction.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$BiFunction.impl.java.js.txt index afa1ec9ce9..da70b75f0c 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$BiFunction.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$BiFunction.impl.java.js.txt @@ -36,7 +36,7 @@ class BiFunction { } } BiFunction.$markImplementor(/**@type {Function}*/ (BiFunction)); -$Util.$setClassMetadataForInterface(BiFunction, 'methodreferences.MethodReferences$BiFunction'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (BiFunction), 'methodreferences.MethodReferences$BiFunction'); exports = BiFunction; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$Function.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$Function.impl.java.js.txt index a166bd74d7..78ebe3420c 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$Function.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$Function.impl.java.js.txt @@ -36,7 +36,7 @@ class MethodReferences_Function { } } MethodReferences_Function.$markImplementor(/**@type {Function}*/ (MethodReferences_Function)); -$Util.$setClassMetadataForInterface(MethodReferences_Function, 'methodreferences.MethodReferences$Function'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (MethodReferences_Function), 'methodreferences.MethodReferences$Function'); exports = MethodReferences_Function; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$Predicate.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$Predicate.impl.java.js.txt index 87e625a017..a4794e485d 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$Predicate.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$Predicate.impl.java.js.txt @@ -36,7 +36,7 @@ class Predicate { } } Predicate.$markImplementor(/**@type {Function}*/ (Predicate)); -$Util.$setClassMetadataForInterface(Predicate, 'methodreferences.MethodReferences$Predicate'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Predicate), 'methodreferences.MethodReferences$Predicate'); exports = Predicate; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$Producer.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$Producer.impl.java.js.txt index 6258d44e25..e2c8d7f532 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$Producer.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/methodreferences/output_closure/MethodReferences$Producer.impl.java.js.txt @@ -36,7 +36,7 @@ class Producer { } } Producer.$markImplementor(/**@type {Function}*/ (Producer)); -$Util.$setClassMetadataForInterface(Producer, 'methodreferences.MethodReferences$Producer'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Producer), 'methodreferences.MethodReferences$Producer'); exports = Producer; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/mixednestings/output_closure/MyInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/mixednestings/output_closure/MyInterface.impl.java.js.txt index 1b13f27d1d..545a68cee6 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/mixednestings/output_closure/MyInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/mixednestings/output_closure/MyInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class MyInterface { } } MyInterface.$markImplementor(/**@type {Function}*/ (MyInterface)); -$Util.$setClassMetadataForInterface(MyInterface, 'mixednestings.MyInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (MyInterface), 'mixednestings.MyInterface'); exports = MyInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/multipleabstractparents/output_closure/MultipleAbstractParents$Collection.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/multipleabstractparents/output_closure/MultipleAbstractParents$Collection.impl.java.js.txt index bb01e0f726..aa206c07c1 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/multipleabstractparents/output_closure/MultipleAbstractParents$Collection.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/multipleabstractparents/output_closure/MultipleAbstractParents$Collection.impl.java.js.txt @@ -36,7 +36,7 @@ class Collection { } } Collection.$markImplementor(/**@type {Function}*/ (Collection)); -$Util.$setClassMetadataForInterface(Collection, 'multipleabstractparents.MultipleAbstractParents$Collection'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Collection), 'multipleabstractparents.MultipleAbstractParents$Collection'); exports = Collection; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/multipleabstractparents/output_closure/MultipleAbstractParents$IStringList.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/multipleabstractparents/output_closure/MultipleAbstractParents$IStringList.impl.java.js.txt index 0415888f34..9f4dc27d64 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/multipleabstractparents/output_closure/MultipleAbstractParents$IStringList.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/multipleabstractparents/output_closure/MultipleAbstractParents$IStringList.impl.java.js.txt @@ -38,7 +38,7 @@ class IStringList { } } IStringList.$markImplementor(/**@type {Function}*/ (IStringList)); -$Util.$setClassMetadataForInterface(IStringList, 'multipleabstractparents.MultipleAbstractParents$IStringList'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (IStringList), 'multipleabstractparents.MultipleAbstractParents$IStringList'); exports = IStringList; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/multipleabstractparents/output_closure/MultipleAbstractParents$List.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/multipleabstractparents/output_closure/MultipleAbstractParents$List.impl.java.js.txt index c6654f6d42..dac225fd32 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/multipleabstractparents/output_closure/MultipleAbstractParents$List.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/multipleabstractparents/output_closure/MultipleAbstractParents$List.impl.java.js.txt @@ -36,7 +36,7 @@ class List { } } List.$markImplementor(/**@type {Function}*/ (List)); -$Util.$setClassMetadataForInterface(List, 'multipleabstractparents.MultipleAbstractParents$List'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (List), 'multipleabstractparents.MultipleAbstractParents$List'); exports = List; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nestedlocalclasses/output_closure/NestedLocalClasses$InterfaceWithThisReference.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nestedlocalclasses/output_closure/NestedLocalClasses$InterfaceWithThisReference.impl.java.js.txt index 4b5f061230..bd5c4a92c8 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nestedlocalclasses/output_closure/NestedLocalClasses$InterfaceWithThisReference.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nestedlocalclasses/output_closure/NestedLocalClasses$InterfaceWithThisReference.impl.java.js.txt @@ -35,7 +35,7 @@ class InterfaceWithThisReference { } } InterfaceWithThisReference.$markImplementor(/**@type {Function}*/ (InterfaceWithThisReference)); -$Util.$setClassMetadataForInterface(InterfaceWithThisReference, 'nestedlocalclasses.NestedLocalClasses$InterfaceWithThisReference'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (InterfaceWithThisReference), 'nestedlocalclasses.NestedLocalClasses$InterfaceWithThisReference'); exports = InterfaceWithThisReference; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nobridgemethods/output_closure/Entry.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nobridgemethods/output_closure/Entry.impl.java.js.txt index 9eca014ebe..110b009547 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nobridgemethods/output_closure/Entry.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nobridgemethods/output_closure/Entry.impl.java.js.txt @@ -25,7 +25,7 @@ class Entry { static $loadModules() {} } Entry.$markImplementor(/**@type {Function}*/ (Entry)); -$Util.$setClassMetadataForInterface(Entry, 'nobridgemethods.Entry'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Entry), 'nobridgemethods.Entry'); exports = Entry; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/Marker.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/Marker.impl.java.js.txt index 0815305e9c..f1f14df14f 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/Marker.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/Marker.impl.java.js.txt @@ -24,7 +24,7 @@ class Marker { static $loadModules() {} } Marker.$markImplementor(/**@type {Function}*/ (Marker)); -$Util.$setClassMetadataForInterface(Marker, 'nullability.Marker'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Marker), 'nullability.Marker'); exports = Marker; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/Nullability$NullableTemplatedReturn.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/Nullability$NullableTemplatedReturn.impl.java.js.txt index 5c8bff45d7..173d336e2e 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/Nullability$NullableTemplatedReturn.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/Nullability$NullableTemplatedReturn.impl.java.js.txt @@ -36,7 +36,7 @@ class NullableTemplatedReturn { } } NullableTemplatedReturn.$markImplementor(/**@type {Function}*/ (NullableTemplatedReturn)); -$Util.$setClassMetadataForInterface(NullableTemplatedReturn, 'nullability.Nullability$NullableTemplatedReturn'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullableTemplatedReturn), 'nullability.Nullability$NullableTemplatedReturn'); exports = NullableTemplatedReturn; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/Nullability$StringList.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/Nullability$StringList.impl.java.js.txt index 28a81482d6..6e0381eb78 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/Nullability$StringList.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/Nullability$StringList.impl.java.js.txt @@ -28,7 +28,7 @@ class StringList { static $loadModules() {} } StringList.$markImplementor(/**@type {Function}*/ (StringList)); -$Util.$setClassMetadataForInterface(StringList, 'nullability.Nullability$StringList'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (StringList), 'nullability.Nullability$StringList'); exports = StringList; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$Consumer.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$Consumer.impl.java.js.txt index 5765ebff7c..2ad4fd6a10 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$Consumer.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$Consumer.impl.java.js.txt @@ -36,7 +36,7 @@ class Consumer { } } Consumer.$markImplementor(/**@type {Function}*/ (Consumer)); -$Util.$setClassMetadataForInterface(Consumer, 'nullability.defaultnotnullable.DefaultNotNullable$Consumer'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Consumer), 'nullability.defaultnotnullable.DefaultNotNullable$Consumer'); exports = Consumer; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NonNullBoundWithNonNullArgument.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NonNullBoundWithNonNullArgument.impl.java.js.txt index 50aba6a8d1..9aa245055c 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NonNullBoundWithNonNullArgument.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NonNullBoundWithNonNullArgument.impl.java.js.txt @@ -27,7 +27,7 @@ class NonNullBoundWithNonNullArgument { static $loadModules() {} } NonNullBoundWithNonNullArgument.$markImplementor(/**@type {Function}*/ (NonNullBoundWithNonNullArgument)); -$Util.$setClassMetadataForInterface(NonNullBoundWithNonNullArgument, 'nullability.defaultnotnullable.DefaultNotNullable$NonNullBoundWithNonNullArgument'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NonNullBoundWithNonNullArgument), 'nullability.defaultnotnullable.DefaultNotNullable$NonNullBoundWithNonNullArgument'); exports = NonNullBoundWithNonNullArgument; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NonNullBoundWithNullableArgument.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NonNullBoundWithNullableArgument.impl.java.js.txt index 362ec5be25..822a74f8b9 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NonNullBoundWithNullableArgument.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NonNullBoundWithNullableArgument.impl.java.js.txt @@ -27,7 +27,7 @@ class NonNullBoundWithNullableArgument { static $loadModules() {} } NonNullBoundWithNullableArgument.$markImplementor(/**@type {Function}*/ (NonNullBoundWithNullableArgument)); -$Util.$setClassMetadataForInterface(NonNullBoundWithNullableArgument, 'nullability.defaultnotnullable.DefaultNotNullable$NonNullBoundWithNullableArgument'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NonNullBoundWithNullableArgument), 'nullability.defaultnotnullable.DefaultNotNullable$NonNullBoundWithNullableArgument'); exports = NonNullBoundWithNullableArgument; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NonNullableBound.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NonNullableBound.impl.java.js.txt index 64eef83ec6..958cff6c83 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NonNullableBound.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NonNullableBound.impl.java.js.txt @@ -25,7 +25,7 @@ class NonNullableBound { static $loadModules() {} } NonNullableBound.$markImplementor(/**@type {Function}*/ (NonNullableBound)); -$Util.$setClassMetadataForInterface(NonNullableBound, 'nullability.defaultnotnullable.DefaultNotNullable$NonNullableBound'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NonNullableBound), 'nullability.defaultnotnullable.DefaultNotNullable$NonNullableBound'); exports = NonNullableBound; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NullableBound.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NullableBound.impl.java.js.txt index 69a26170b8..acce47f3d8 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NullableBound.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NullableBound.impl.java.js.txt @@ -25,7 +25,7 @@ class NullableBound { static $loadModules() {} } NullableBound.$markImplementor(/**@type {Function}*/ (NullableBound)); -$Util.$setClassMetadataForInterface(NullableBound, 'nullability.defaultnotnullable.DefaultNotNullable$NullableBound'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullableBound), 'nullability.defaultnotnullable.DefaultNotNullable$NullableBound'); exports = NullableBound; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NullableBoundWithNonNullArgument.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NullableBoundWithNonNullArgument.impl.java.js.txt index 982dbe8492..714c43a398 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NullableBoundWithNonNullArgument.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NullableBoundWithNonNullArgument.impl.java.js.txt @@ -27,7 +27,7 @@ class NullableBoundWithNonNullArgument { static $loadModules() {} } NullableBoundWithNonNullArgument.$markImplementor(/**@type {Function}*/ (NullableBoundWithNonNullArgument)); -$Util.$setClassMetadataForInterface(NullableBoundWithNonNullArgument, 'nullability.defaultnotnullable.DefaultNotNullable$NullableBoundWithNonNullArgument'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullableBoundWithNonNullArgument), 'nullability.defaultnotnullable.DefaultNotNullable$NullableBoundWithNonNullArgument'); exports = NullableBoundWithNonNullArgument; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NullableBoundWithNullableArgument.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NullableBoundWithNullableArgument.impl.java.js.txt index c0fa675d8f..fc22e18050 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NullableBoundWithNullableArgument.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$NullableBoundWithNullableArgument.impl.java.js.txt @@ -27,7 +27,7 @@ class NullableBoundWithNullableArgument { static $loadModules() {} } NullableBoundWithNullableArgument.$markImplementor(/**@type {Function}*/ (NullableBoundWithNullableArgument)); -$Util.$setClassMetadataForInterface(NullableBoundWithNullableArgument, 'nullability.defaultnotnullable.DefaultNotNullable$NullableBoundWithNullableArgument'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullableBoundWithNullableArgument), 'nullability.defaultnotnullable.DefaultNotNullable$NullableBoundWithNullableArgument'); exports = NullableBoundWithNullableArgument; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$ParameterizedInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$ParameterizedInterface.impl.java.js.txt index c72457d1d2..d376ea07ef 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$ParameterizedInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnotnullable/DefaultNotNullable$ParameterizedInterface.impl.java.js.txt @@ -29,7 +29,7 @@ class ParameterizedInterface { static $loadModules() {} } ParameterizedInterface.$markImplementor(/**@type {Function}*/ (ParameterizedInterface)); -$Util.$setClassMetadataForInterface(ParameterizedInterface, 'nullability.defaultnotnullable.DefaultNotNullable$ParameterizedInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (ParameterizedInterface), 'nullability.defaultnotnullable.DefaultNotNullable$ParameterizedInterface'); exports = ParameterizedInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$Consumer.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$Consumer.impl.java.js.txt index 7909dd6ae5..703d332bcb 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$Consumer.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$Consumer.impl.java.js.txt @@ -36,7 +36,7 @@ class Consumer { } } Consumer.$markImplementor(/**@type {Function}*/ (Consumer)); -$Util.$setClassMetadataForInterface(Consumer, 'nullability.defaultnullable.DefaultNullable$Consumer'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Consumer), 'nullability.defaultnullable.DefaultNullable$Consumer'); exports = Consumer; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NonNullBoundWithNonNullArgument.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NonNullBoundWithNonNullArgument.impl.java.js.txt index 6476e5f30e..0d40ee9dfc 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NonNullBoundWithNonNullArgument.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NonNullBoundWithNonNullArgument.impl.java.js.txt @@ -27,7 +27,7 @@ class NonNullBoundWithNonNullArgument { static $loadModules() {} } NonNullBoundWithNonNullArgument.$markImplementor(/**@type {Function}*/ (NonNullBoundWithNonNullArgument)); -$Util.$setClassMetadataForInterface(NonNullBoundWithNonNullArgument, 'nullability.defaultnullable.DefaultNullable$NonNullBoundWithNonNullArgument'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NonNullBoundWithNonNullArgument), 'nullability.defaultnullable.DefaultNullable$NonNullBoundWithNonNullArgument'); exports = NonNullBoundWithNonNullArgument; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NonNullBoundWithNullableArgument.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NonNullBoundWithNullableArgument.impl.java.js.txt index 52916e6ee7..887639aadd 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NonNullBoundWithNullableArgument.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NonNullBoundWithNullableArgument.impl.java.js.txt @@ -27,7 +27,7 @@ class NonNullBoundWithNullableArgument { static $loadModules() {} } NonNullBoundWithNullableArgument.$markImplementor(/**@type {Function}*/ (NonNullBoundWithNullableArgument)); -$Util.$setClassMetadataForInterface(NonNullBoundWithNullableArgument, 'nullability.defaultnullable.DefaultNullable$NonNullBoundWithNullableArgument'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NonNullBoundWithNullableArgument), 'nullability.defaultnullable.DefaultNullable$NonNullBoundWithNullableArgument'); exports = NonNullBoundWithNullableArgument; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NonNullableBound.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NonNullableBound.impl.java.js.txt index 5595bfc359..20e5799da5 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NonNullableBound.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NonNullableBound.impl.java.js.txt @@ -25,7 +25,7 @@ class NonNullableBound { static $loadModules() {} } NonNullableBound.$markImplementor(/**@type {Function}*/ (NonNullableBound)); -$Util.$setClassMetadataForInterface(NonNullableBound, 'nullability.defaultnullable.DefaultNullable$NonNullableBound'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NonNullableBound), 'nullability.defaultnullable.DefaultNullable$NonNullableBound'); exports = NonNullableBound; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullMarkedConsumer.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullMarkedConsumer.impl.java.js.txt index 036eb87e69..7374b0bd7c 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullMarkedConsumer.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullMarkedConsumer.impl.java.js.txt @@ -36,7 +36,7 @@ class NullMarkedConsumer { } } NullMarkedConsumer.$markImplementor(/**@type {Function}*/ (NullMarkedConsumer)); -$Util.$setClassMetadataForInterface(NullMarkedConsumer, 'nullability.defaultnullable.DefaultNullable$NullMarkedConsumer'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullMarkedConsumer), 'nullability.defaultnullable.DefaultNullable$NullMarkedConsumer'); exports = NullMarkedConsumer; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullMarkedIntFunction.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullMarkedIntFunction.impl.java.js.txt index 237e75850d..22833bf485 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullMarkedIntFunction.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullMarkedIntFunction.impl.java.js.txt @@ -36,7 +36,7 @@ class NullMarkedIntFunction { } } NullMarkedIntFunction.$markImplementor(/**@type {Function}*/ (NullMarkedIntFunction)); -$Util.$setClassMetadataForInterface(NullMarkedIntFunction, 'nullability.defaultnullable.DefaultNullable$NullMarkedIntFunction'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullMarkedIntFunction), 'nullability.defaultnullable.DefaultNullable$NullMarkedIntFunction'); exports = NullMarkedIntFunction; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullMarkedSupplier.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullMarkedSupplier.impl.java.js.txt index 873c0ebf5b..35e6a82bf2 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullMarkedSupplier.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullMarkedSupplier.impl.java.js.txt @@ -36,7 +36,7 @@ class NullMarkedSupplier { } } NullMarkedSupplier.$markImplementor(/**@type {Function}*/ (NullMarkedSupplier)); -$Util.$setClassMetadataForInterface(NullMarkedSupplier, 'nullability.defaultnullable.DefaultNullable$NullMarkedSupplier'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullMarkedSupplier), 'nullability.defaultnullable.DefaultNullable$NullMarkedSupplier'); exports = NullMarkedSupplier; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullableBound.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullableBound.impl.java.js.txt index fd4a2ee88c..1b1aa009dc 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullableBound.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullableBound.impl.java.js.txt @@ -25,7 +25,7 @@ class NullableBound { static $loadModules() {} } NullableBound.$markImplementor(/**@type {Function}*/ (NullableBound)); -$Util.$setClassMetadataForInterface(NullableBound, 'nullability.defaultnullable.DefaultNullable$NullableBound'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullableBound), 'nullability.defaultnullable.DefaultNullable$NullableBound'); exports = NullableBound; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullableBoundWithNonNullArgument.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullableBoundWithNonNullArgument.impl.java.js.txt index bc7271b9b0..b859ed0ef2 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullableBoundWithNonNullArgument.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullableBoundWithNonNullArgument.impl.java.js.txt @@ -27,7 +27,7 @@ class NullableBoundWithNonNullArgument { static $loadModules() {} } NullableBoundWithNonNullArgument.$markImplementor(/**@type {Function}*/ (NullableBoundWithNonNullArgument)); -$Util.$setClassMetadataForInterface(NullableBoundWithNonNullArgument, 'nullability.defaultnullable.DefaultNullable$NullableBoundWithNonNullArgument'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullableBoundWithNonNullArgument), 'nullability.defaultnullable.DefaultNullable$NullableBoundWithNonNullArgument'); exports = NullableBoundWithNonNullArgument; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullableBoundWithNullableArgument.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullableBoundWithNullableArgument.impl.java.js.txt index 41f0e7a6f7..79f8eada35 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullableBoundWithNullableArgument.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/defaultnullable/DefaultNullable$NullableBoundWithNullableArgument.impl.java.js.txt @@ -27,7 +27,7 @@ class NullableBoundWithNullableArgument { static $loadModules() {} } NullableBoundWithNullableArgument.$markImplementor(/**@type {Function}*/ (NullableBoundWithNullableArgument)); -$Util.$setClassMetadataForInterface(NullableBoundWithNullableArgument, 'nullability.defaultnullable.DefaultNullable$NullableBoundWithNullableArgument'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullableBoundWithNullableArgument), 'nullability.defaultnullable.DefaultNullable$NullableBoundWithNullableArgument'); exports = NullableBoundWithNullableArgument; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$Consumer.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$Consumer.impl.java.js.txt index c30adf2e1a..1e6747af1b 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$Consumer.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$Consumer.impl.java.js.txt @@ -36,7 +36,7 @@ class Consumer { } } Consumer.$markImplementor(/**@type {Function}*/ (Consumer)); -$Util.$setClassMetadataForInterface(Consumer, 'nullability.explicitnotnullable.ExplicitNotNullable$Consumer'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Consumer), 'nullability.explicitnotnullable.ExplicitNotNullable$Consumer'); exports = Consumer; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$Function.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$Function.impl.java.js.txt index c616c1a084..f5d53c5618 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$Function.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$Function.impl.java.js.txt @@ -36,7 +36,7 @@ class ExplicitNotNullable_Function { } } ExplicitNotNullable_Function.$markImplementor(/**@type {Function}*/ (ExplicitNotNullable_Function)); -$Util.$setClassMetadataForInterface(ExplicitNotNullable_Function, 'nullability.explicitnotnullable.ExplicitNotNullable$Function'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (ExplicitNotNullable_Function), 'nullability.explicitnotnullable.ExplicitNotNullable$Function'); exports = ExplicitNotNullable_Function; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$IntFunction.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$IntFunction.impl.java.js.txt index 5ded61f64a..841765644b 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$IntFunction.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$IntFunction.impl.java.js.txt @@ -36,7 +36,7 @@ class IntFunction { } } IntFunction.$markImplementor(/**@type {Function}*/ (IntFunction)); -$Util.$setClassMetadataForInterface(IntFunction, 'nullability.explicitnotnullable.ExplicitNotNullable$IntFunction'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (IntFunction), 'nullability.explicitnotnullable.ExplicitNotNullable$IntFunction'); exports = IntFunction; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NonNullBoundWithNonNullArgument.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NonNullBoundWithNonNullArgument.impl.java.js.txt index 47a91705c5..b6e1644a09 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NonNullBoundWithNonNullArgument.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NonNullBoundWithNonNullArgument.impl.java.js.txt @@ -27,7 +27,7 @@ class NonNullBoundWithNonNullArgument { static $loadModules() {} } NonNullBoundWithNonNullArgument.$markImplementor(/**@type {Function}*/ (NonNullBoundWithNonNullArgument)); -$Util.$setClassMetadataForInterface(NonNullBoundWithNonNullArgument, 'nullability.explicitnotnullable.ExplicitNotNullable$NonNullBoundWithNonNullArgument'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NonNullBoundWithNonNullArgument), 'nullability.explicitnotnullable.ExplicitNotNullable$NonNullBoundWithNonNullArgument'); exports = NonNullBoundWithNonNullArgument; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NonNullBoundWithNullableArgument.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NonNullBoundWithNullableArgument.impl.java.js.txt index 85403f2d25..7afa1bc0c0 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NonNullBoundWithNullableArgument.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NonNullBoundWithNullableArgument.impl.java.js.txt @@ -27,7 +27,7 @@ class NonNullBoundWithNullableArgument { static $loadModules() {} } NonNullBoundWithNullableArgument.$markImplementor(/**@type {Function}*/ (NonNullBoundWithNullableArgument)); -$Util.$setClassMetadataForInterface(NonNullBoundWithNullableArgument, 'nullability.explicitnotnullable.ExplicitNotNullable$NonNullBoundWithNullableArgument'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NonNullBoundWithNullableArgument), 'nullability.explicitnotnullable.ExplicitNotNullable$NonNullBoundWithNullableArgument'); exports = NonNullBoundWithNullableArgument; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NonNullableBound.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NonNullableBound.impl.java.js.txt index 13edf6707d..43e29cf95b 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NonNullableBound.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NonNullableBound.impl.java.js.txt @@ -25,7 +25,7 @@ class NonNullableBound { static $loadModules() {} } NonNullableBound.$markImplementor(/**@type {Function}*/ (NonNullableBound)); -$Util.$setClassMetadataForInterface(NonNullableBound, 'nullability.explicitnotnullable.ExplicitNotNullable$NonNullableBound'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NonNullableBound), 'nullability.explicitnotnullable.ExplicitNotNullable$NonNullableBound'); exports = NonNullableBound; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NullableBound.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NullableBound.impl.java.js.txt index ee9d5d5548..b8ef748440 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NullableBound.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NullableBound.impl.java.js.txt @@ -25,7 +25,7 @@ class NullableBound { static $loadModules() {} } NullableBound.$markImplementor(/**@type {Function}*/ (NullableBound)); -$Util.$setClassMetadataForInterface(NullableBound, 'nullability.explicitnotnullable.ExplicitNotNullable$NullableBound'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullableBound), 'nullability.explicitnotnullable.ExplicitNotNullable$NullableBound'); exports = NullableBound; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NullableBoundWithNonNullArgument.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NullableBoundWithNonNullArgument.impl.java.js.txt index ad6716715b..0075cfce90 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NullableBoundWithNonNullArgument.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NullableBoundWithNonNullArgument.impl.java.js.txt @@ -27,7 +27,7 @@ class NullableBoundWithNonNullArgument { static $loadModules() {} } NullableBoundWithNonNullArgument.$markImplementor(/**@type {Function}*/ (NullableBoundWithNonNullArgument)); -$Util.$setClassMetadataForInterface(NullableBoundWithNonNullArgument, 'nullability.explicitnotnullable.ExplicitNotNullable$NullableBoundWithNonNullArgument'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullableBoundWithNonNullArgument), 'nullability.explicitnotnullable.ExplicitNotNullable$NullableBoundWithNonNullArgument'); exports = NullableBoundWithNonNullArgument; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NullableBoundWithNullableArgument.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NullableBoundWithNullableArgument.impl.java.js.txt index a9fbaa4c1f..cf88d83425 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NullableBoundWithNullableArgument.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$NullableBoundWithNullableArgument.impl.java.js.txt @@ -27,7 +27,7 @@ class NullableBoundWithNullableArgument { static $loadModules() {} } NullableBoundWithNullableArgument.$markImplementor(/**@type {Function}*/ (NullableBoundWithNullableArgument)); -$Util.$setClassMetadataForInterface(NullableBoundWithNullableArgument, 'nullability.explicitnotnullable.ExplicitNotNullable$NullableBoundWithNullableArgument'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (NullableBoundWithNullableArgument), 'nullability.explicitnotnullable.ExplicitNotNullable$NullableBoundWithNullableArgument'); exports = NullableBoundWithNullableArgument; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$Supplier.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$Supplier.impl.java.js.txt index 66937d31a8..cf6a99fafc 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$Supplier.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/nullability/output_closure/explicitnotnullable/ExplicitNotNullable$Supplier.impl.java.js.txt @@ -36,7 +36,7 @@ class Supplier { } } Supplier.$markImplementor(/**@type {Function}*/ (Supplier)); -$Util.$setClassMetadataForInterface(Supplier, 'nullability.explicitnotnullable.ExplicitNotNullable$Supplier'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Supplier), 'nullability.explicitnotnullable.ExplicitNotNullable$Supplier'); exports = Supplier; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/overridingmethods/output_closure/SomeInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/overridingmethods/output_closure/SomeInterface.impl.java.js.txt index c8324bb74d..612072b3d7 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/overridingmethods/output_closure/SomeInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/overridingmethods/output_closure/SomeInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class SomeInterface { } } SomeInterface.$markImplementor(/**@type {Function}*/ (SomeInterface)); -$Util.$setClassMetadataForInterface(SomeInterface, 'overridingmethods.SomeInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (SomeInterface), 'overridingmethods.SomeInterface'); exports = SomeInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/HashFunction.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/HashFunction.impl.java.js.txt index d28da76e93..b70025f9e6 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/HashFunction.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/HashFunction.impl.java.js.txt @@ -37,7 +37,7 @@ class HashFunction { } } HashFunction.$markImplementor(/**@type {Function}*/ (HashFunction)); -$Util.$setClassMetadataForInterface(HashFunction, 'overwrittentypevariables.HashFunction'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (HashFunction), 'overwrittentypevariables.HashFunction'); exports = HashFunction; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/MyFunction.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/MyFunction.impl.java.js.txt index 75b3ae2929..947ea83d1d 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/MyFunction.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/MyFunction.impl.java.js.txt @@ -36,7 +36,7 @@ class MyFunction { } } MyFunction.$markImplementor(/**@type {Function}*/ (MyFunction)); -$Util.$setClassMetadataForInterface(MyFunction, 'overwrittentypevariables.MyFunction'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (MyFunction), 'overwrittentypevariables.MyFunction'); exports = MyFunction; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/ParameterizedType.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/ParameterizedType.impl.java.js.txt index cdbbc715cc..9a82a5e4ab 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/ParameterizedType.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/ParameterizedType.impl.java.js.txt @@ -39,7 +39,7 @@ class ParameterizedType { } } ParameterizedType.$markImplementor(/**@type {Function}*/ (ParameterizedType)); -$Util.$setClassMetadataForInterface(ParameterizedType, 'overwrittentypevariables.ParameterizedType'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (ParameterizedType), 'overwrittentypevariables.ParameterizedType'); exports = ParameterizedType; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/otherpkg/ParameterizedType.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/otherpkg/ParameterizedType.impl.java.js.txt index d6789e52f9..2b428ceaba 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/otherpkg/ParameterizedType.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/overwrittentypevariables/output_closure/otherpkg/ParameterizedType.impl.java.js.txt @@ -36,7 +36,7 @@ class ParameterizedType { } } ParameterizedType.$markImplementor(/**@type {Function}*/ (ParameterizedType)); -$Util.$setClassMetadataForInterface(ParameterizedType, 'overwrittentypevariables.otherpkg.ParameterizedType'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (ParameterizedType), 'overwrittentypevariables.otherpkg.ParameterizedType'); exports = ParameterizedType; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/packageprivatemethods/output_closure/package1/Interface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/packageprivatemethods/output_closure/package1/Interface.impl.java.js.txt index c6c15e8020..a54da8af55 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/packageprivatemethods/output_closure/package1/Interface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/packageprivatemethods/output_closure/package1/Interface.impl.java.js.txt @@ -35,7 +35,7 @@ class Interface { } } Interface.$markImplementor(/**@type {Function}*/ (Interface)); -$Util.$setClassMetadataForInterface(Interface, 'packageprivatemethods.package1.Interface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Interface), 'packageprivatemethods.package1.Interface'); exports = Interface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/parameterassignments/output_closure/Main$Fn.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/parameterassignments/output_closure/Main$Fn.impl.java.js.txt index 45cb3a84ad..2f38ef1b1e 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/parameterassignments/output_closure/Main$Fn.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/parameterassignments/output_closure/Main$Fn.impl.java.js.txt @@ -35,7 +35,7 @@ class Fn { } } Fn.$markImplementor(/**@type {Function}*/ (Fn)); -$Util.$setClassMetadataForInterface(Fn, 'parameterassignments.Main$Fn'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Fn), 'parameterassignments.Main$Fn'); exports = Fn; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/parameterassignments/output_closure/Main$FnObjectVarargs.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/parameterassignments/output_closure/Main$FnObjectVarargs.impl.java.js.txt index ada867ea5d..93e90a0f2f 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/parameterassignments/output_closure/Main$FnObjectVarargs.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/parameterassignments/output_closure/Main$FnObjectVarargs.impl.java.js.txt @@ -35,7 +35,7 @@ class FnObjectVarargs { } } FnObjectVarargs.$markImplementor(/**@type {Function}*/ (FnObjectVarargs)); -$Util.$setClassMetadataForInterface(FnObjectVarargs, 'parameterassignments.Main$FnObjectVarargs'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (FnObjectVarargs), 'parameterassignments.Main$FnObjectVarargs'); exports = FnObjectVarargs; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/parameterassignments/output_closure/Main$FnPrimitiveVarargs.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/parameterassignments/output_closure/Main$FnPrimitiveVarargs.impl.java.js.txt index 88c7c0b372..7a4719904b 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/parameterassignments/output_closure/Main$FnPrimitiveVarargs.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/parameterassignments/output_closure/Main$FnPrimitiveVarargs.impl.java.js.txt @@ -35,7 +35,7 @@ class FnPrimitiveVarargs { } } FnPrimitiveVarargs.$markImplementor(/**@type {Function}*/ (FnPrimitiveVarargs)); -$Util.$setClassMetadataForInterface(FnPrimitiveVarargs, 'parameterassignments.Main$FnPrimitiveVarargs'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (FnPrimitiveVarargs), 'parameterassignments.Main$FnPrimitiveVarargs'); exports = FnPrimitiveVarargs; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/protobuf/output_closure/com/google/protobuf/EnumLite.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/protobuf/output_closure/com/google/protobuf/EnumLite.impl.java.js.txt index 60207bc641..fb89cebc31 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/protobuf/output_closure/com/google/protobuf/EnumLite.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/protobuf/output_closure/com/google/protobuf/EnumLite.impl.java.js.txt @@ -35,7 +35,7 @@ class EnumLite { } } EnumLite.$markImplementor(/**@type {Function}*/ (EnumLite)); -$Util.$setClassMetadataForInterface(EnumLite, 'com.google.protobuf.EnumLite'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (EnumLite), 'com.google.protobuf.EnumLite'); exports = EnumLite; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/protobuf/output_closure/com/google/protobuf/Internal$ProtoNonnullApi.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/protobuf/output_closure/com/google/protobuf/Internal$ProtoNonnullApi.impl.java.js.txt index 6c6428a28b..00987f0353 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/protobuf/output_closure/com/google/protobuf/Internal$ProtoNonnullApi.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/protobuf/output_closure/com/google/protobuf/Internal$ProtoNonnullApi.impl.java.js.txt @@ -27,7 +27,7 @@ class ProtoNonnullApi { static $loadModules() {} } ProtoNonnullApi.$markImplementor(/**@type {Function}*/ (ProtoNonnullApi)); -$Util.$setClassMetadataForInterface(ProtoNonnullApi, 'com.google.protobuf.Internal$ProtoNonnullApi'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (ProtoNonnullApi), 'com.google.protobuf.Internal$ProtoNonnullApi'); exports = ProtoNonnullApi; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/rawtype/output_closure/RawType$GenericSuperclass.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/rawtype/output_closure/RawType$GenericSuperclass.impl.java.js.txt index aff2766b4d..f9cd18e837 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/rawtype/output_closure/RawType$GenericSuperclass.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/rawtype/output_closure/RawType$GenericSuperclass.impl.java.js.txt @@ -33,7 +33,7 @@ class GenericSuperclass { static $loadModules() {} } GenericSuperclass.$markImplementor(/**@type {Function}*/ (GenericSuperclass)); -$Util.$setClassMetadataForInterface(GenericSuperclass, 'rawtype.RawType$GenericSuperclass'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (GenericSuperclass), 'rawtype.RawType$GenericSuperclass'); exports = GenericSuperclass; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/simplebridgemethods/output_closure/Callable.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/simplebridgemethods/output_closure/Callable.impl.java.js.txt index a7cbd12657..96f9270e84 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/simplebridgemethods/output_closure/Callable.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/simplebridgemethods/output_closure/Callable.impl.java.js.txt @@ -36,7 +36,7 @@ class Callable { } } Callable.$markImplementor(/**@type {Function}*/ (Callable)); -$Util.$setClassMetadataForInterface(Callable, 'simplebridgemethods.Callable'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Callable), 'simplebridgemethods.Callable'); exports = Callable; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/simplegenericinterface/output_closure/SimpleGenericInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/simplegenericinterface/output_closure/SimpleGenericInterface.impl.java.js.txt index c1db57253d..e0771897c8 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/simplegenericinterface/output_closure/SimpleGenericInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/simplegenericinterface/output_closure/SimpleGenericInterface.impl.java.js.txt @@ -36,7 +36,7 @@ class SimpleGenericInterface { } } SimpleGenericInterface.$markImplementor(/**@type {Function}*/ (SimpleGenericInterface)); -$Util.$setClassMetadataForInterface(SimpleGenericInterface, 'simplegenericinterface.SimpleGenericInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (SimpleGenericInterface), 'simplegenericinterface.SimpleGenericInterface'); exports = SimpleGenericInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/GrandParentInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/GrandParentInterface.impl.java.js.txt index 863eda2581..a7c251369a 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/GrandParentInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/GrandParentInterface.impl.java.js.txt @@ -30,7 +30,7 @@ class GrandParentInterface { static $loadModules() {} } GrandParentInterface.$markImplementor(/**@type {Function}*/ (GrandParentInterface)); -$Util.$setClassMetadataForInterface(GrandParentInterface, 'supermethodcall.GrandParentInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (GrandParentInterface), 'supermethodcall.GrandParentInterface'); exports = GrandParentInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/I1.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/I1.impl.java.js.txt index 0ddc5d9bfd..bd12fa6766 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/I1.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/I1.impl.java.js.txt @@ -30,7 +30,7 @@ class I1 { static $loadModules() {} } I1.$markImplementor(/**@type {Function}*/ (I1)); -$Util.$setClassMetadataForInterface(I1, 'supermethodcall.I1'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (I1), 'supermethodcall.I1'); exports = I1; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/I2.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/I2.impl.java.js.txt index 1186000816..6616dd3ef0 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/I2.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/I2.impl.java.js.txt @@ -35,7 +35,7 @@ class I2 { } } I2.$markImplementor(/**@type {Function}*/ (I2)); -$Util.$setClassMetadataForInterface(I2, 'supermethodcall.I2'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (I2), 'supermethodcall.I2'); exports = I2; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/I3.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/I3.impl.java.js.txt index b88fda8910..2918a3f705 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/I3.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/I3.impl.java.js.txt @@ -28,7 +28,7 @@ class I3 { static $loadModules() {} } I3.$markImplementor(/**@type {Function}*/ (I3)); -$Util.$setClassMetadataForInterface(I3, 'supermethodcall.I3'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (I3), 'supermethodcall.I3'); exports = I3; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/ParentInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/ParentInterface.impl.java.js.txt index fd6b5a80c3..9de4ab5a1e 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/ParentInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/supermethodcall/output_closure/ParentInterface.impl.java.js.txt @@ -30,7 +30,7 @@ class ParentInterface { static $loadModules() {} } ParentInterface.$markImplementor(/**@type {Function}*/ (ParentInterface)); -$Util.$setClassMetadataForInterface(ParentInterface, 'supermethodcall.ParentInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (ParentInterface), 'supermethodcall.ParentInterface'); exports = ParentInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/DeepRecursiveType.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/DeepRecursiveType.impl.java.js.txt index 9fe231000f..fbe36899fe 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/DeepRecursiveType.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/DeepRecursiveType.impl.java.js.txt @@ -25,7 +25,7 @@ class DeepRecursiveType { static $loadModules() {} } DeepRecursiveType.$markImplementor(/**@type {Function}*/ (DeepRecursiveType)); -$Util.$setClassMetadataForInterface(DeepRecursiveType, 'typewildcards.DeepRecursiveType'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (DeepRecursiveType), 'typewildcards.DeepRecursiveType'); exports = DeepRecursiveType; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/Function.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/Function.impl.java.js.txt index 7904137a09..e421679cb4 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/Function.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/Function.impl.java.js.txt @@ -36,7 +36,7 @@ class typewildcards_Function { } } typewildcards_Function.$markImplementor(/**@type {Function}*/ (typewildcards_Function)); -$Util.$setClassMetadataForInterface(typewildcards_Function, 'typewildcards.Function'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (typewildcards_Function), 'typewildcards.Function'); exports = typewildcards_Function; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/List.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/List.impl.java.js.txt index d6469b8986..e9d95391b4 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/List.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/List.impl.java.js.txt @@ -25,7 +25,7 @@ class List { static $loadModules() {} } List.$markImplementor(/**@type {Function}*/ (List)); -$Util.$setClassMetadataForInterface(List, 'typewildcards.List'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (List), 'typewildcards.List'); exports = List; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$HasKey.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$HasKey.impl.java.js.txt index 536a3af0c2..83e8978f2e 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$HasKey.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$HasKey.impl.java.js.txt @@ -35,7 +35,7 @@ class HasKey { } } HasKey.$markImplementor(/**@type {Function}*/ (HasKey)); -$Util.$setClassMetadataForInterface(HasKey, 'typewildcards.TypeWildCards$HasKey'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (HasKey), 'typewildcards.TypeWildCards$HasKey'); exports = HasKey; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$IntegerSupplier.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$IntegerSupplier.impl.java.js.txt index cc57ab6ed4..6c14dca9d1 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$IntegerSupplier.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$IntegerSupplier.impl.java.js.txt @@ -36,7 +36,7 @@ class IntegerSupplier { } } IntegerSupplier.$markImplementor(/**@type {Function}*/ (IntegerSupplier)); -$Util.$setClassMetadataForInterface(IntegerSupplier, 'typewildcards.TypeWildCards$IntegerSupplier'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (IntegerSupplier), 'typewildcards.TypeWildCards$IntegerSupplier'); exports = IntegerSupplier; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$RecursiveInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$RecursiveInterface.impl.java.js.txt index 5a762fc688..4f349395bc 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$RecursiveInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$RecursiveInterface.impl.java.js.txt @@ -36,7 +36,7 @@ class RecursiveInterface { } } RecursiveInterface.$markImplementor(/**@type {Function}*/ (RecursiveInterface)); -$Util.$setClassMetadataForInterface(RecursiveInterface, 'typewildcards.TypeWildCards$RecursiveInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (RecursiveInterface), 'typewildcards.TypeWildCards$RecursiveInterface'); exports = RecursiveInterface; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$X.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$X.impl.java.js.txt index bfa79608d4..8aff5ae93f 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$X.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$X.impl.java.js.txt @@ -35,7 +35,7 @@ class X { } } X.$markImplementor(/**@type {Function}*/ (X)); -$Util.$setClassMetadataForInterface(X, 'typewildcards.TypeWildCards$X'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (X), 'typewildcards.TypeWildCards$X'); exports = X; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$Y.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$Y.impl.java.js.txt index 906862329b..96a8cff863 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$Y.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards$Y.impl.java.js.txt @@ -35,7 +35,7 @@ class Y { } } Y.$markImplementor(/**@type {Function}*/ (Y)); -$Util.$setClassMetadataForInterface(Y, 'typewildcards.TypeWildCards$Y'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (Y), 'typewildcards.TypeWildCards$Y'); exports = Y; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards.impl.java.js.txt index 00301b6773..9cd6a9461a 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/typewildcards/output_closure/TypeWildCards.impl.java.js.txt @@ -72,7 +72,7 @@ class TypeWildCards extends j_l_Object { TypeWildCards.$clinit(); let i = /**@type {!A}*/ (t).f_f__typewildcards_TypeWildCards_A; /**@type {!A}*/ (t).m_m__void(); - /**@type {!Y}*/ ($Casts.$to(t, Y)).m_n__void(); + /**@type {!Y}*/ ($Casts.$to(t, /**@type {Function}*/ (Y))).m_n__void(); } /** @nodts @template F, V @return {List} */ static m_transform__typewildcards_List__typewildcards_Function__typewildcards_List(/** List */ from, /** typewildcards_Function */ function_1) { @@ -87,8 +87,8 @@ class TypeWildCards extends j_l_Object { let elements = null; let otherElements = null; let integers = /**@type {List}*/ (TypeWildCards.m_transform__typewildcards_List__typewildcards_Function__typewildcards_List(/**@type {List<*>}*/ (TypeWildCards.m_concat__typewildcards_List__typewildcards_List__typewildcards_List(elements, otherElements)), typewildcards_Function.$adapt((/** ? */ a) =>{ - /**@type {!HasKey}*/ ($Casts.$to(a, HasKey)).m_getKey__java_lang_String(); - return /**@type {!IntegerSupplier}*/ ($Casts.$to(a, IntegerSupplier)).m_get__java_lang_Integer(); + /**@type {!HasKey}*/ ($Casts.$to(a, /**@type {Function}*/ (HasKey))).m_getKey__java_lang_String(); + return /**@type {!IntegerSupplier}*/ ($Casts.$to(a, /**@type {Function}*/ (IntegerSupplier))).m_get__java_lang_Integer(); }))); } /** @nodts */ diff --git a/transpiler/javatests/com/google/j2cl/readable/java/unimplementedbridgemethod/output_closure/I.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/unimplementedbridgemethod/output_closure/I.impl.java.js.txt index b9b785c8c5..f20baafc85 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/unimplementedbridgemethod/output_closure/I.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/unimplementedbridgemethod/output_closure/I.impl.java.js.txt @@ -41,7 +41,7 @@ class I { } } I.$markImplementor(/**@type {Function}*/ (I)); -$Util.$setClassMetadataForInterface(I, 'unimplementedbridgemethod.I'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (I), 'unimplementedbridgemethod.I'); exports = I; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/unimplementedbridgemethod/output_closure/J.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/unimplementedbridgemethod/output_closure/J.impl.java.js.txt index ba7a5708b2..0094c29626 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/unimplementedbridgemethod/output_closure/J.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/unimplementedbridgemethod/output_closure/J.impl.java.js.txt @@ -36,7 +36,7 @@ class J { } } J.$markImplementor(/**@type {Function}*/ (J)); -$Util.$setClassMetadataForInterface(J, 'unimplementedbridgemethod.J'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (J), 'unimplementedbridgemethod.J'); exports = J; diff --git a/transpiler/javatests/com/google/j2cl/readable/java/varargs/output_closure/Varargs$FunctionalInterface.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/varargs/output_closure/Varargs$FunctionalInterface.impl.java.js.txt index 54c5bc5da2..9ef34556b4 100644 --- a/transpiler/javatests/com/google/j2cl/readable/java/varargs/output_closure/Varargs$FunctionalInterface.impl.java.js.txt +++ b/transpiler/javatests/com/google/j2cl/readable/java/varargs/output_closure/Varargs$FunctionalInterface.impl.java.js.txt @@ -35,7 +35,7 @@ class FunctionalInterface { } } FunctionalInterface.$markImplementor(/**@type {Function}*/ (FunctionalInterface)); -$Util.$setClassMetadataForInterface(FunctionalInterface, 'varargs.Varargs$FunctionalInterface'); +$Util.$setClassMetadataForInterface(/**@type {Function}*/ (FunctionalInterface), 'varargs.Varargs$FunctionalInterface'); exports = FunctionalInterface;