Changeset 3863

Timestamp:

Jul 23, 2008, 1:33:50 PM (12 years ago)

Author:

yura

Message:

• Refactoring: AstInfo? provides information for OccurrencesAnnotation?, OpenDeclaration? and TextHover?.

Location:

devel-tools/trunk/eclipse

Files:

• org.refal.rfpdt.core/src/org/refal/rfpdt/ast/Searcher.java (modified) (1 diff)
• org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/AstInfo.java (added)
• org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/RfpEditor.java (modified) (9 diffs)
• org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/RfpReconcilingStrategy.java (modified) (1 diff)
• org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/RfpTextHover.java (modified) (3 diffs)
• org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/actions/OpenDeclarationAction.java (modified) (4 diffs)

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/Searcher.java

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class Searcher implements ProgramVisitor, SentenceVisitor, ExprVisitor {
-    public static ArrayList<AstNode> search (AstImplem astImplem, int offset) {
+    public static List<AstNode> search (AstImplem astImplem, int offset) {
         Searcher search = new Searcher(offset);
         astImplem.accept(search);

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
-import java.util.List;
 
 import org.eclipse.core.resources.IFile;
@@ -37 +36 @@
 import org.eclipse.ui.texteditor.ChainedPreferenceStore;
 import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
-import org.refal.rfpdt.ast.AstCall;
-import org.refal.rfpdt.ast.AstCut;
-import org.refal.rfpdt.ast.AstDecl;
-import org.refal.rfpdt.ast.AstFence;
-import org.refal.rfpdt.ast.AstFuncDef;
 import org.refal.rfpdt.ast.AstImplem;
-import org.refal.rfpdt.ast.AstName;
-import org.refal.rfpdt.ast.AstNative;
 import org.refal.rfpdt.ast.AstNode;
-import org.refal.rfpdt.ast.AstRef;
-import org.refal.rfpdt.ast.AstVar;
-import org.refal.rfpdt.ast.Searcher;
 import org.refal.rfpdt.core.RfpCore;
 import org.refal.rfpdt.core.RfpProject;
@@ -57 +46 @@
 
 public class RfpEditor extends TextEditor {
-    private static final AstNode[] empty = new AstNode[0];
     private static int editorCount = 0;
-    private static ColorManager colorManager = null;
+    private static ColorManager colorManager;
 
     private static Object getLockObject (IAnnotationModel annotationModel) {
@@ -77 +65 @@
         private final ArrayList<Annotation> annotations = new ArrayList<Annotation>();
 
-        private AstNode[] getNodeList (AstImplem astImplem, int offset) {
-            ArrayList<AstNode> astNodeList = Searcher.search(astImplem, offset);
-            int size = astNodeList.size();
-            AstVar astVar = null;
-            if (size > 0 && astNodeList.get(size-1) instanceof AstVar)
-                astVar = (AstVar) astNodeList.get(size-1);
-            else if (size > 1 && astNodeList.get(size-2) instanceof AstVar)
-                astVar = (AstVar) astNodeList.get(size-2);
-            if (astVar != null) {
-                astVar = astVar.varDefinition;
-                if (astVar == null || astVar.varUses == null)
-                    return empty;
-                return astVar.varUses.toArray(new AstNode[astVar.varUses.size()]);
-            }
-            else if (size > 0 && astNodeList.get(size-1) instanceof AstFence) {
-                AstFence astFence = (AstFence) astNodeList.get(size-1);
-                if (astFence.uses == null)
-                    return empty;
-                return astFence.uses.toArray(new AstNode[astFence.uses.size()]);
-            } else if (size > 0 && astNodeList.get(size-1) instanceof AstCut) {
-                AstFence astFence = ((AstCut) astNodeList.get(size-1)).fence;
-                if (astFence == null || astFence.uses == null)
-                    return empty;
-                return astFence.uses.toArray(new AstNode[astFence.uses.size()]);
-            } else if (size > 1 && astNodeList.get(size-1) instanceof AstName){
-                AstNode astNode =  astNodeList.get(size-2);
-                AstDecl astDecl = null;
-                if (astNode instanceof AstDecl)
-                    astDecl = (AstDecl) astNode;
-                else if (astNode instanceof AstFuncDef)
-                    astDecl = ((AstFuncDef) astNode).funcDecl;
-                else if (astNode instanceof AstRef)
-                    astDecl = ((AstRef) astNode).decl;
-                else if (astNode instanceof AstCall)
-                    astDecl = ((AstCall) astNode).funcDecl;
-                else if (astNode instanceof AstNative)
-                    astDecl = ((AstNative) astNode).funcDecl;
-                else
-                    return null;
-                if (astDecl == null || astDecl.uses == null)
-                    return empty;
-                return astDecl.uses.toArray(new AstNode[astDecl.uses.size()]);
-            }
-            return null;
-        }
-
         // public void selectionChanged (IWorkbenchPart part, ISelection selection) {}
 
         public void selectionChanged (SelectionChangedEvent event) {
-            if (rfpReconcilingStrategy == null)
-                return;
-            AstImplem astImplem = rfpReconcilingStrategy.getAstImplem();
+            AstImplem astImplem = getAstImplem();
             if (astImplem == null)
                 return;
@@ -139 +79 @@
                 return;
             int offset = textSelection.getOffset();
-            AstNode[] astNodeList = getNodeList(astImplem, offset);
+            AstNode[] astNodeList = astInfo.getUses(offset);
             if (astNodeList == null)
                 return;
@@ -163 +103 @@
     private IPropertyChangeListener propertyChangeListener;
     private RfpSourceViewerConfiguration rfpSourceViewerConfiguration;
-    private  IPreferenceStore store;
-
+    private IPreferenceStore store;
+    public final AstInfo astInfo;
+
+    /** May be <code>null<code>! */
     RfpReconcilingStrategy rfpReconcilingStrategy = null;
 
@@ -172 +114 @@
             colorManager = new ColorManager();
         bracketMatcher = new BracketMatcher();
+        astInfo = new AstInfo(this);
         setDocumentProvider(new RfpDocumentProvider());
     }
@@ -325 +268 @@
                 .addPostSelectionChangedListener(new SelectionChangedListener());
     }
-    
+
     public BracketMatcher getBracketMatcher () {
         return bracketMatcher;
@@ -341 +284 @@
         setStatusLineErrorMessage(str);
     }
-    
-    public List<AstNode> getNodes (int offset) {
-        if (rfpReconcilingStrategy == null)
-            return null;
-        AstImplem astImplem = rfpReconcilingStrategy.getAstImplem();
-        if (astImplem == null)
-            return null;
-        return Searcher.search(astImplem, offset);
-    }
-    
+
+    /** May return <code>null<code>! */
+    public AstImplem getAstImplem () {
+        return rfpReconcilingStrategy != null ? rfpReconcilingStrategy.getAstImplem() : null;
+    }
+
     public RfpProject getRfpProject () {
         return RfpCore.getRfpProject(((IFile) getEditorInput().getAdapter(IFile.class)).getProject());

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

@@ -32 +32 @@
     }
 
+    /** May return <code>null<code>! */
     public synchronized AstImplem getAstImplem () {
         if (!isRelevant)

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

@@ -1 +1 @@
 package org.refal.rfpdt.editor;
-
-import java.util.List;
 
 import org.eclipse.jface.text.DefaultTextHover;
@@ -9 +7 @@
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.ui.texteditor.MarkerAnnotation;
-import org.refal.rfpdt.ast.AstName;
-import org.refal.rfpdt.ast.AstNode;
 import org.refal.rfpdt.ast.IHoverInfo;
 
@@ -25 +21 @@
         if (res != null)
             return res;
-        List<AstNode> astNodeList = editor.getNodes(hoverRegion.getOffset());
-        if (astNodeList == null)
-            return null;
-        int size = astNodeList.size();
-        if (size > 1 && astNodeList.get(size-1) instanceof AstName && astNodeList.get(size-2) instanceof IHoverInfo)
-            return ((IHoverInfo) astNodeList.get(size-2) ).getHoverInfo();
-        return null;
+        IHoverInfo iHoverInfo = editor.astInfo.getIHoverInfo(hoverRegion.getOffset());
+        return iHoverInfo != null ? iHoverInfo.getHoverInfo() : null;
     }
 

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

@@ -1 +1 @@
 package org.refal.rfpdt.ui.actions;
-
-import java.util.List;
 
 import org.eclipse.core.resources.IFile;
@@ -7 +5 @@
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.ide.IDE;
-import org.refal.rfpdt.ast.AstCall;
-import org.refal.rfpdt.ast.AstCut;
-import org.refal.rfpdt.ast.AstDecl;
-import org.refal.rfpdt.ast.AstFuncDef;
-import org.refal.rfpdt.ast.AstName;
-import org.refal.rfpdt.ast.AstNative;
 import org.refal.rfpdt.ast.AstNode;
-import org.refal.rfpdt.ast.AstRef;
-import org.refal.rfpdt.ast.AstVar;
 import org.refal.rfpdt.editor.RfpEditor;
 import org.refal.rfpdt.editor.RfpEditorMessages;
@@ -25 +15 @@
             return;
         ISourceViewer sourceViewer = editor.sourceViewer();
-        List<AstNode> nodeList = editor.getNodes(getSelection().getOffset());
-        if (nodeList == null) {
-            editor.statusLineErrorMessage(RfpEditorMessages.OpenDeclaration_error_invalidSelection);
-            sourceViewer.getTextWidget().getDisplay().beep();
-            return;
-        }
-        AstNode astNode = getNode(nodeList);
+        AstNode astNode = editor.astInfo.getDeclaration(getSelection().getOffset());
         if (astNode == null) {
             editor.statusLineErrorMessage(RfpEditorMessages.OpenDeclaration_error_invalidSelection);
@@ -51 +35 @@
         }
     }
-
-    private AstNode getNode (List<AstNode> astNodeList) {
-        int size = astNodeList.size();
-        AstVar astVar = null;
-        if (size > 0 && astNodeList.get(size - 1) instanceof AstVar)
-            astVar = (AstVar) astNodeList.get(size - 1);
-        else if (size > 1 && astNodeList.get(size - 2) instanceof AstVar)
-            astVar = (AstVar) astNodeList.get(size - 2);
-        if (astVar != null)
-            return astVar.varDefinition;
-        else if (size > 0 && astNodeList.get(size - 1) instanceof AstCut)
-            return ((AstCut) astNodeList.get(size - 1)).fence;
-        else if (size > 1 && astNodeList.get(size - 1) instanceof AstName) {
-            AstNode astNode = astNodeList.get(size - 2);
-            AstDecl astDecl = null;
-            if (astNode instanceof AstDecl)
-                astDecl = (AstDecl) astNode;
-            else if (astNode instanceof AstFuncDef)
-                astDecl = ((AstFuncDef) astNode).funcDecl;
-            else if (astNode instanceof AstRef)
-                astDecl = ((AstRef) astNode).decl;
-            else if (astNode instanceof AstCall)
-                astDecl = ((AstCall) astNode).funcDecl;
-            else if (astNode instanceof AstNative)
-                astDecl = ((AstNative) astNode).funcDecl;
-            else
-                return null;
-            return astDecl != null ? astDecl.name : null;
-        }
-        return null;
-    }
 }