X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.ui%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fui%2Feditor2%2FSCLAnnotationModel.java;h=1a0e7bcc7033c2e01444d0ab1ab30c3e6e00f47b;hb=HEAD;hp=47b203d613e1b871e8a3762f008c11906fb3298b;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLAnnotationModel.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLAnnotationModel.java
index 47b203d61..1a0e7bcc7 100644
--- a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLAnnotationModel.java
+++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLAnnotationModel.java
@@ -3,12 +3,15 @@ package org.simantics.scl.ui.editor2;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.ForkJoinPool;
 
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.source.Annotation;
 import org.eclipse.jface.text.source.AnnotationModel;
 import org.simantics.scl.compiler.errors.CompilationError;
+import org.simantics.scl.compiler.errors.DoesNotExist;
+import org.simantics.scl.compiler.errors.ErrorSeverity;
 import org.simantics.scl.compiler.errors.Failable;
 import org.simantics.scl.compiler.errors.Failure;
 import org.simantics.scl.compiler.errors.Locations;
@@ -36,24 +39,36 @@ public class SCLAnnotationModel extends AnnotationModel {
     };
     
     private void updateAnnotations() {
-        Failable<Module> result = repository.getModule(input.getModuleName(), updateListener);
-        if(result instanceof Failure) {
-            Failure failure = (Failure)result;
-            setAnnotations(Arrays.asList(failure.errors));
-        }
-        else {
-            setAnnotations(Collections.<CompilationError>emptyList());
-        }
+        ForkJoinPool.commonPool().submit(() -> {
+            if (!connected)
+                return;
+            Failable<Module> result = repository.getModule(input.getModuleName(), updateListener);
+            if(result instanceof Failure) {
+                Failure failure = (Failure)result;
+                setAnnotations(Arrays.asList(failure.errors));
+            }
+            else if(result == DoesNotExist.INSTANCE)
+                setAnnotations(Collections.<CompilationError>emptyList());
+            else
+                setAnnotations(Arrays.asList(result.getResult().getWarnings()));
+        });
     }
     
     protected void setAnnotations(List<CompilationError> errors) {
         synchronized(getLockObject()) {
             removeAllAnnotations();
             for(CompilationError error : errors) {
-                Annotation annotation = new Annotation("org.eclipse.ui.workbench.texteditor.error", true,
-                        error.description);
+                Annotation annotation = new Annotation(
+                        error.severity == ErrorSeverity.ERROR || error.severity == ErrorSeverity.IMPORT_ERROR ?
+                                "org.eclipse.ui.workbench.texteditor.error" : //$NON-NLS-1$
+                                    "org.eclipse.ui.workbench.texteditor.warning", //$NON-NLS-1$
+                                    true, error.description);
                 int begin = Locations.beginOf(error.location);
                 int end = Locations.endOf(error.location);
+                if(begin < 0 || end < begin) {
+                    begin = 0;
+                    end = 1;
+                }
                 Position position = new Position(begin, end - begin);
                 addAnnotation(annotation, position);
             }
@@ -70,6 +85,7 @@ public class SCLAnnotationModel extends AnnotationModel {
     @Override
     public void disconnect(IDocument document) {
         connected = false;
+        updateListener.stopListening();
         super.disconnect(document);
     }
 }