Changeset 111

Timestamp:

07/14/08 02:19:00 (6 months ago)

Author:

mb0

Message:

added local (cunit, scoped) content assist for declaration names.

Files:

• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/contentProposer/AS3ContentProposer.java (modified) (3 diffs)
• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/AS3ASTNodeLocator.java (modified) (2 diffs)
• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/AS3ParseController.java (modified) (3 diffs)
• axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/AS3Parser.g (modified) (2 diffs)

axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/contentProposer/AS3ContentProposer.java

@@ -2 +2 @@
-
-import org.axdt.as3.imp.parser.*;
+import org.axdt.as3.imp.parser.AS3Parser.SymbolTable;
-import org.axdt.as3.imp.parser.Ast.*;
-import org.axdt.as3.templates.AS3TemplateCompletionProcessor;
@@ -61 +62 @@
-        public ICompletionProposal[] getContentProposals(IParseController controller, int offset,
-                        ITextViewer viewer) {
-                // START_HERE
-                AS3TemplateCompletionProcessor templateProcessor = new AS3TemplateCompletionProcessor();
-                ICompletionProposal[] templateProposals = templateProcessor.computeCompletionProposals(
-                                viewer, offset);
-                ArrayList<ICompletionProposal> list = new ArrayList<ICompletionProposal>(); // a
-
-
-
-
-
+
+
+
+
-                if (controller.getCurrentAst() != null) {
-                        IToken token = getToken(controller, offset);
-                        boolean hasspace = offset > token.getEndOffset() + 1;
-                        String prefix = getPrefix(token, offset);
-
-                        AS3ASTNodeLocator locator = new AS3ASTNodeLocator();
-                        ASTNode node = (ASTNode) locator.findNode(controller.getCurrentAst(), token
-                                        .getStartOffset(), token.getEndOffset());
+                        Set<String> set = getUnitScopeNames(node, prefix);
+                        for (String key:set) 
+                                list.add(new SourceProposal(key,"",offset));
-                        if (node != null) {
-                                if (node instanceof BadDirective) {
@@ -104 +103 @@
-                        }
-                } else {
-
+
+
+
+
+
+
+
+
+
-                }
+                for (ICompletionProposal prop:templateProposals)
+                        list.add(prop);
-                return (ICompletionProposal[]) list.toArray(new ICompletionProposal[list.size()]);
-        }
+        private Set<String> getUnitScopeNames(Object findNode, String prefix) {
+                Set<String> set = new HashSet<String>();
+                if (findNode instanceof ASTNode) {
+                        ASTNode node = (ASTNode) findNode;
+                        SymbolTable table = new AS3ASTNodeLocator().getEnclosingSymbolTable(node);
+                        List<String> allKeys = table.getAllKeys(null);
+                        for (String key:allKeys) {
+                                // TODO: handle namespaces
+                                if (key.contains("::")) continue;
+                                key = key.trim();
+                                if (key.contains(" "))
+                                        key = key.substring(key.lastIndexOf(' ')+1);
+                                if (key.startsWith(prefix))
+                                        set.add(key);
+                        }
+                }
+                return set; 
+        }
-}

axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/AS3ASTNodeLocator.java

@@ -4 +4 @@
-import org.eclipse.core.runtime.Path;
-
+import org.axdt.as3.imp.parser.AS3Parser.SymbolTable;
-import org.axdt.as3.imp.parser.Ast.ASTNode;
-import org.axdt.as3.imp.parser.Ast.AbstractVisitor;
+import org.axdt.as3.imp.parser.Ast.Block;
+import org.axdt.as3.imp.parser.Ast.ClassBody;
+import org.axdt.as3.imp.parser.Ast.ClassDeclaration;
+import org.axdt.as3.imp.parser.Ast.ForStatement;
+import org.axdt.as3.imp.parser.Ast.FunctionExpression;
+import org.axdt.as3.imp.parser.Ast.InterfaceBody;
+import org.axdt.as3.imp.parser.Ast.MethodDeclaration;
-import org.eclipse.imp.parser.ISourcePositionLocator;
-
@@ -99 +107 @@
-                return new Path("");
-        }
+        public SymbolTable getEnclosingSymbolTable(IAst n) {
+                for (; n != null; n = n.getParent()) {
+                        if (n instanceof Block) return ((Block) n).getSymbolTable();
+                        if (n instanceof MethodDeclaration) return ((MethodDeclaration) n).getSymbolTable();
+                        if (n instanceof FunctionExpression) return ((FunctionExpression) n).getSymbolTable();
+                        if (n instanceof ClassBody) return ((ClassBody) n).getSymbolTable();
+                        if (n instanceof ClassDeclaration) return ((ClassDeclaration) n).getSymbolTable();
+                        if (n instanceof InterfaceBody) return ((InterfaceBody) n).getSymbolTable();
+                        if (n instanceof ForStatement) return ((ForStatement) n).getSymbolTable();
+                }
+                return null;
+        }
-}

axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/AS3ParseController.java

@@ -26 +26 @@
-
-        private AS3Lexer lexer;
+
+        private Object backupAst;
-
-        public AS3ParseController() {
@@ -83 +85 @@
-                // inconsistent wrt the lex stream now
-                if (my_monitor.isCancelled()) return fCurrentAst;
+                
+                if (fCurrentAst != null)
+                        backupAst = fCurrentAst;
-
-                fCurrentAst = parser.parser(my_monitor, 0);
@@ -100 +105 @@
-                return result;
-        }
+
+        public Object getBackupAst() {
+                return backupAst;
+        }
-}

axdt/trunk/org.axdt.as3/src/org/axdt/as3/imp/parser/AS3Parser.g

@@ -19 +19 @@
-    /.import org.eclipse.imp.parser.IParser;
-    import java.util.Hashtable;
+    import java.util.ArrayList;
+    import java.util.List;
-    import java.util.Stack;
-    ./
@@ -568 +570 @@
-                                return false;
-                        }
+                        
+                        public List<String> getAllKeys(List<String> list) {
+                                if (list == null)
+                                        list = new ArrayList<String>();
+                                list.addAll(keySet());
+                                if (parent != null) parent.getAllKeys(list);
+                                return list;
+                        }
-                }
-