Changeset 3860

Timestamp:

Jul 21, 2008, 9:07:04 PM (12 years ago)

Author:

orlov

Message:

• Open declaration (cross-file).

Location:

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt

Files:

• editor/RfpEditor.java (modified) (3 diffs)
• ui/actions/OpenDeclarationAction.java (modified) (3 diffs)

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

@@ -4 +4 @@
 import java.util.List;
 
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
@@ -49 +50 @@
 import org.refal.rfpdt.ast.AstVar;
 import org.refal.rfpdt.ast.Searcher;
+import org.refal.rfpdt.core.RfpCore;
+import org.refal.rfpdt.core.RfpProject;
 import org.refal.rfpdt.editor.PresentationVisitor.StylePosition;
 import org.refal.rfpdt.editor.color.ColorManager;
@@ -357 +360 @@
         return Searcher.search(astImplem, offset);
     }
+    
+    public RfpProject getRfpProject () {
+        return RfpCore.getRfpProject(((IFile) getEditorInput().getAdapter(IFile.class)).getProject());
+    }
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/actions/OpenDeclarationAction.java

@@ -3 +3 @@
 import java.util.List;
 
+import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
 import org.refal.rfpdt.ast.AstCall;
 import org.refal.rfpdt.ast.AstCut;
@@ -13 +16 @@
 import org.refal.rfpdt.ast.AstRef;
 import org.refal.rfpdt.ast.AstVar;
+import org.refal.rfpdt.editor.RfpEditor;
 import org.refal.rfpdt.editor.RfpEditorMessages;
+import org.refal.rfpdt.ui.RfpUI;
 
 public class OpenDeclarationAction extends RfpEditorActionDelegate {
@@ -34 +39 @@
             return;
         }
-        int offset = astNode.pos.charStart;
-        sourceViewer.setSelectedRange(offset, 0);
-        sourceViewer.revealRange(offset, 0);
+        try {
+            String ext = astNode.pos.rfpResource.isInterface ? "rfi" : "rf";
+            IFile file = editor.getRfpProject().getSource(astNode.pos.rfpResource.moduleName, ext);
+            if (file == null)
+                return;
+            editor = (RfpEditor) IDE.openEditor(RfpUI.getActivePage(), file);
+            sourceViewer = editor.sourceViewer();
+            int offset = astNode.pos.charStart;
+            sourceViewer.setSelectedRange(offset, 0);
+            sourceViewer.revealRange(offset, 0);
+        } catch (PartInitException e) {
+            RfpUI.log(e);
+        }
     }