diff --git a/rewrite-javascript/src/main/java/org/openrewrite/javascript/JavaScriptVisitor.java b/rewrite-javascript/src/main/java/org/openrewrite/javascript/JavaScriptVisitor.java index d442b673..06d4160b 100644 --- a/rewrite-javascript/src/main/java/org/openrewrite/javascript/JavaScriptVisitor.java +++ b/rewrite-javascript/src/main/java/org/openrewrite/javascript/JavaScriptVisitor.java @@ -268,7 +268,6 @@ public J visitFunctionType(JS.FunctionType functionType, P p) { f = f.getPadding().withConstructorType(Objects.requireNonNull(visitLeftPadded(f.getPadding().getConstructorType(), JsLeftPadded.Location.FUNCTION_TYPE_CONSTRUCTOR, p))); f = f.withTypeParameters(visitAndCast(f.getTypeParameters(), p)); f = f.getPadding().withParameters(Objects.requireNonNull(visitContainer(f.getPadding().getParameters(), JsContainer.Location.FUNCTION_TYPE_PARAMETERS, p))); - f = f.withParameters(Objects.requireNonNull(ListUtils.map(f.getParameters(), e -> visitAndCast(e, p)))); f = f.getPadding().withReturnType((Objects.requireNonNull(visitLeftPadded(f.getPadding().getReturnType(), JsLeftPadded.Location.FUNCTION_TYPE_RETURN_TYPE, p)))); f = f.withType(visitType(f.getType(), p)); return f; @@ -1042,7 +1041,7 @@ public J visitFunctionDeclaration(JS.FunctionDeclaration functionDeclaration, P f = f.getPadding().withAsteriskToken(Objects.requireNonNull(visitLeftPadded(f.getPadding().getAsteriskToken(), JsLeftPadded.Location.FUNCTION_DECLARATION_ASTERISK_TOKEN, p))); f = f.getPadding().withName(Objects.requireNonNull(visitLeftPadded(f.getPadding().getName(), JsLeftPadded.Location.FUNCTION_DECLARATION_NAME, p))); f = f.withTypeParameters(visitAndCast(f.getTypeParameters(), p)); - f = f.getPadding().withParameters(Objects.requireNonNull(visitContainer(f.getPadding().getParameters(), JContainer.Location.METHOD_DECLARATION_PARAMETERS, p))); + f = f.getPadding().withParameters(Objects.requireNonNull(visitContainer(f.getPadding().getParameters(), JsContainer.Location.FUNCTION_DECLARATION_PARAMETERS, p))); f = f.withReturnTypeExpression(visitAndCast(f.getReturnTypeExpression(), p)); f = f.withBody(visitAndCast(f.getBody(), p)); f = f.withType(visitType(f.getType(), p)); diff --git a/rewrite-javascript/src/main/java/org/openrewrite/javascript/internal/JavaScriptPrinter.java b/rewrite-javascript/src/main/java/org/openrewrite/javascript/internal/JavaScriptPrinter.java index 4a49dce3..cde378b2 100644 --- a/rewrite-javascript/src/main/java/org/openrewrite/javascript/internal/JavaScriptPrinter.java +++ b/rewrite-javascript/src/main/java/org/openrewrite/javascript/internal/JavaScriptPrinter.java @@ -887,7 +887,7 @@ public J visitFunctionDeclaration(JS.FunctionDeclaration functionDeclaration, Pr p.append(">"); } - visitContainer("(", functionDeclaration.getPadding().getParameters(), JsContainer.Location.JSMETHOD_DECLARATION_PARAMETERS, ",", ")", p); + visitContainer("(", functionDeclaration.getPadding().getParameters(), JsContainer.Location.FUNCTION_DECLARATION_PARAMETERS, ",", ")", p); if (functionDeclaration.getReturnTypeExpression() != null) { visit(functionDeclaration.getReturnTypeExpression(), p); } diff --git a/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsContainer.java b/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsContainer.java index 9ec658fe..0377bf85 100644 --- a/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsContainer.java +++ b/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsContainer.java @@ -23,6 +23,7 @@ public enum Location { ARRAY_LITERAL_EXPRESSION(JsSpace.Location.ARRAY_LITERAL_ELEMENTS, JsRightPadded.Location.ARRAY_LITERAL_ELEMENT_SUFFIX), BINDING_ELEMENT(JsSpace.Location.BINDING_ELEMENTS, JsRightPadded.Location.BINDING_ELEMENT), EXPORT_ELEMENT(JsSpace.Location.EXPORT_ELEMENTS, JsRightPadded.Location.EXPORT_ELEMENT_SUFFIX), + FUNCTION_DECLARATION_PARAMETERS(JsSpace.Location.FUNCTION_DECLARATION_PARAMETERS, JsRightPadded.Location.FUNCTION_DECLARATION_PARAMETERS_SUFFIX), FUNCTION_TYPE_PARAMETERS(JsSpace.Location.FUNCTION_TYPE_PARAMETERS, JsRightPadded.Location.FUNCTION_TYPE_PARAMETERS_SUFFIX), IMPORT_ELEMENT(JsSpace.Location.IMPORT_ELEMENTS, JsRightPadded.Location.IMPORT_ELEMENT_SUFFIX), TUPLE_ELEMENT(JsSpace.Location.TUPLE_ELEMENT, JsRightPadded.Location.TUPLE_ELEMENT_SUFFIX), diff --git a/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsRightPadded.java b/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsRightPadded.java index d0f3073f..0fd1f108 100644 --- a/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsRightPadded.java +++ b/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsRightPadded.java @@ -25,6 +25,7 @@ public enum Location { BINDING_ELEMENT(JsSpace.Location.BINDING_ELEMENT_SUFFIX), BINDING_ELEMENT_PROPERTY_NAME(JsSpace.Location.BINDING_ELEMENT_PROPERTY_NAME_SUFFIX), EXPORT_ELEMENT_SUFFIX(JsSpace.Location.EXPORT_ELEMENT_SUFFIX), + FUNCTION_DECLARATION_PARAMETERS_SUFFIX(JsSpace.Location.FUNCTION_DECLARATION_PARAMETERS_SUFFIX), FUNCTION_TYPE_PARAMETERS_SUFFIX(JsSpace.Location.FUNCTION_TYPE_PARAMETERS_SUFFIX), IMPORT_ELEMENT_SUFFIX(JsSpace.Location.IMPORT_ELEMENT_SUFFIX), IMPORT_NAME_SUFFIX(JsSpace.Location.IMPORT_NAME_SUFFIX), diff --git a/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsSpace.java b/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsSpace.java index ace1661f..c82972bd 100644 --- a/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsSpace.java +++ b/rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsSpace.java @@ -143,6 +143,8 @@ public enum Location { EXPORT_ASSIGNMENT_EXPORT_EQUALS_PREFIX, FUNCTION_DECLARATION_NAME_PREFIX, FUNCTION_DECLARATION_ASTERISK_TOKEN_PREFIX, + FUNCTION_DECLARATION_PARAMETERS, + FUNCTION_DECLARATION_PARAMETERS_SUFFIX, INDEXED_ACCESS_TYPE_PREFIX, INDEXED_ACCESS_TYPE_INDEX_TYPE_SUFFIX, INDEXED_ACCESS_TYPE_INDEX_TYPE_PREFIX,