From 3e6a154bf547b79bb1484e51224ec1bfd66729b7 Mon Sep 17 00:00:00 2001
From: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
Date: Mon, 25 Feb 2013 10:09:30 +0100
Subject: [PATCH] [xbase][validation] Don't traverse inferred JVM elements

---
 .../validation/ResourceValidatorImpl.java     | 75 ++++++++++++-------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ResourceValidatorImpl.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ResourceValidatorImpl.java
index 3882660df..8d3548836 100755
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ResourceValidatorImpl.java
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ResourceValidatorImpl.java
@@ -94,34 +94,10 @@ public class ResourceValidatorImpl implements IResourceValidator {
 				logCheckStatus(resource, syntaxDiagFail, "Syntax");
 	
 				// Validation errors
-				// Collect validator Diagnostics
-				for (EObject ele : resource.getContents()) {
-					try {
-						if (monitor.isCanceled())
-							return null;
-						Map<Object, Object> options = Maps.newHashMap();
-						options.put(CheckMode.KEY, mode);
-						options.put(CancelableDiagnostician.CANCEL_INDICATOR, monitor);
-						// disable concrete syntax validation, since a semantic model that has been parsed 
-						// from the concrete syntax always complies with it - otherwise there are parse errors.
-						options.put(ConcreteSyntaxEValidator.DISABLE_CONCRETE_SYNTAX_EVALIDATOR, Boolean.TRUE);
-						// see EObjectValidator.getRootEValidator(Map<Object, Object>)
-						options.put(EValidator.class, diagnostician);
-						if (resource instanceof XtextResource) {
-							options.put(AbstractInjectableValidator.CURRENT_LANGUAGE_NAME, ((XtextResource) resource).getLanguageName());						
-						}
-						Diagnostic diagnostic = diagnostician.validate(ele, options);
-						if (!diagnostic.getChildren().isEmpty()) {
-							for (Diagnostic childDiagnostic : diagnostic.getChildren()) {
-								issueFromEValidatorDiagnostic(childDiagnostic, acceptor);
-							}
-						} else {
-							issueFromEValidatorDiagnostic(diagnostic, acceptor);
-						}
-					} catch (RuntimeException e) {
-						log.error(e.getMessage(), e);
-					}
-				}
+				// Collect validator diagnostics
+				validate(resource, mode, monitor, acceptor);
+				if (monitor.isCanceled())
+					return null;
 			} catch (RuntimeException e) {
 				log.error(e.getMessage(), e);
 			}
@@ -131,6 +107,49 @@ public class ResourceValidatorImpl implements IResourceValidator {
 		}
 	}
 
+	/**
+	 * @since 2.4
+	 */
+	protected void validate(Resource resource, final CheckMode mode, final CancelIndicator monitor,
+			IAcceptor<Issue> acceptor) {
+		for (EObject ele : resource.getContents()) {
+			if (monitor.isCanceled())
+				return;
+			validate(resource, ele, mode, monitor, acceptor);
+		}
+	}
+
+	/**
+	 * @since 2.4
+	 */
+	protected void validate(Resource resource, EObject element, final CheckMode mode, final CancelIndicator monitor,
+			IAcceptor<Issue> acceptor) {
+		try {
+			Map<Object, Object> options = Maps.newHashMap();
+			options.put(CheckMode.KEY, mode);
+			options.put(CancelableDiagnostician.CANCEL_INDICATOR, monitor);
+			// disable concrete syntax validation, since a semantic model that has been parsed 
+			// from the concrete syntax always complies with it - otherwise there are parse errors.
+			options.put(ConcreteSyntaxEValidator.DISABLE_CONCRETE_SYNTAX_EVALIDATOR, Boolean.TRUE);
+			// see EObjectValidator.getRootEValidator(Map<Object, Object>)
+			options.put(EValidator.class, diagnostician);
+			if (resource instanceof XtextResource) {
+				options.put(AbstractInjectableValidator.CURRENT_LANGUAGE_NAME,
+						((XtextResource) resource).getLanguageName());
+			}
+			Diagnostic diagnostic = diagnostician.validate(element, options);
+			if (!diagnostic.getChildren().isEmpty()) {
+				for (Diagnostic childDiagnostic : diagnostic.getChildren()) {
+					issueFromEValidatorDiagnostic(childDiagnostic, acceptor);
+				}
+			} else {
+				issueFromEValidatorDiagnostic(diagnostic, acceptor);
+			}
+		} catch (RuntimeException e) {
+			log.error(e.getMessage(), e);
+		}
+	}
+
 	protected void resolveProxies(final Resource resource, final CancelIndicator monitor) {
 		EcoreUtil2.resolveLazyCrossReferences(resource, monitor);
 	}