Skip to content

Commit

Permalink
Add a few more missing calls
Browse files Browse the repository at this point in the history
  • Loading branch information
@knutwannheden
knutwannheden committed Nov 20, 2024
1 parent bbd8ce9 commit 2e6aa04
Showing 1 changed file with 74 additions and 5 deletions.
79 changes: 74 additions & 5 deletions rewrite-javascript/src/main/java/org/openrewrite/javascript/JavaScriptValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@
package org.openrewrite.javascript;

import org.jspecify.annotations.Nullable;
import org.openrewrite.*;
import org.openrewrite.Tree;
import org.openrewrite.internal.ListUtils;
import org.openrewrite.marker.Markers;
import org.openrewrite.tree.*;
import org.openrewrite.java.JavaVisitor;
import org.openrewrite.java.tree.*;
import org.openrewrite.javascript.tree.*;
import org.openrewrite.javascript.tree.JS;

import java.util.List;

Expand All @@ -56,6 +53,7 @@ public JS.CompilationUnit visitCompilationUnit(JS.CompilationUnit compilationUni

@Override
public JS.Alias visitAlias(JS.Alias alias, P p) {
visitAndValidate(alias.getPropertyName(), J.Identifier.class, p);
visitAndValidate(alias.getAlias(), J.Identifier.class, p);
return alias;
}
Expand Down Expand Up @@ -92,7 +90,9 @@ public JS.Delete visitDelete(JS.Delete delete, P p) {

@Override
public JS.Export visitExport(JS.Export export, P p) {
visitAndValidate(export.getExports(), Expression.class, p);
visitAndValidate(export.getTarget(), J.Literal.class, p);
visitAndValidate(export.getInitializer(), Expression.class, p);
return export;
}

Expand All @@ -104,13 +104,17 @@ public JS.ExpressionStatement visitExpressionStatement(JS.ExpressionStatement ex

@Override
public JS.FunctionType visitFunctionType(JS.FunctionType functionType, P p) {
visitAndValidate(functionType.getParameters(), Statement.class, p);
visitAndValidate(functionType.getReturnType(), Expression.class, p);
return functionType;
}

@Override
public JS.JsImport visitJsImport(JS.JsImport jsImport, P p) {
visitAndValidate(jsImport.getName(), J.Identifier.class, p);
visitAndValidate(jsImport.getImports(), Expression.class, p);
visitAndValidate(jsImport.getTarget(), J.Literal.class, p);
visitAndValidate(jsImport.getInitializer(), Expression.class, p);
return jsImport;
}

Expand All @@ -132,17 +136,22 @@ public JS.ObjectBindingDeclarations visitObjectBindingDeclarations(JS.ObjectBind
ListUtils.map(objectBindingDeclarations.getLeadingAnnotations(), el -> visitAndValidate(el, J.Annotation.class, p));
ListUtils.map(objectBindingDeclarations.getModifiers(), el -> visitAndValidate(el, J.Modifier.class, p));
visitAndValidate(objectBindingDeclarations.getTypeExpression(), TypeTree.class, p);
visitAndValidate(objectBindingDeclarations.getBindings(), JS.ObjectBindingDeclarations.Binding.class, p);
visitAndValidate(objectBindingDeclarations.getInitializer(), Expression.class, p);
return objectBindingDeclarations;
}

@Override
public JS.ObjectBindingDeclarations.Binding visitBinding(JS.ObjectBindingDeclarations.Binding binding, P p) {
visitAndValidate(binding.getPropertyName(), J.Identifier.class, p);
visitAndValidate(binding.getName(), TypedTree.class, p);
visitAndValidate(binding.getInitializer(), Expression.class, p);
return binding;
}

@Override
public JS.PropertyAssignment visitPropertyAssignment(JS.PropertyAssignment propertyAssignment, P p) {
visitAndValidate(propertyAssignment.getName(), Expression.class, p);
visitAndValidate(propertyAssignment.getInitializer(), Expression.class, p);
return propertyAssignment;
}
Expand All @@ -162,6 +171,7 @@ public JS.StatementExpression visitStatementExpression(JS.StatementExpression st

@Override
public JS.TemplateExpression visitTemplateExpression(JS.TemplateExpression templateExpression, P p) {
visitAndValidate(templateExpression.getTag(), Expression.class, p);
ListUtils.map(templateExpression.getStrings(), el -> visitAndValidate(el, J.class, p));
return templateExpression;
}
Expand All @@ -174,6 +184,7 @@ public JS.TemplateExpression.Value visitTemplateExpressionValue(JS.TemplateExpre

@Override
public JS.Tuple visitTuple(JS.Tuple tuple, P p) {
visitAndValidate(tuple.getElements(), J.class, p);
return tuple;
}

Expand All @@ -182,6 +193,7 @@ public JS.TypeDeclaration visitTypeDeclaration(JS.TypeDeclaration typeDeclaratio
ListUtils.map(typeDeclaration.getModifiers(), el -> visitAndValidate(el, J.Modifier.class, p));
visitAndValidate(typeDeclaration.getName(), J.Identifier.class, p);
visitAndValidate(typeDeclaration.getTypeParameters(), J.TypeParameters.class, p);
visitAndValidate(typeDeclaration.getInitializer(), Expression.class, p);
return typeDeclaration;
}

Expand All @@ -193,6 +205,7 @@ public JS.TypeOf visitTypeOf(JS.TypeOf typeOf, P p) {

@Override
public JS.TypeOperator visitTypeOperator(JS.TypeOperator typeOperator, P p) {
visitAndValidate(typeOperator.getExpression(), Expression.class, p);
return typeOperator;
}

Expand Down Expand Up @@ -238,6 +251,7 @@ public JS.JSVariableDeclarations visitJSVariableDeclarations(JS.JSVariableDeclar
@Override
public JS.JSVariableDeclarations.JSNamedVariable visitJSVariableDeclarationsJSNamedVariable(JS.JSVariableDeclarations.JSNamedVariable jSNamedVariable, P p) {
visitAndValidate(jSNamedVariable.getName(), Expression.class, p);
visitAndValidate(jSNamedVariable.getInitializer(), Expression.class, p);
return jSNamedVariable;
}

Expand All @@ -248,19 +262,26 @@ public JS.JSMethodDeclaration visitJSMethodDeclaration(JS.JSMethodDeclaration jS
visitAndValidate(jSMethodDeclaration.getTypeParameters(), J.TypeParameters.class, p);
visitAndValidate(jSMethodDeclaration.getReturnTypeExpression(), TypeTree.class, p);
visitAndValidate(jSMethodDeclaration.getName(), Expression.class, p);
visitAndValidate(jSMethodDeclaration.getParameters(), Statement.class, p);
visitAndValidate(jSMethodDeclaration.getThrowz(), NameTree.class, p);
visitAndValidate(jSMethodDeclaration.getBody(), J.Block.class, p);
visitAndValidate(jSMethodDeclaration.getDefaultValue(), Expression.class, p);
return jSMethodDeclaration;
}

@Override
public JS.JSMethodInvocation visitJSMethodInvocation(JS.JSMethodInvocation jSMethodInvocation, P p) {
visitAndValidate(jSMethodInvocation.getSelect(), Expression.class, p);
visitAndValidate(jSMethodInvocation.getTypeParameters(), Expression.class, p);
visitAndValidate(jSMethodInvocation.getName(), Expression.class, p);
visitAndValidate(jSMethodInvocation.getArguments(), Expression.class, p);
return jSMethodInvocation;
}

@Override
public JS.NamespaceDeclaration visitNamespaceDeclaration(JS.NamespaceDeclaration namespaceDeclaration, P p) {
ListUtils.map(namespaceDeclaration.getModifiers(), el -> visitAndValidate(el, J.Modifier.class, p));
visitAndValidate(namespaceDeclaration.getName(), Expression.class, p);
visitAndValidate(namespaceDeclaration.getBody(), J.Block.class, p);
return namespaceDeclaration;
}
Expand All @@ -270,6 +291,7 @@ public JS.FunctionDeclaration visitFunctionDeclaration(JS.FunctionDeclaration fu
ListUtils.map(functionDeclaration.getModifiers(), el -> visitAndValidate(el, J.Modifier.class, p));
visitAndValidate(functionDeclaration.getName(), J.Identifier.class, p);
visitAndValidate(functionDeclaration.getTypeParameters(), J.TypeParameters.class, p);
visitAndValidate(functionDeclaration.getParameters(), Statement.class, p);
visitAndValidate(functionDeclaration.getReturnTypeExpression(), TypeTree.class, p);
visitAndValidate(functionDeclaration.getBody(), J.class, p);
return functionDeclaration;
Expand All @@ -285,6 +307,7 @@ public J.AnnotatedType visitAnnotatedType(J.AnnotatedType annotatedType, P p) {
@Override
public J.Annotation visitAnnotation(J.Annotation annotation, P p) {
visitAndValidate(annotation.getAnnotationType(), NameTree.class, p);
visitAndValidate(annotation.getArguments(), Expression.class, p);
return annotation;
}

Expand All @@ -305,12 +328,14 @@ public J.ArrayType visitArrayType(J.ArrayType arrayType, P p) {
@Override
public J.Assert visitAssert(J.Assert assert_, P p) {
visitAndValidate(assert_.getCondition(), Expression.class, p);
visitAndValidate(assert_.getDetail().getElement(), Expression.class, p);
return assert_;
}

@Override
public J.Assignment visitAssignment(J.Assignment assignment, P p) {
visitAndValidate(assignment.getVariable(), Expression.class, p);
visitAndValidate(assignment.getAssignment(), Expression.class, p);
return assignment;
}

Expand Down Expand Up @@ -342,6 +367,9 @@ public J.Break visitBreak(J.Break break_, P p) {

@Override
public J.Case visitCase(J.Case case_, P p) {
visitAndValidate(case_.getExpressions(), Expression.class, p);
visitAndValidate(case_.getStatements(), Statement.class, p);
visitAndValidate(case_.getBody(), J.class, p);
return case_;
}

Expand All @@ -351,6 +379,11 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDeclarat
ListUtils.map(classDeclaration.getModifiers(), el -> visitAndValidate(el, J.Modifier.class, p));
visit(classDeclaration.getPadding().getKind(), p);
visitAndValidate(classDeclaration.getName(), J.Identifier.class, p);
visitAndValidate(classDeclaration.getTypeParameters(), J.TypeParameter.class, p);
visitAndValidate(classDeclaration.getPrimaryConstructor(), Statement.class, p);
visitAndValidate(classDeclaration.getExtends(), TypeTree.class, p);
visitAndValidate(classDeclaration.getImplements(), TypeTree.class, p);
visitAndValidate(classDeclaration.getPermits(), TypeTree.class, p);
visitAndValidate(classDeclaration.getBody(), J.Block.class, p);
return classDeclaration;
}
Expand All @@ -363,6 +396,8 @@ public J.Continue visitContinue(J.Continue continue_, P p) {

@Override
public J.DoWhileLoop visitDoWhileLoop(J.DoWhileLoop doWhileLoop, P p) {
visitAndValidate(doWhileLoop.getBody(), Statement.class, p);
visitAndValidate(doWhileLoop.getWhileCondition(), Expression.class, p);
return doWhileLoop;
}

Expand All @@ -388,29 +423,35 @@ public J.EnumValueSet visitEnumValueSet(J.EnumValueSet enumValueSet, P p) {
@Override
public J.FieldAccess visitFieldAccess(J.FieldAccess fieldAccess, P p) {
visitAndValidate(fieldAccess.getTarget(), Expression.class, p);
visitAndValidate(fieldAccess.getName(), J.Identifier.class, p);
return fieldAccess;
}

@Override
public J.ForEachLoop visitForEachLoop(J.ForEachLoop forEachLoop, P p) {
visitAndValidate(forEachLoop.getControl(), J.ForEachLoop.Control.class, p);
visitAndValidate(forEachLoop.getBody(), Statement.class, p);
return forEachLoop;
}

@Override
public J.ForEachLoop.Control visitForEachControl(J.ForEachLoop.Control control, P p) {
visitAndValidate(control.getVariable(), J.VariableDeclarations.class, p);
visitAndValidate(control.getIterable(), Expression.class, p);
return control;
}

@Override
public J.ForLoop visitForLoop(J.ForLoop forLoop, P p) {
visitAndValidate(forLoop.getControl(), J.ForLoop.Control.class, p);
visitAndValidate(forLoop.getBody(), Statement.class, p);
return forLoop;
}

@Override
public J.ForLoop.Control visitForControl(J.ForLoop.Control control, P p) {
ListUtils.map(control.getInit(), el -> visitAndValidate(el, Statement.class, p));
visitAndValidate(control.getCondition(), Expression.class, p);
ListUtils.map(control.getUpdate(), el -> visitAndValidate(el, Statement.class, p));
return control;
}
Expand All @@ -431,35 +472,41 @@ public J.Identifier visitIdentifier(J.Identifier identifier, P p) {
@Override
public J.If visitIf(J.If if_, P p) {
visitAndValidate(if_.getIfCondition(), J.ControlParentheses.class, p);
visitAndValidate(if_.getThenPart(), Statement.class, p);
visitAndValidate(if_.getElsePart(), J.If.Else.class, p);
return if_;
}

@Override
public J.If.Else visitElse(J.If.Else else_, P p) {
visitAndValidate(else_.getBody(), Statement.class, p);
return else_;
}

@Override
public J.Import visitImport(J.Import import_, P p) {
visitAndValidate(import_.getQualid(), J.FieldAccess.class, p);
visitAndValidate(import_.getAlias(), J.Identifier.class, p);
return import_;
}

@Override
public J.InstanceOf visitInstanceOf(J.InstanceOf instanceOf, P p) {
visitAndValidate(instanceOf.getExpression(), Expression.class, p);
visitAndValidate(instanceOf.getClazz(), J.class, p);
visitAndValidate(instanceOf.getPattern(), J.class, p);
return instanceOf;
}

@Override
public J.IntersectionType visitIntersectionType(J.IntersectionType intersectionType, P p) {
visitAndValidate(intersectionType.getBounds(), TypeTree.class, p);
return intersectionType;
}

@Override
public J.Label visitLabel(J.Label label, P p) {
visitAndValidate(label.getLabel(), J.Identifier.class, p);
visitAndValidate(label.getStatement(), Statement.class, p);
return label;
}
Expand All @@ -478,6 +525,9 @@ public J.Literal visitLiteral(J.Literal literal, P p) {

@Override
public J.MemberReference visitMemberReference(J.MemberReference memberReference, P p) {
visitAndValidate(memberReference.getContaining(), Expression.class, p);
visitAndValidate(memberReference.getTypeParameters(), Expression.class, p);
visitAndValidate(memberReference.getReference(), J.Identifier.class, p);
return memberReference;
}

Expand All @@ -487,13 +537,19 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration methodDecl
ListUtils.map(methodDeclaration.getModifiers(), el -> visitAndValidate(el, J.Modifier.class, p));
visitAndValidate(methodDeclaration.getTypeParameters(), J.TypeParameters.class, p);
visitAndValidate(methodDeclaration.getReturnTypeExpression(), TypeTree.class, p);
visitAndValidate(methodDeclaration.getParameters(), Statement.class, p);
visitAndValidate(methodDeclaration.getThrows(), NameTree.class, p);
visitAndValidate(methodDeclaration.getBody(), J.Block.class, p);
visitAndValidate(methodDeclaration.getDefaultValue(), Expression.class, p);
return methodDeclaration;
}

@Override
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation methodInvocation, P p) {
visitAndValidate(methodInvocation.getSelect(), Expression.class, p);
visitAndValidate(methodInvocation.getTypeParameters(), Expression.class, p);
visitAndValidate(methodInvocation.getName(), J.Identifier.class, p);
visitAndValidate(methodInvocation.getArguments(), Expression.class, p);
return methodInvocation;
}

Expand All @@ -507,24 +563,29 @@ public J.MultiCatch visitMultiCatch(J.MultiCatch multiCatch, P p) {
public J.NewArray visitNewArray(J.NewArray newArray, P p) {
visitAndValidate(newArray.getTypeExpression(), TypeTree.class, p);
ListUtils.map(newArray.getDimensions(), el -> visitAndValidate(el, J.ArrayDimension.class, p));
visitAndValidate(newArray.getInitializer(), Expression.class, p);
return newArray;
}

@Override
public J.ArrayDimension visitArrayDimension(J.ArrayDimension arrayDimension, P p) {
visitAndValidate(arrayDimension.getIndex(), Expression.class, p);
return arrayDimension;
}

@Override
public J.NewClass visitNewClass(J.NewClass newClass, P p) {
visitAndValidate(newClass.getEnclosing(), Expression.class, p);
visitAndValidate(newClass.getClazz(), TypeTree.class, p);
visitAndValidate(newClass.getArguments(), Expression.class, p);
visitAndValidate(newClass.getBody(), J.Block.class, p);
return newClass;
}

@Override
public J.NullableType visitNullableType(J.NullableType nullableType, P p) {
ListUtils.map(nullableType.getAnnotations(), el -> visitAndValidate(el, J.Annotation.class, p));
visitAndValidate(nullableType.getTypeTree(), TypeTree.class, p);
return nullableType;
}

Expand All @@ -538,6 +599,7 @@ public J.Package visitPackage(J.Package package_, P p) {
@Override
public J.ParameterizedType visitParameterizedType(J.ParameterizedType parameterizedType, P p) {
visitAndValidate(parameterizedType.getClazz(), NameTree.class, p);
visitAndValidate(parameterizedType.getTypeParameters(), Expression.class, p);
return parameterizedType;
}

Expand Down Expand Up @@ -588,6 +650,8 @@ public J.Synchronized visitSynchronized(J.Synchronized synchronized_, P p) {
@Override
public J.Ternary visitTernary(J.Ternary ternary, P p) {
visitAndValidate(ternary.getCondition(), Expression.class, p);
visitAndValidate(ternary.getTruePart(), Expression.class, p);
visitAndValidate(ternary.getFalsePart(), Expression.class, p);
return ternary;
}

Expand All @@ -599,8 +663,10 @@ public J.Throw visitThrow(J.Throw throw_, P p) {

@Override
public J.Try visitTry(J.Try try_, P p) {
visitAndValidate(try_.getResources(), J.Try.Resource.class, p);
visitAndValidate(try_.getBody(), J.Block.class, p);
ListUtils.map(try_.getCatches(), el -> visitAndValidate(el, J.Try.Catch.class, p));
visitAndValidate(try_.getFinally(), J.Block.class, p);
return try_;
}

Expand Down Expand Up @@ -629,6 +695,7 @@ public J.TypeParameter visitTypeParameter(J.TypeParameter typeParameter, P p) {
ListUtils.map(typeParameter.getAnnotations(), el -> visitAndValidate(el, J.Annotation.class, p));
ListUtils.map(typeParameter.getModifiers(), el -> visitAndValidate(el, J.Modifier.class, p));
visitAndValidate(typeParameter.getName(), Expression.class, p);
visitAndValidate(typeParameter.getBounds(), TypeTree.class, p);
return typeParameter;
}

Expand All @@ -650,12 +717,14 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations v
@Override
public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations.NamedVariable namedVariable, P p) {
visitAndValidate(namedVariable.getName(), J.Identifier.class, p);
visitAndValidate(namedVariable.getInitializer(), Expression.class, p);
return namedVariable;
}

@Override
public J.WhileLoop visitWhileLoop(J.WhileLoop whileLoop, P p) {
visitAndValidate(whileLoop.getCondition(), J.ControlParentheses.class, p);
visitAndValidate(whileLoop.getBody(), Statement.class, p);
return whileLoop;
}

Expand Down

0 comments on commit 2e6aa04

Please sign in to comment.