fixes #120

Author: eyck

com.minres.coredsl/src/com/minres/coredsl/scoping/CoreDslGlobalScopeProvider.xtend

@@ -12,6 +12,9 @@ import org.eclipse.xtext.EcoreUtil2
 import org.eclipse.xtext.resource.IResourceDescription
 import org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider
 import org.eclipse.xtext.util.IResourceScopeCache
+import org.eclipse.emf.common.util.WrappedException
+import com.minres.coredsl.validation.XtCoreDslValidator
+import org.eclipse.xtext.diagnostics.ExceptionDiagnostic
 
 class CoreDslGlobalScopeProvider extends ImportUriGlobalScopeProvider {
 
@@ -23,6 +26,9 @@ class CoreDslGlobalScopeProvider extends ImportUriGlobalScopeProvider {
     @Inject
     IResourceScopeCache cache;
 
+    @Inject
+    XtCoreDslValidator validator;
+    
     override protected getImportedUris(Resource resource) {
         return cache.get(CoreDslGlobalScopeProvider.getSimpleName(), resource, new Provider<LinkedHashSet<URI>>() {
             override get() {
@@ -50,7 +56,13 @@ class CoreDslGlobalScopeProvider extends ImportUriGlobalScopeProvider {
                                 includedUri = includedUri.resolve(URI::createFileURI(currentPath+"/"))
                             }
                             if(uniqueImportURIs.add(includedUri)) {
-                                collectImportUris(resource.getResourceSet().getResource(includedUri, true), uniqueImportURIs)
+                                try {
+                                    collectImportUris(resource.getResourceSet().getResource(includedUri, true), uniqueImportURIs)
+                                } catch(WrappedException e) {
+                                    /* just ignore it */
+                                    resource.errors.add(new ScopeProviderDiagnostic(e.cause.message))
+                                    //validator.acceptWarning("Could not find file", it.EObjectOrProxy, CoreDslPackage.Literals.IMPORT__IMPORT_URI, 0, "", "")
+                                }
                             }
                         ]
                     }

com.minres.coredsl/src/com/minres/coredsl/scoping/ScopeProviderDiagnostic.xtend

@@ -0,0 +1,46 @@
+package com.minres.coredsl.scoping
+
+import org.eclipse.xtext.diagnostics.Diagnostic
+
+class ScopeProviderDiagnostic implements Diagnostic {
+    
+    val String message
+    
+    new(String message) {
+        this.message = message
+    }
+    
+    override getColumnEnd() {
+        -1
+    }
+    
+    override getLength() {
+        0
+    }
+    
+    override getLineEnd() {
+        -1
+    }
+    
+    override getOffset() {
+        -1
+    }
+    
+    override getColumn() {
+        -1
+    }
+    
+    override getLine() {
+        -1
+    }
+    
+    override getLocation() {
+        null
+    }
+    
+    override getMessage() {
+        message
+    }
+    
+
+}

com.minres.coredsl/src/com/minres/coredsl/validator/Main.xtend

@@ -24,6 +24,7 @@ import org.eclipse.xtext.validation.Issue
 import picocli.CommandLine
 import picocli.CommandLine.Option
 import picocli.CommandLine.Parameters
+import java.io.FileNotFoundException
 
 class Main implements Callable<Integer> {
 
@@ -61,12 +62,13 @@ class ValidatorMain {
     @Inject IResourceValidator validator
 
     def run(Main params) {
-        params.repositories.forEach[repository, idx|
-            val projectMapping = new ProjectMapping
-            projectMapping.projectName = "Repository:"+idx
-            projectMapping.path = repository
-            new StandaloneSetup().addProjectMapping(projectMapping)
-        ]
+        if(params.repositories !== null && params.repositories.size()>0)
+            params.repositories.forEach[repository, idx|
+                val projectMapping = new ProjectMapping
+                projectMapping.projectName = "Repository:"+idx
+                projectMapping.path = repository
+                new StandaloneSetup().addProjectMapping(projectMapping)
+            ]
         try {
             for (file : params.files) {
                 // Load the resource
@@ -92,17 +94,23 @@ class ValidatorMain {
                     if (!errors.empty) {
                         logger.error("Error validating " + resource.URI)
                         issues.forEach[logger.error(it)]
-                        throw new ParseException("error validating " + resource.URI)
+                        throw new ParseException("Errors validating " + resource.URI)
                     } else if (!warnings.empty) {
                         logger.warn("There are warnings validating " + resource.URI)
                         issues.forEach[logger.warn(it)]
                     }
                 }
                 logger.info('Code validation for ' + file + ' finished')
             }
-        } catch (MalformedParametersException | IllegalArgumentException | ParseException e) {
-            logger.error("Command line error " + e.message, e)
+        } catch (ParseException e) {
+            logger.error(e.message)
             return -1
+        } catch (FileNotFoundException e) {
+            logger.error(e.message)
+            return -2
+        } catch (MalformedParametersException | IllegalArgumentException e) {
+            logger.error("Command line error " + e.message)
+            return -3
         }
         return 0
     }