Changeset 3384 for devel-tools/trunk

Timestamp:

Feb 7, 2008, 2:44:46 PM (13 years ago)

Author:

yura

Message:

• Globa searcher - returns stack of AstNode?.

Location:

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

Files:

• RfpEditor.java (modified) (3 diffs)
• RfpTextHover.java (modified) (3 diffs)
• SearchVisitor.java (deleted)

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

@@ -42 +42 @@
 import org.refal.plus.rfpdt.comp.ast.AstFuncDef;
 import org.refal.plus.rfpdt.comp.ast.AstImplem;
+import org.refal.plus.rfpdt.comp.ast.AstName;
 import org.refal.plus.rfpdt.comp.ast.AstNode;
 import org.refal.plus.rfpdt.comp.ast.AstRef;
 import org.refal.plus.rfpdt.comp.ast.AstVar;
+import org.refal.plus.rfpdt.comp.ast.Searcher;
 import org.refal.plus.rfpdt.editor.PresentationVisitor.StylePosition;
 import org.refal.plus.rfpdt.editor.color.ColorManager;
@@ -71 +73 @@
 
         private AstNode[] getNodeList (AstImplem astImplem, int offset) {
-            AstNode astNode = SearchVisitor.search(astImplem, offset);
-            if (astNode instanceof AstVar) {
-                AstVar astVar = ((AstVar) astNode).varDefinition;
+            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 (astNode instanceof AstFence) {
-                AstFence astFence = (AstFence) astNode;
+            }
+            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 (astNode instanceof AstCut) {
-                AstFence astFence = ((AstCut) astNode).fence;
+            } 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 {
+            } else if (size > 1 && astNodeList.get(size-1) instanceof AstName){
+                AstNode astNode =  astNodeList.get(size-2);
                 AstDecl astDecl = null;
                 if (astNode instanceof AstDecl)
@@ -103 +113 @@
                 return astDecl.uses.toArray(new AstNode[astDecl.uses.size()]);
             }
+            return null;
         }
 

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

@@ -1 +1 @@
 package org.refal.plus.rfpdt.editor;
+
+import java.util.ArrayList;
 
 import org.eclipse.jface.text.DefaultTextHover;
@@ -8 +10 @@
 import org.eclipse.ui.texteditor.MarkerAnnotation;
 import org.refal.plus.rfpdt.comp.ast.AstImplem;
+import org.refal.plus.rfpdt.comp.ast.AstName;
 import org.refal.plus.rfpdt.comp.ast.AstNode;
 import org.refal.plus.rfpdt.comp.ast.IHoverInfo;
+import org.refal.plus.rfpdt.comp.ast.Searcher;
 
 public class RfpTextHover extends DefaultTextHover {
@@ -28 +32 @@
         if (astImplem == null)
             return null;
-        AstNode astNode = SearchVisitor.search(astImplem, hoverRegion.getOffset());
-        if (!(astNode instanceof IHoverInfo))
-            return null;
-        return ((IHoverInfo) astNode).getHoverInfo();
+        ArrayList<AstNode> astNodeList = Searcher.search(astImplem, hoverRegion.getOffset());
+        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;
     }