Changeset 449

Timestamp:

Jul 4, 2010 11:30:41 AM (14 years ago)

Author:

Anya Helene Bagge

Message:

Deal with some annotation/marker problems in the static checker

Location:

trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor

Files:

• MagnoliaEditor.java (modified) (2 diffs)
• StaticCheckModelListener.java (modified) (2 diffs)

trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor/MagnoliaEditor.java

@@ -4 +4 @@
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
+import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
 import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
@@ -11 +12 @@
     public MagnoliaEditor() {
         super();
-     //   ((ParseController)getParseController()).setEditor(this);
         // used for the expression breakpoints management
         //setEditorContextMenuId("rascal.editor.contextMenu");
     }
-    
+
+    public void createPartControl(Composite parent) {
+        super.createPartControl(parent);
+        if(getParseController() != null)
+                ((ParseController)getParseController()).setEditor(this);
+        
+    }
     protected void createActions() {
         super.createActions();

trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor/StaticCheckModelListener.java

@@ -1 +1 @@
 package org.magnolialang.eclipse.editor;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.imp.parser.IModelListener;
 import org.eclipse.imp.parser.IParseController;
 import org.eclipse.imp.pdb.facts.IConstructor;
+import org.magnolialang.eclipse.MagnoliaPlugin;
 import org.magnolialang.env.MagnoliaEnvironment;
+import org.magnolialang.errors.CompilationError;
 import org.magnolialang.magnolia.StaticChecker;
 import org.magnolialang.manager.MagnoliaProjectManager;
@@ -22 +32 @@
                         public void run() {
                                 monitor.beginTask("Checking Magnolia module " + parseController.getPath().toString(), 3);
+                                IWorkspaceRunnable action = new IWorkspaceRunnable() {
+                                        public void run(IProgressMonitor monitor) throws CoreException {
+                                                doUpdate((ParseController)parseController, monitor);
+                                        }
+                                };
 
-                                ParseController ctrl = (ParseController)parseController;
+                                try {
+                                        IProject project = parseController.getProject().getRawProject();
+                                        project.getWorkspace().run(action, project, IWorkspace.AVOID_UPDATE, monitor);
+                                } catch (CoreException e) {
+                                        MagnoliaPlugin.getInstance().logException(e.getMessage(), e);
+                                }
+
+                        }
+
+                        private void doUpdate(ParseController ctrl, IProgressMonitor monitor) {
                                 MagnoliaProjectManager manager = ctrl.getManager();
-                                String moduleName = manager.findEditedModule(ctrl);
-                                IConstructor tree = manager.getModuleTree(moduleName, true);
-                                monitor.worked(1);
-                                MagnoliaEnvironment env = manager.getModuleEnv(moduleName);
-                                monitor.worked(1);
+                                try {
+                                        String moduleName = manager.findEditedModule(ctrl);
+                                        if(moduleName != null) {
+                                                IConstructor tree = manager.getModuleTree(moduleName, true);
+                                                monitor.worked(1);
+                                                MagnoliaEnvironment env = manager.getModuleEnv(moduleName);
+                                                monitor.worked(1);
 
-                                checker.checkModule(tree, env);
-                                monitor.worked(1);
+                                                checker.checkModule(tree, env);
+                                                monitor.worked(1);
+                                        }
+                                        else
+                                                monitor.worked(3);
+                                }
+                                catch(CompilationError ce) {
+                                        manager.reportError(ce);
+                                }
+                                
+                                IPath path = parseController.getPath();
+                                IProject project = parseController.getProject().getRawProject();
+                                
+                                monitor.beginTask("Marking errors and warnings in " + path, 1);
+                                        IFile res = (IFile) project.findMember(path, false);
+
+                                        try {
+                                                res.refreshLocal(IResource.DEPTH_ZERO, monitor);
+                                        } catch (CoreException e) {
+                                        }
+                                        monitor.worked(1);
+                                
                         }
                 };