Changeset 3372 for devel-tools/trunk

Timestamp:

Feb 5, 2008, 9:21:49 AM (13 years ago)

Author:

yura

Message:

• Annotation highlights only in currnet file.
• Annotation highlights uses actual AST.

Location:

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor

Files:

• RfpEditor.java (modified) (4 diffs)
• RfpReconcilingStrategy.java (modified) (1 diff)

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor/RfpEditor.java

@@ -108 +108 @@
 
         public void selectionChanged (SelectionChangedEvent event) {
+            if (rfpReconcilingStrategy == null)
+                return;
+            AstImplem astImplem = rfpReconcilingStrategy.getAstImplem();
             if (astImplem == null)
                 return;
@@ -127 +130 @@
                 annotations.clear();
                 for (AstNode astNode : astNodeList) {
+                    if (!astImplem.pos.rfpResource.equals(astNode.pos.rfpResource))
+                        continue;
                     Annotation annotation = new Annotation("org.eclipse.jdt.ui.occurrences", false, astNode.toString());
                     annotations.add(annotation);
@@ -141 +146 @@
     private RfpSourceViewerConfiguration rfpSourceViewerConfiguration;
 
-    AstImplem astImplem = null;
+    RfpReconcilingStrategy rfpReconcilingStrategy = null;
 
     public RfpEditor () {
@@ -201 +206 @@
             }
         });
-        //Runnable runnable = new Runnable() {
-        //    public void run () {
-        //        getSourceViewer().invalidateTextPresentation();
-        //    }
-        //};
-        //if (runnable == null)
-        //    return;
-        //IWorkbenchPartSite site = this.getSite();
-        //if (site == null)
-        //    return;
-        //Shell shell = site.getShell();
-        //if (shell == null || shell.isDisposed())
-        //    return;
-        //Display display = shell.getDisplay();
-        //if (display == null || display.isDisposed())
-        //    return;
-        //display.asyncExec(runnable);
+        // Runnable runnable = new Runnable() {
+        // public void run () {
+        // getSourceViewer().invalidateTextPresentation();
+        // }
+        // };
+        // if (runnable == null)
+        // return;
+        // IWorkbenchPartSite site = this.getSite();
+        // if (site == null)
+        // return;
+        // Shell shell = site.getShell();
+        // if (shell == null || shell.isDisposed())
+        // return;
+        // Display display = shell.getDisplay();
+        // if (display == null || display.isDisposed())
+        // return;
+        // display.asyncExec(runnable);
     }
 

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor/RfpReconcilingStrategy.java

@@ -18 +18 @@
         this.editor = editor;
         this.store = store;
+        editor.rfpReconcilingStrategy = this;
+    }
+    
+    public AstImplem getAstImplem () {
+        IFile file = (IFile) editor.getEditorInput().getAdapter(IFile.class);
+        if (document == null || document.get().equals(""))
+            return null;
+        return RfpBuilder.checkAndCompileModuleImplem(file.getProject(), file, document.get());
     }
 
     public void reconcile (IRegion partition) {
-        IFile file = (IFile) editor.getEditorInput().getAdapter(IFile.class);
-        if (document == null || document.get().equals(""))
-            return;
-        AstImplem astImplem = RfpBuilder.checkAndCompileModuleImplem(file.getProject(), file, document.get());
-        this.editor.astImplem = astImplem;
+        AstImplem astImplem = getAstImplem();
         if (astImplem != null)
             editor.changeTextPresentation(document, PresentationVisitor.updateTextPresentation(astImplem, store));