1 files changed, 2 insertions, 27 deletions
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java10Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java10Validator.java
index 42e5c61c8..c7fda2f46 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java10Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java10Validator.java
@@ -1,39 +1,14 @@
 package com.github.javaparser.ast.validator;
 
-import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.body.VariableDeclarator;
-import com.github.javaparser.ast.expr.VariableDeclarationExpr;
-import com.github.javaparser.ast.stmt.ForStmt;
-import com.github.javaparser.ast.stmt.ForeachStmt;
 import com.github.javaparser.ast.type.VarType;
-
-import java.util.Optional;
+import com.github.javaparser.ast.validator.chunks.VarValidator;
 
 /**
  * This validator validates according to Java 10 syntax rules.
  */
 public class Java10Validator extends Java9Validator {
 
-    protected final Validator varOnlyOnLocalVariableDefinitionAndFor = new SingleNodeTypeValidator<>(VarType.class, (n, reporter) -> {
-        Optional<VariableDeclarator> variableDeclarator = n.findParent(VariableDeclarator.class);
-        if (!variableDeclarator.isPresent()) {
-            reporter.report(n, "\"var\" is not allowed here.");
-            return;
-        }
-        variableDeclarator.ifPresent(vd -> {
-            Optional<Node> container = vd.getParentNode();
-            if (!container.isPresent()) {
-                reporter.report(n, "\"var\" is not allowed here.");
-                return;
-            }
-            container.ifPresent(c -> {
-                boolean positionIsFine = c instanceof ForStmt || c instanceof ForeachStmt || c instanceof VariableDeclarationExpr;
-                if (!positionIsFine) {
-                    reporter.report(n, "\"var\" is not allowed here.");
-                }
-            });
-        });
-    });
+    protected final Validator varOnlyOnLocalVariableDefinitionAndFor = new SingleNodeTypeValidator<>(VarType.class, new VarValidator(false));
 
     public Java10Validator() {
         super();