diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java index 300ffd456fc..9c829a455f7 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java @@ -13,7 +13,6 @@ import org.jetbrains.annotations.NotNull; public final class JsParameter extends SourceInfoAwareJsNode implements HasName { @NotNull private final JsName name; - private boolean hasDefaultValue = false; public JsParameter(@NotNull JsName name) { this.name = name; @@ -31,14 +30,6 @@ public final class JsParameter extends SourceInfoAwareJsNode implements HasName return name; } - public boolean hasDefaultValue() { - return hasDefaultValue; - } - - public void setHasDefaultValue(boolean hasDefaultValue) { - this.hasDefaultValue = hasDefaultValue; - } - @Override public void accept(JsVisitor v) { v.visitParameter(this); @@ -53,8 +44,6 @@ public final class JsParameter extends SourceInfoAwareJsNode implements HasName @NotNull @Override public JsParameter deepCopy() { - JsParameter parameter = new JsParameter(name); - parameter.setHasDefaultValue(hasDefaultValue); - return parameter.withMetadataFrom(this); + return new JsParameter(name).withMetadataFrom(this); } } diff --git a/js/js.inliner/src/org/jetbrains/k2js/inline/clean/removeDefaultInitializers.kt b/js/js.inliner/src/org/jetbrains/k2js/inline/clean/removeDefaultInitializers.kt index ca5505b83dc..88358e83613 100644 --- a/js/js.inliner/src/org/jetbrains/k2js/inline/clean/removeDefaultInitializers.kt +++ b/js/js.inliner/src/org/jetbrains/k2js/inline/clean/removeDefaultInitializers.kt @@ -17,6 +17,7 @@ package org.jetbrains.k2js.inline.clean import com.google.dart.compiler.backend.js.ast.* +import com.google.dart.compiler.backend.js.ast.metadata.hasDefaultValue import org.jetbrains.k2js.inline.util.toIdentitySet import org.jetbrains.k2js.inline.util.zipWithDefault @@ -117,7 +118,7 @@ private fun getDefaultParamsNames( val argsParams = args.zipWithDefault(params, Namer.UNDEFINED_EXPRESSION) val relevantParams = argsParams.stream() - .filter { it.second.hasDefaultValue() } + .filter { it.second.hasDefaultValue } .filter { initialized == !isUndefined(it.first) } val names = relevantParams.map { it.second.getName() } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java index e6285662ad8..d757a56e6f8 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java @@ -17,10 +17,8 @@ package org.jetbrains.k2js.translate.expression; -import com.google.dart.compiler.backend.js.ast.JsFunction; -import com.google.dart.compiler.backend.js.ast.JsName; -import com.google.dart.compiler.backend.js.ast.JsParameter; -import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer; +import com.google.dart.compiler.backend.js.ast.*; +import com.google.dart.compiler.backend.js.ast.metadata.MetadataPackage; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -131,7 +129,7 @@ public final class FunctionTranslator extends AbstractTranslator { public static void addParameters(List list, FunctionDescriptor descriptor, TranslationContext context) { for (ValueParameterDescriptor valueParameter : descriptor.getValueParameters()) { JsParameter jsParameter = new JsParameter(context.getNameForDescriptor(valueParameter)); - jsParameter.setHasDefaultValue(valueParameter.hasDefaultValue()); + MetadataPackage.setHasDefaultValue(jsParameter, valueParameter.hasDefaultValue()); list.add(jsParameter); } }