Skip to content
This repository was archived by the owner on May 12, 2025. It is now read-only.

Commit 4205137

Browse files
authored
Fixed names in Location enum (#207)
1 parent 58091ab commit 4205137

File tree

5 files changed

+6
-3
lines changed

5 files changed

+6
-3
lines changed

rewrite-javascript/src/main/java/org/openrewrite/javascript/JavaScriptVisitor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ public J visitFunctionType(JS.FunctionType functionType, P p) {
268268
f = f.getPadding().withConstructorType(Objects.requireNonNull(visitLeftPadded(f.getPadding().getConstructorType(), JsLeftPadded.Location.FUNCTION_TYPE_CONSTRUCTOR, p)));
269269
f = f.withTypeParameters(visitAndCast(f.getTypeParameters(), p));
270270
f = f.getPadding().withParameters(Objects.requireNonNull(visitContainer(f.getPadding().getParameters(), JsContainer.Location.FUNCTION_TYPE_PARAMETERS, p)));
271-
f = f.withParameters(Objects.requireNonNull(ListUtils.map(f.getParameters(), e -> visitAndCast(e, p))));
272271
f = f.getPadding().withReturnType((Objects.requireNonNull(visitLeftPadded(f.getPadding().getReturnType(), JsLeftPadded.Location.FUNCTION_TYPE_RETURN_TYPE, p))));
273272
f = f.withType(visitType(f.getType(), p));
274273
return f;
@@ -1042,7 +1041,7 @@ public J visitFunctionDeclaration(JS.FunctionDeclaration functionDeclaration, P
10421041
f = f.getPadding().withAsteriskToken(Objects.requireNonNull(visitLeftPadded(f.getPadding().getAsteriskToken(), JsLeftPadded.Location.FUNCTION_DECLARATION_ASTERISK_TOKEN, p)));
10431042
f = f.getPadding().withName(Objects.requireNonNull(visitLeftPadded(f.getPadding().getName(), JsLeftPadded.Location.FUNCTION_DECLARATION_NAME, p)));
10441043
f = f.withTypeParameters(visitAndCast(f.getTypeParameters(), p));
1045-
f = f.getPadding().withParameters(Objects.requireNonNull(visitContainer(f.getPadding().getParameters(), JContainer.Location.METHOD_DECLARATION_PARAMETERS, p)));
1044+
f = f.getPadding().withParameters(Objects.requireNonNull(visitContainer(f.getPadding().getParameters(), JsContainer.Location.FUNCTION_DECLARATION_PARAMETERS, p)));
10461045
f = f.withReturnTypeExpression(visitAndCast(f.getReturnTypeExpression(), p));
10471046
f = f.withBody(visitAndCast(f.getBody(), p));
10481047
f = f.withType(visitType(f.getType(), p));

rewrite-javascript/src/main/java/org/openrewrite/javascript/internal/JavaScriptPrinter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ public J visitFunctionDeclaration(JS.FunctionDeclaration functionDeclaration, Pr
887887
p.append(">");
888888
}
889889

890-
visitContainer("(", functionDeclaration.getPadding().getParameters(), JsContainer.Location.JSMETHOD_DECLARATION_PARAMETERS, ",", ")", p);
890+
visitContainer("(", functionDeclaration.getPadding().getParameters(), JsContainer.Location.FUNCTION_DECLARATION_PARAMETERS, ",", ")", p);
891891
if (functionDeclaration.getReturnTypeExpression() != null) {
892892
visit(functionDeclaration.getReturnTypeExpression(), p);
893893
}

rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsContainer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public enum Location {
2323
ARRAY_LITERAL_EXPRESSION(JsSpace.Location.ARRAY_LITERAL_ELEMENTS, JsRightPadded.Location.ARRAY_LITERAL_ELEMENT_SUFFIX),
2424
BINDING_ELEMENT(JsSpace.Location.BINDING_ELEMENTS, JsRightPadded.Location.BINDING_ELEMENT),
2525
EXPORT_ELEMENT(JsSpace.Location.EXPORT_ELEMENTS, JsRightPadded.Location.EXPORT_ELEMENT_SUFFIX),
26+
FUNCTION_DECLARATION_PARAMETERS(JsSpace.Location.FUNCTION_DECLARATION_PARAMETERS, JsRightPadded.Location.FUNCTION_DECLARATION_PARAMETERS_SUFFIX),
2627
FUNCTION_TYPE_PARAMETERS(JsSpace.Location.FUNCTION_TYPE_PARAMETERS, JsRightPadded.Location.FUNCTION_TYPE_PARAMETERS_SUFFIX),
2728
IMPORT_ELEMENT(JsSpace.Location.IMPORT_ELEMENTS, JsRightPadded.Location.IMPORT_ELEMENT_SUFFIX),
2829
TUPLE_ELEMENT(JsSpace.Location.TUPLE_ELEMENT, JsRightPadded.Location.TUPLE_ELEMENT_SUFFIX),

rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsRightPadded.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public enum Location {
2525
BINDING_ELEMENT(JsSpace.Location.BINDING_ELEMENT_SUFFIX),
2626
BINDING_ELEMENT_PROPERTY_NAME(JsSpace.Location.BINDING_ELEMENT_PROPERTY_NAME_SUFFIX),
2727
EXPORT_ELEMENT_SUFFIX(JsSpace.Location.EXPORT_ELEMENT_SUFFIX),
28+
FUNCTION_DECLARATION_PARAMETERS_SUFFIX(JsSpace.Location.FUNCTION_DECLARATION_PARAMETERS_SUFFIX),
2829
FUNCTION_TYPE_PARAMETERS_SUFFIX(JsSpace.Location.FUNCTION_TYPE_PARAMETERS_SUFFIX),
2930
IMPORT_ELEMENT_SUFFIX(JsSpace.Location.IMPORT_ELEMENT_SUFFIX),
3031
IMPORT_NAME_SUFFIX(JsSpace.Location.IMPORT_NAME_SUFFIX),

rewrite-javascript/src/main/java/org/openrewrite/javascript/tree/JsSpace.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ public enum Location {
143143
EXPORT_ASSIGNMENT_EXPORT_EQUALS_PREFIX,
144144
FUNCTION_DECLARATION_NAME_PREFIX,
145145
FUNCTION_DECLARATION_ASTERISK_TOKEN_PREFIX,
146+
FUNCTION_DECLARATION_PARAMETERS,
147+
FUNCTION_DECLARATION_PARAMETERS_SUFFIX,
146148
INDEXED_ACCESS_TYPE_PREFIX,
147149
INDEXED_ACCESS_TYPE_INDEX_TYPE_SUFFIX,
148150
INDEXED_ACCESS_TYPE_INDEX_TYPE_PREFIX,

0 commit comments

Comments
 (0)