sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 08:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[xbase][validation] Don't traverse inferred JVM elements

Browse source
This commit is contained in:
Sebastian Zarnekow 2013-02-25 10:09:30 +01:00
parent 205cf3d1dc
commit 3e6a154bf5
1 changed files with 47 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/ResourceValidatorImpl.java
View file

@ -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);
}