Changeset 69d1ca8cf4ab8b63f93d4467f3d504c0ffdfabb7

Timestamp:

06/28/09 23:36:50 (8 months ago)

Author:

mb0 <mb0@…>

git-author:

mb0 <mb0@mb0.org> / 2009-06-09T22:25:17Z+0200

Parents:

2d81bf0e2ed8217c6cb2a26fcb22d09b8441f7a3

Children:

80657c560c55a46e8bdb3bcc2aef994a475d2511

git-committer:

mb0 <mb0@mb0.org> / 2009-06-28T23:36:50Z+0200

Message:

grammar

virtual semicolon insertion fix for rparen ')' reduced
semi insertion will be skipped if there is a control statement
like 'if'..'while' in the same line

as3

as3 parser resolves in 2 steps now.
builder caches and reuses parsecontroller
added content proposals for imports (only asdoc for now)

moved some helper methods to util class

hover helper presents real asdoc for resolved imports.
added hyper link detector implemetation that can handle string ids

and will find and open the asdoc resources

as3 node locator was not used updated implementation
as3 message handler got a dirty hack to correct the annotation region.
reference resolver trimmed down for now.
label provider offers images for ast classes now.

common

moved uri input to its own file in common.
added uri hyper link.

Files:

• org.axdt.as3.debug/src/org/axdt/as3/debug/launcher/AS3LauncherDelegate.java (modified) (3 diffs)
• org.axdt.as3/plugin.xml (modified) (1 diff)
• org.axdt.as3/src/org/axdt/as3/imp/builders/AS3Builder.java (modified) (8 diffs)
• org.axdt.as3/src/org/axdt/as3/imp/contentProposer/AS3ContentProposer.java (modified) (13 diffs)
• org.axdt.as3/src/org/axdt/as3/imp/contentProposer/AS3SourceProposal.java (modified) (2 diffs)
• org.axdt.as3/src/org/axdt/as3/imp/hoverHelper/AS3HoverHelper.java (modified) (4 diffs)
• org.axdt.as3/src/org/axdt/as3/imp/hyperLink/AS3HyperLinkDetector.java (added)
• org.axdt.as3/src/org/axdt/as3/imp/parser/AS3ASTNodeLocator.java (modified) (1 diff)
• org.axdt.as3/src/org/axdt/as3/imp/parser/AS3Lexer.gi (modified) (1 diff)
• org.axdt.as3/src/org/axdt/as3/imp/parser/AS3MessageHandler.java (modified) (3 diffs)
• org.axdt.as3/src/org/axdt/as3/imp/parser/AS3ParseController.java (modified) (5 diffs)
• org.axdt.as3/src/org/axdt/as3/imp/parser/DiagnoseVisitor.java (added)
• org.axdt.as3/src/org/axdt/as3/imp/parser/ResolvingVisitor.java (added)
• org.axdt.as3/src/org/axdt/as3/imp/parser/SymbolTableVisitor.java (modified) (6 diffs)
• org.axdt.as3/src/org/axdt/as3/imp/referenceResolvers/AS3ReferenceResolver.java (modified) (2 diffs)
• org.axdt.as3/src/org/axdt/as3/imp/treeModelBuilder/AS3LabelProvider.java (modified) (4 diffs)
• org.axdt.as3/src/org/axdt/as3/util/AS3ASTUtil.java (added)
• org.axdt.as3/src/org/axdt/as3/util/AS3Util.java (modified) (3 diffs)
• org.axdt.common/META-INF/MANIFEST.MF (modified) (1 diff)
• org.axdt.common/src/org/axdt/util/URIHyperLink.java (added)
• org.axdt.common/src/org/axdt/util/URIInput.java (added)

org.axdt.as3.debug/src/org/axdt/as3/debug/launcher/AS3LauncherDelegate.java

@@ -9 +9 @@
 import org.axdt.as3.debug.preferences.AS3DebugPreferences;
 import org.axdt.common.preferences.CompilerPreferences;
+import org.axdt.util.URIInput;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -31 +32 @@
 import org.eclipse.debug.core.model.IStreamsProxy;
 import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
-import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.program.Program;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IURIEditorInput;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
@@ -182 +180 @@
         }
 }
-
-class URIInput implements IURIEditorInput {
-
-        private final URI uri;
-
-        public URIInput(URI uri) {
-                this.uri = uri;
-        }
-
-        public URI getURI() {
-                return uri;
-        }
-
-        public boolean exists() {
-                return false;
-        }
-
-        public ImageDescriptor getImageDescriptor() {
-                return null;
-        }
-
-        public String getName() {
-                return uri.toString();
-        }
-
-        public IPersistableElement getPersistable() {
-                return null;
-        }
-
-        public String getToolTipText() {
-                return "";
-        }
-
-        @SuppressWarnings("unchecked")
-        public Object getAdapter(Class adapter) {
-                return null;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-                if (!(obj instanceof URIInput)) return false;
-                URIInput other = (URIInput) obj;
-                return uri.equals(other.uri);
-        }
-}

org.axdt.as3/plugin.xml

@@ -74 +74 @@
             language="AS3">
       </hoverHelper>
+   </extension>
+   <extension
+         point="org.eclipse.imp.runtime.hyperLink">
+      <hyperlinkDetector
+            class="org.axdt.as3.imp.hyperLink.AS3HyperLinkDetector"
+            language="AS3">
+      </hyperlinkDetector>
    </extension>
    <extension

org.axdt.as3/src/org/axdt/as3/imp/builders/AS3Builder.java

@@ -1 +1 @@
 package org.axdt.as3.imp.builders;
 
+import java.util.HashMap;
+
+import org.axdt.as3.AS3Plugin;
+import org.axdt.as3.imp.parser.AS3ParseController;
+import org.axdt.as3.preferences.AS3Preferences;
+import org.axdt.as3.util.AS3Util;
+import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
@@ -6 +13 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.content.IContentDescription;
-
+import org.eclipse.imp.builder.BuilderBase;
 import org.eclipse.imp.builder.BuilderUtils;
 import org.eclipse.imp.builder.MarkerCreator;
-import org.eclipse.imp.builder.BuilderBase;
 import org.eclipse.imp.language.Language;
 import org.eclipse.imp.language.LanguageRegistry;
@@ -15 +21 @@
 import org.eclipse.imp.model.ModelFactory;
 import org.eclipse.imp.model.ModelFactory.ModelException;
-import org.eclipse.imp.parser.IParseController;
 import org.eclipse.imp.runtime.PluginBase;
 import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.axdt.as3.AS3Plugin;
-import org.axdt.as3.imp.parser.AS3ParseController;
-import org.axdt.as3.preferences.AS3Preferences;
 
 /**
@@ -33 +34 @@
         public static final String PROBLEM_MARKER_ID = AS3Plugin.PLUGIN_ID + ".imp.builder.problem";
         public static final Language LANGUAGE = LanguageRegistry.findLanguage(AS3Plugin.LANGUAGE);
+        private HashMap<IPath, AS3ParseController> files;
 
         public AS3Builder() {
                 super();
+                files = new HashMap<IPath, AS3ParseController>();
         }
 
@@ -64 +67 @@
                 IPath path = file.getRawLocation();
                 if (path == null) return false;
+                IContainer sourceFolder = AS3Util.getSourceFolder(file);
 
-                String pathString = path.toString();
-                IPreferenceStore store = AS3Preferences.getInstance().getProjectStore(file);
-                String deployPart = store.getString(AS3Preferences.DEPLOY_PATH);
-                if (pathString.indexOf(deployPart) != -1) return false;
+                if (sourceFolder == null) return false;
 
                 return LANGUAGE.hasExtension(path.getFileExtension());
@@ -111 +112 @@
         protected void compile(final IFile file, IProgressMonitor monitor) {
                 try {
-                        IParseController parse = new AS3ParseController();
+                        
+                        AS3ParseController parse = getParseController(file);
 
                         MarkerCreator marker = new MarkerCreator(file, parse, PROBLEM_MARKER_ID);
@@ -132 +134 @@
                                 }
                         }
-                        parse.parse(contents, monitor);
+                        parse.parse(contents, true, monitor);
 
                 } catch (ModelException e) {
@@ -139 +141 @@
                 }
         }
+
+        private AS3ParseController getParseController(IFile file) {
+                IPath path = file.getFullPath();
+                AS3ParseController controller = files.get(path);
+                if (controller == null) {
+                        controller = new AS3ParseController();
+                        files.put(path, controller);
+                } else {
+                        AS3Plugin.getDefault().debug("reusing builder parse controller for "+ path);
+                }
+                return controller;
+        }
 }

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -17 +18 @@
 import org.axdt.as3.imp.parser.Ast.IAnnotatableDirective_full;
 import org.axdt.as3.imp.parser.Ast.IName;
+import org.axdt.as3.imp.parser.Ast.ImportDirective;
 import org.axdt.as3.imp.parser.Ast.PackageDefinition;
 import org.axdt.as3.preferences.AS3Preferences;
 import org.axdt.as3.templates.AS3TemplateCompletionProcessor;
+import org.axdt.as3.util.AS3Util;
+import org.axdt.axdoc.model.AXEntry;
+import org.axdt.axdoc.model.AXIndex;
+import org.axdt.axdoc.util.Index0r;
 import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.imp.editor.SourceProposal;
@@ -59 +66 @@
 
         private int offsetDiff;
+
+        private boolean nextIsSemi;
         
         private void clear() {
-                offsetWithinToken = offsetAfterToken = offsetBeforeToken = false;
+                offsetWithinToken = offsetAfterToken = offsetBeforeToken = nextIsSemi = false;
                 usingBackup = dontTrustTokens = false;
                 prefix = null; 
@@ -71 +80 @@
 
         public AS3ContentProposer() {
-                
         }
         private boolean tokenIsValid(IToken t) {
@@ -84 +92 @@
         }
         private String tokenIsValid(IToken t, int diff, int lendiff) {
-                String text = t.toString();
                 try {
+                        String text = t.toString();
                         int offset = t.getStartOffset()+diff;
                         int length = text.length()+lendiff;
@@ -97 +105 @@
                                         return string;
                         }
-                } catch (BadLocationException e) {
+                } catch (Exception e) {
                         AS3Plugin.getDefault().debug("error validating token", e);
                 }
@@ -151 +159 @@
                                 next = stream.getIToken(stream.getNext(token.getTokenIndex()));
                         }
+                        nextIsSemi = next.getKind() == Sym.TK_SEMI;
                         offsetWithinToken = Sym.isWithinToken(offset, token);
-                        offsetBeforeToken = token.getStartOffset() < token.getStartOffset();
+                        offsetBeforeToken = offset < token.getStartOffset();
                         if ((offsetAfterToken||offsetWithinToken) && Sym.isKeyword(token)) 
                                 return false;
@@ -174 +183 @@
                 for (IAst n = node; n != null; n = n.getParent()) {
                         if (n instanceof IAnnotatableDirective_full
+                         || n instanceof ImportDirective
                          || n instanceof PackageDefinition
                          ) {
@@ -187 +197 @@
                 Object object = control.parse(viewer.getDocument().get(), null);
                 return (object instanceof ASTNode) ? (ASTNode) object : null;
-        }
-        private String getExpectedMemberName() {
-                return control.getPath().removeFileExtension().lastSegment();
-        }
-        private String getExpectedPackageName() {
-                IContainer[] sourcePaths = AS3Preferences.getSourcePaths(control.getProject().getResource());
-                IPath path = control.getPath().removeLastSegments(1);
-                for (IContainer container: sourcePaths) {
-                        IPath srcPath = container.getFullPath().removeFirstSegments(1);
-                        if (srcPath.isPrefixOf(path)) {
-                                path = path.removeFirstSegments(srcPath.segmentCount());
-                                return path.toString().replace('/', '.');
-                        }
-                }
-                return "";
         }
         /**
@@ -230 +225 @@
                 ProposalHelper proposals = new ProposalHelper();
                 if (ast != null) {
-                        if (ancestors.size() > 0) {
+                        if (ancestors != null && ancestors.size() > 0) {
                                 IAst ancestor = ancestors.get(0);
                                 if (ancestor instanceof PackageDefinition) {
@@ -237 +232 @@
                                                 // in package header
                                                 IName nameNode = packdef.getName();
-                                                String packName = nameNode == null ? "" : nameNode.toString();
-                                                int startOffset = nameNode.getLeftIToken().getStartOffset();
-                                                prefix = packName;
-                                                if (offset > nameNode.getLeftIToken().getStartOffset() + packName.length()) {
-                                                        try {
-                                                        prefix = viewer.getDocument().get(startOffset, offset - startOffset);
-                                                        } catch (Exception e) {
-                                                                AS3Plugin.getDefault().debug("error fetching real name",e);
+                                                prefix = fetchName((IAst) nameNode);
+                                                IResource project = control.getProject().getResource();
+                                                String expectedName = AS3Util.getExpectedPackageName(project,project.getFullPath().append(control.getPath()));
+                                                if (!prefix.equals(expectedName))
+                                                        proposals.addSourceProposal(expectedName, prefix,PackageDefinition.class);
+                                        } else {
+                                                proposals.addUnitScopeProposals(node);
+                                                if (prefix.startsWith("import")) {
+                                                        for (String packname:Index0r.getInstance().getPackageNames()) {
+                                                                proposals.addSourceProposal("import "+packname+".*", prefix, ImportDirective.class, !nextIsSemi);
                                                         }
                                                 }
-                                                String expectedName = getExpectedPackageName();
-                                                if (!packName.equals(expectedName))
-                                                        proposals.addSourceProposal(expectedName, (ASTNode) nameNode);
-                                        } else {
-                                                proposals.addUnitScopeProposals(node);
+                                        }
+                                } else if (ancestor instanceof ImportDirective) {
+                                        IName nameNode = ((ImportDirective)ancestor).getName();
+                                        prefix = fetchName((IAst) nameNode);
+                                        int dotIndex = prefix.lastIndexOf('.');
+                                        Collection<String> packageNames = Index0r.getInstance().getPackageNames();
+                                        if (dotIndex > 0) {
+                                                String packname = prefix.substring(0,dotIndex);
+                                                String rest = prefix.substring(dotIndex+1);
+                                                if (packageNames.contains(packname)) {
+                                                        if ("*".equals(rest)) {
+                                                                return proposals.getResult();
+                                                        }
+                                                        for (AXIndex index:Index0r.getInstance().getPackages(packname)) {
+                                                                for (AXEntry entry:index.getEntries()) {
+                                                                        String entryname = entry.getName();
+                                                                        if (entryname != null && (rest.length() == 0 || entryname.startsWith(rest))) {
+                                                                                proposals.addSourceProposal(packname+"."+entryname, prefix, ImportDirective.class, !nextIsSemi);
+                                                                        }
+                                                                }
+                                                                if (rest.length() == 0) {
+                                                                        proposals.addSourceProposal(packname+".*", prefix, ImportDirective.class, !nextIsSemi);
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                        for (String packname:packageNames) {
+                                                if (packname.startsWith(prefix)) {
+                                                        proposals.addSourceProposal(packname+".*", prefix, ImportDirective.class, !nextIsSemi);
+                                                }
                                         }
                                 } else {
@@ -260 +282 @@
                         }
                 }
-                if (prefix.length() > 0) {
+                if (prefix != null && prefix.length() > 0) {
                         proposals.addKeywordProposals();
                         proposals.addTemplateProposals(viewer);
                 }
                 return proposals.getResult();
+        }
+        protected String fetchName(IAst nameNode) {
+                String name = nameNode == null ? "" : nameNode.toString();
+                int startOffset = nameNode == null ? offset : nameNode.getLeftIToken().getStartOffset();
+                if (offset > startOffset + name.length()) {
+                        try {
+                                name = viewer.getDocument().get(startOffset, offset - startOffset);
+                        } catch (Exception e) {
+                                AS3Plugin.getDefault().debug("error fetching real name",e);
+                        }
+                }
+                return name;
         }
         public static final Comparator<ICompletionProposal> ProposalComparator = new Comparator<ICompletionProposal>() {
@@ -281 +315 @@
                                 if (name.startsWith(prefix)) {
                                         IAst ast = table.findDeclaration(key);
-                                        result.add(new AS3SourceProposal(name, prefix, offset, ast));
-                                }
-                        }
-                }
-                void addSourceProposal(String packageName, ASTNode node) {
-                        result.add(new AS3SourceProposal(packageName, prefix, offset, node));
+                                        result.add(new AS3SourceProposal(name, prefix, offset, ast.getClass()));
+                                }
+                        }
+                }
+                void addSourceProposal(String packageName, String usePrefix, ASTNode node) {
+                        result.add(new AS3SourceProposal(packageName, usePrefix, offset, node.getClass()));
+                }
+                void addSourceProposal(String packageName, String usePrefix, Class<?> nodeClass) {
+                        result.add(new AS3SourceProposal(packageName, usePrefix, offset, nodeClass));
+                }
+                void addSourceProposal(String packageName, String usePrefix, Class<?> nodeClass, boolean addSemi) {
+                        if (addSemi) packageName += ";";
+                        result.add(new AS3SourceProposal(packageName, usePrefix, offset, nodeClass));
                 }
                 void addKeywordProposals() {

org.axdt.as3/src/org/axdt/as3/imp/contentProposer/AS3SourceProposal.java

@@ -1 +1 @@
 package org.axdt.as3.imp.contentProposer;
-
-import lpg.runtime.IAst;
 
 import org.axdt.as3.imp.treeModelBuilder.AS3LabelProvider;
@@ -9 +7 @@
 public class AS3SourceProposal extends SourceProposal {
 
-        private IAst node;
+        private Class<?> nodeClass;
 
-        public AS3SourceProposal(String newText, String prefix, int offset, IAst node) {
+        public AS3SourceProposal(String newText, String prefix, int offset, Class<?> nodeClass) {
                 super(newText, prefix, offset);
-                this.node = node;
+                this.nodeClass = nodeClass;
         }
 
         @Override
         public Image getImage() {
-                return AS3LabelProvider.getImageFor(node);
+                return AS3LabelProvider.getImageForClass(nodeClass);
         }
 }

org.axdt.as3/src/org/axdt/as3/imp/hoverHelper/AS3HoverHelper.java

@@ -5 +5 @@
 import lpg.runtime.IToken;
 
+import org.axdt.as3.AS3Plugin;
+import org.axdt.as3.imp.parser.Ast.ASTNode;
+import org.axdt.axdoc.model.AXIndexNode;
+import org.axdt.axdoc.model.AXNode;
+import org.axdt.axdoc.util.Index0r;
 import org.eclipse.imp.editor.AnnotationHoverBase;
 import org.eclipse.imp.language.ServiceFactory;
@@ -16 +21 @@
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.source.ISourceViewer;
-
-import org.axdt.as3.AS3Plugin;
-import org.axdt.as3.imp.parser.Ast.*;
-import org.axdt.axdoc.model.AXIndexNode;
 
 public class AS3HoverHelper extends HoverHelperBase implements IHoverHelper {
@@ -45 +46 @@
                         }
                 } catch (BadLocationException e) {
-                        return "??? (BadLocationException for annotation)";
+                        AS3Plugin.getDefault().log("Exception getting Annotation Hover", e);
+                        return null;
                 }
                 Object targetNode = null; // node referenced from current hover point
@@ -96 +98 @@
                         msg = getSubstring(parseController, def.getLeftIToken().getStartOffset(), def
                                         .getRightIToken().getEndOffset());
-                } else if (helpNode instanceof AXIndexNode) {
+                } else if (helpNode instanceof String) {
+                        msg = "id: "+ helpNode.toString()+"<br/>";
+                        AXIndexNode[] found = Index0r.getInstance().find(helpNode.toString());
+                        if (found.length > 0) {
+                                AXNode indexNode = found[0].getReference();
+                                if (indexNode != null && indexNode.getAsdoc().size() > 0) {
+                                        msg += indexNode.getAsdoc().get(0);
+                                }
+                        }
+                } else if (helpNode != null) {
                         msg = helpNode.toString();
                 }
-                int maxMsgLen = 80;
-                if (msg == null || msg.length() == 0) return "No help available";
-                else if (msg.length() <= maxMsgLen) return msg;
-                else return msg.subSequence(0, maxMsgLen) + "...";
+//              int maxMsgLen = 80;
+                if (msg == null || msg.length() == 0) return null;
+//              else if (msg.length() <= maxMsgLen) return msg;
+//              else return msg.subSequence(0, maxMsgLen) + "...";
+                return msg;
         }
 

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

@@ -1 +1 @@
 package org.axdt.as3.imp.parser;
+
+import lpg.runtime.IAst;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.imp.parser.LPGSourcePositionLocator;
 
-import org.axdt.as3.imp.parser.Ast.ASTNode;
-import org.axdt.as3.imp.parser.Ast.AbstractVisitor;
-import org.eclipse.imp.parser.ISourcePositionLocator;
-
-import lpg.runtime.*;
-
-public class AS3ASTNodeLocator implements ISourcePositionLocator {
-        private final Object[] fNode = new Object[1];
-
-        private int fStartOffset;
-        private int fEndOffset;
+public class AS3ASTNodeLocator extends LPGSourcePositionLocator {
 
         public AS3ASTNodeLocator() {
+                this(null);
         }
 
-        private final class NodeVisitor extends AbstractVisitor {
-                public void unimplementedVisitor(String s) {
-                        // System.out.println("NodeVisitor.unimplementedVisitor:
-                        // Unimplemented");
-                }
-
-                public boolean preVisit(IAst element) {
-                        int nodeStartOffset = element.getLeftIToken().getStartOffset();
-                        int nodeEndOffset = element.getRightIToken().getEndOffset();
-                        // System.out.println("LEGNodeLocator.NodeVisitor.preVisit(ASTNode):
-                        // Examining " + element.getClass().getName() +
-                        // " @ [" + nodeStartOffset + "->" + nodeEndOffset + ']');
-
-                        // If this node contains the span of interest then record it
-                        if (nodeStartOffset <= fStartOffset && nodeEndOffset >= fEndOffset) {
-                                // System.out.println("LEGNodeLocator.NodeVisitor.preVisit(ASTNode)
-                                // SELECTED for offsets [" + fStartOffset + ".." + fEndOffset +
-                                // "]");
-                                fNode[0] = element;
-                                return true; // to continue visiting here?
-                        }
-                        return false; // to stop visiting here?
-                }
-        }
-
-        private NodeVisitor fVisitor = new NodeVisitor();
-
-        public Object findNode(Object ast, int offset) {
-                return findNode(ast, offset, offset);
+        public AS3ASTNodeLocator(AS3ParseController parseController) {
+                super(parseController);
         }
 
         public Object findNode(Object ast, int startOffset, int endOffset) {
-                // System.out.println("Looking for node spanning offsets " + startOffset
-                // + " => " + endOffset);
-                fStartOffset = startOffset;
-                fEndOffset = endOffset;
-                // The following could be treated as an IASTNodeToken, but ASTNode
-                // is required for the visit/preVisit method, and there's no reason
-                // to use both of those types
-                ((ASTNode) ast).accept(fVisitor);
-                if (fNode[0] == null) {
-                        // System.out.println("Selected node: null");
-                } else {
-                        // System.out.println("Selected node: " + fNode[0] + " [" +
-                        // fNode[0].getLeftIToken().getStartOffset() + ".." +
-                        // fNode[0].getLeftIToken().getEndOffset() + "]");
-                }
-                return fNode[0];
+        return super.findNode(ast, startOffset, endOffset);
         }
 
-        public int getStartOffset(Object entity) {
+        public IPath getPath(Object entity) {
                 if (entity instanceof IAst) {
-                        IAst n = (IAst) entity;
-                        return n.getLeftIToken().getStartOffset();
-                } else if (entity instanceof IToken) {
-                        IToken t = (IToken) entity;
-                        return t.getStartOffset();
-                }
-                return 0;
+            IAst node= (IAst) entity;
+            return new Path(node.getLeftIToken().getIPrsStream().getFileName());
+        }
+        return super.getPath(entity);
         }
 
-        public int getEndOffset(Object entity) {
-                if (entity instanceof IAst) {
-                        IAst n = (IAst) entity;
-                        return n.getRightIToken().getEndOffset();
-                } else if (entity instanceof IToken) {
-                        IToken t = (IToken) entity;
-                        return t.getEndOffset();
+        @Override
+        public int getStartOffset(Object entity) {
+                if (entity instanceof String) {
+                        return -1;
                 }
-                return 0;
-        }
-
-        public int getLength(Object entity) {
-                return getEndOffset(entity) - getStartOffset(entity);
-        }
-
-        public IPath getPath(Object node) {
-                // TODO Determine path of compilation unit containing this node
-                return new Path("");
+                return super.getStartOffset(entity);
         }
 }

org.axdt.as3/src/org/axdt/as3/imp/parser/AS3Lexer.gi

@@ -663 +663 @@
                     //-- for most of the control statements 
                     //-- see http://axdt.org/ticket/151 for more info
+                    int lastLine = last.getLine();
                     switch (last.getKind()) {
-                    case $_RPAREN: break;
-                    case $_LCURLY: break;
+                    case AS3Parsersym.TK_LCURLY: break;
+                    case AS3Parsersym.TK_RPAREN:
+                        int lineOffset = lexStream.getLineOffset(lastLine-1);
+                        int nextLineOffset = lexStream.getLineOffset(lastLine);
+                        char[] chars = lexStream.getInputChars();
+                        StringBuilder buf = new StringBuilder(nextLineOffset-lineOffset);
+                        for (int i=lineOffset; i < chars.length && i < nextLineOffset; i++) {
+                           buf.append(chars[i]);
+                        }
+                        String result = buf.toString().trim();
+                        if (result.contains("if")||result.contains("while")||result.contains("for")||result.contains("do")||result.contains("with")) {
+                            break;
+                        }
                     default:
-                        int lastLine = last.getLine();
                         int newLine = lexStream.getLineNumberOfCharAt(startLoc); 
                         // and there is a linebreak

org.axdt.as3/src/org/axdt/as3/imp/parser/AS3MessageHandler.java

@@ -1 +1 @@
 package org.axdt.as3.imp.parser;
+
+import org.eclipse.imp.builder.MarkerCreator;
 
 import lpg.runtime.IMessageHandler;
@@ -27 +29 @@
         int endCol= msgLocation[END_COLUMN_INDEX];
 
-        String message = "";
+        StringBuilder message = new StringBuilder();
         
         if (errorCode < ParseErrorCodes.NO_MESSAGE_CODE) {
@@ -36 +38 @@
         }
 
-        for (int i = 0; i < errorInfo.length; i++)
-            message += " " + errorInfo[i];
-
-        handler.handleSimpleMessage(message, startOffset, startOffset + length - 1,
+        for (int i = 0; i < errorInfo.length; i++) {
+                if (i>0) message.append("; ");
+            message.append(errorInfo[i]);
+        }
+        int endOffset = startOffset + length -1;
+        if (handler instanceof MarkerCreator) endOffset++;
+        handler.handleSimpleMessage(message.toString(), startOffset, endOffset,
                 startCol, endCol, startLine, endLine);
         }

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

@@ -1 +1 @@
 package org.axdt.as3.imp.parser;
+
+import java.util.Stack;
 
 import org.axdt.as3.AS3Plugin;
 import org.axdt.as3.imp.parser.Ast.ASTNode;
+import org.axdt.as3.imp.parser.Ast.Program;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -48 +51 @@
                 return lexer;
         }
-
-        public ISourcePositionLocator getNodeLocator() {
-                return new AS3ASTNodeLocator();
+        
+        @Override
+        public ISourcePositionLocator getSourcePositionLocator() {
+                return new AS3ASTNodeLocator(this);
         }
 
@@ -59 +63 @@
 
         public Object parse(String contents, IProgressMonitor monitor) {
-                return parse(contents, false, monitor);
+                return parse(contents, true, monitor);
         }
         /**
          * setFilePath() should be called before calling this method.
          */
-        public Object parse(String contents, boolean scanOnly, IProgressMonitor monitor) {
+        public Object parse(String contents, boolean resolve, IProgressMonitor monitor) {
                 if (monitor == null) monitor = new NullProgressMonitor();
                 int newHash = contents.hashCode();
@@ -79 +83 @@
                         lexer = new AS3Lexer();
                 }
-                lexer.reset(contentsArray, fFilePath.toPortableString());
+                IPath fullpath = fProject.getResource().getLocation().append(fFilePath);
+                lexer.reset(contentsArray, fullpath.toString());
 
                 if (parser == null) {
@@ -99 +104 @@
 
                 if (fCurrentAst instanceof ASTNode) {
-                        parser.resolve((ASTNode) fCurrentAst);
+                        ASTNode node = (ASTNode) fCurrentAst;
+                        resolveSymbolTable(node);
+                        if (resolve) {
+                                resolveDeclarations(node);
+                        }
                 }
 
                 cacheKeywordsOnce();
 
-                Object result = fCurrentAst;
-                return result;
+                return fCurrentAst;
+        }
+        
+        protected void resolveDeclarations(ASTNode root) {
+                root.accept(new ResolvingVisitor(parser));
+        }
+
+        protected void resolveSymbolTable(ASTNode root) {
+                parser.symbolTableStack = new Stack<SymbolTable>();
+                parser.topLevelSymbolTable = new SymbolTable(null, Program.class);
+                parser.symbolTableStack.push(parser.topLevelSymbolTable);
+                root.accept(new SymbolTableVisitor(parser));
         }
 

org.axdt.as3/src/org/axdt/as3/imp/parser/SymbolTableVisitor.java

@@ -2 +2 @@
 
 import lpg.runtime.IAst;
-import lpg.runtime.ILexStream;
-import lpg.runtime.IPrsStream;
 import lpg.runtime.IToken;
-import lpg.runtime.ParseErrorCodes;
 
-import org.axdt.as3.imp.parser.Ast.ASTNode;
-import org.axdt.as3.imp.parser.Ast.AbstractVisitor;
 import org.axdt.as3.imp.parser.Ast.AssignmentExpression;
 import org.axdt.as3.imp.parser.Ast.AttributeList;
@@ -17 +12 @@
 import org.axdt.as3.imp.parser.Ast.FunctionExpression;
 import org.axdt.as3.imp.parser.Ast.IAttributeExpression;
-import org.axdt.as3.imp.parser.Ast.ImportDirective;
 import org.axdt.as3.imp.parser.Ast.InterfaceDefinition;
-import org.axdt.as3.imp.parser.Ast.Name;
 import org.axdt.as3.imp.parser.Ast.PackageDefinition;
 import org.axdt.as3.imp.parser.Ast.PlainParameter;
@@ -25 +18 @@
 import org.axdt.as3.imp.parser.Ast.VariableBinding;
 import org.axdt.as3.imp.parser.Ast.VariableDefinition;
-import org.axdt.axdoc.model.AXIndex;
-import org.axdt.axdoc.model.AXIndexNode;
-import org.axdt.axdoc.util.Index0r;
 
-public class SymbolTableVisitor extends AbstractVisitor {
-
-        private final IPrsStream prs;
-        private final ILexStream lex;
-        private final AS3Parser parser;
-        private Index0r index0r;
+public class SymbolTableVisitor extends DiagnoseVisitor {
 
         public SymbolTableVisitor(AS3Parser parser) {
-                this.prs = parser.getIPrsStream();
-                this.lex = prs.getILexStream();
-                this.parser = parser;
-                index0r = Index0r.getInstance();
+                super(parser);
         }
 
@@ -51 +33 @@
         private SymbolTable peekTable() {
                 return parser.symbolTableStack.peek();
-        }
-
-        public void unimplementedVisitor(String s) {
-                // Useful for debugging:
-                // System.out.println(s);
-        }
-
-        public void emitError(IToken id, String message) {
-                lex.getMessageHandler().handleMessage(ParseErrorCodes.NO_MESSAGE_CODE,
-                                lex.getLocation(id.getStartOffset(), id.getEndOffset()), lex.getLocation(0, 0),
-                                prs.getFileName(), new String[] {message});
-        }
-
-        public void emitError(ASTNode node, String message) {
-                lex.getMessageHandler().handleMessage(
-                                ParseErrorCodes.NO_MESSAGE_CODE,
-                                lex.getLocation(node.getLeftIToken().getStartOffset(), node.getRightIToken()
-                                                .getEndOffset()), lex.getLocation(0, 0), prs.getFileName(),
-                                new String[] {message});
-        }
-
-        public void emitError(int startOffset, int endOffset, String message) {
-                lex.getMessageHandler().handleMessage(ParseErrorCodes.NO_MESSAGE_CODE,
-                                lex.getLocation(startOffset, endOffset), lex.getLocation(0, 0), prs.getFileName(),
-                                new String[] {message});
         }
 
@@ -89 +46 @@
         @Override
         public boolean visit(PackageDefinition n) {
-                // check if name corresponds with folder names
-                if (n.getName() != null) {
-                        Name name = (Name) n.getName();
-                        String fileName = parser.getIPrsStream().getFileName();
-                        String expectedFolder = name.toString().replace('.', '/')+"/";
-                        String[] split = fileName.split("/"+expectedFolder);
-                        if (split.length!= 2)
-                                emitError(name, "package names match the folder structure.");
-                        // fill declaration with false
-                        Name current = name;
-                        while (current!=null) {
-                                current.getIdent().setDeclaration(Boolean.FALSE);
-                                current = current.getQualifier() instanceof Name ?
-                                                (Name)current.getQualifier() : null;
-                        }
-                }
-                // TODO check if split[0] is a valid source path
                 return true;
-        }
-        public boolean visit(ImportDirective n) {
-                Name name = (Name) n.getName();
-                boolean onDemand = n.getOnDemand()!=null;
-                if (name.getQualifier()==null||onDemand) {
-                        if (onDemand) {
-                                AXIndex[] findPackage = index0r.findPackage(name.toString());
-                                if (findPackage.length==1) 
-                                        name.getIdent().setDeclaration(findPackage[0]);
-                                else if (findPackage.length>1)
-                                        name.getIdent().setDeclaration(findPackage);
-                                else emitError(name, "could not resolve import");
-                        } else {
-                                // does anyone want to import toplevel members ?
-                                emitError(name, "unused import. toplevel members can be used without import?!");
-                        }
-                } else {
-                        Name qualifier = (Name) name.getQualifier();
-                        AXIndexNode[] findMember = index0r.findMember(qualifier.toString(), name.getIdent().toString());
-                        if (findMember.length==1) 
-                                name.getIdent().setDeclaration(findMember[0]);
-                        else if (findMember.length>1)
-                                name.getIdent().setDeclaration(findMember);
-                        else emitError(name, "could not resolve import");
-                        while (qualifier != null) {
-                                qualifier.getIdent().setDeclaration(Boolean.TRUE);
-                                qualifier = qualifier.getQualifier() instanceof Name ?
-                                        (Name) qualifier.getQualifier() : null;
-                        }
-                }
-                return false;
         }
         public boolean visit(ClassDefinition n) {
                 n.setSymbolTable(pushNewTable(n.getClass()));
-                Name name = (Name) n.getName();
-                checkTypeName(name);
-                checkPackageDirectiveName(name);
                 return true;
         }
@@ -153 +59 @@
         @Override
         public boolean visit(InterfaceDefinition n) {
-                Name name = (Name) n.getName();
-                checkTypeName(name);
-                checkPackageDirectiveName(name);
                 return true;
-        }
-        private void checkTypeName(Name name) {
-                if (name.getQualifier()!=null)
-                        emitError(name, "type names are not qualified. the package name belongs in the package declaration");
-                name.getIdent().setDeclaration(Boolean.FALSE);
-        }
-        private void checkPackageDirectiveName(Name name) {
-                IAst grandp = name;
-                while (grandp != null) {
-                        grandp = grandp.getParent();
-                        if (grandp instanceof PackageDefinition)
-                                break;
-                }
-                if (grandp != null) {
-                        String fileName = parser.getIPrsStream().getFileName();
-                        String nameString = name.getIdent().toString();
-                        if (!fileName.endsWith(nameString+".as")) 
-                                emitError(name, "name should match the file name");
-                }
         }
 

org.axdt.as3/src/org/axdt/as3/imp/referenceResolvers/AS3ReferenceResolver.java

@@ -5 +5 @@
 import org.axdt.as3.imp.parser.AS3Parser;
 import org.axdt.as3.imp.parser.SymbolTable;
-import org.axdt.as3.imp.parser.Ast.IName;
 import org.axdt.as3.imp.parser.Ast.Ident;
-import org.axdt.axdoc.model.AXIndex;
-import org.axdt.axdoc.util.Index0r;
+import org.axdt.as3.util.AS3ASTUtil;
 import org.eclipse.imp.language.ILanguageService;
 import org.eclipse.imp.parser.IParseController;
@@ -38 +36 @@
                 if (node instanceof Ident) {
                         Ident id = (Ident) node;
-                        Object decl = id.getDeclaration();
-                        if (decl != null) return decl;
-                        IAst parent = id.getParent();
-                        String stringId = id.toString();
-                        Index0r index0r = Index0r.getInstance();
-                        if (parent instanceof IName) {
-                                stringId = parent.toString();
-                                AXIndex[] indexes = index0r.findPackage(stringId);
-                                if (indexes.length > 0) {
-                                        id.setDeclaration(indexes[0]);
-                                        return indexes[0];
+                        Object decl = AS3ASTUtil.getDeclaration(id);
+                        if (decl == null) {
+                                decl = lookInSymbolTable(controller,(IAst) node,id.toString());
+                                if (decl != null) {
+                                        id.setDeclaration(decl);
+                                }
+                        } else {
+                                if (Boolean.FALSE.equals(decl)) {
+                                        // false indicates declaration
+                                        // do we want to return id or relevant directive ?
+                                        return null;
+                                }
+                                if (String.class.equals(decl.getClass())) {
+                                        // TODO find indexed item with id
+                                        return decl;
                                 }
                         }
-                        // find local declaration
-                        decl = lookInSymbolTable(controller,(IAst) node,stringId);
-                        if (decl != null) {
-                                id.setDeclaration(decl);
-                                return decl;
-                        }
-                        System.err.println(stringId);
+                        return decl;
                 }
                 return null;

org.axdt.as3/src/org/axdt/as3/imp/treeModelBuilder/AS3LabelProvider.java

@@ -86 +86 @@
         public static Image getImageFor(IAst n) {
                 if (n == null) return null;
-                if (n instanceof PackageDefinition) return OUTLINE_PACKAGE_IMAGE;
-                if (n instanceof ImportDirective) return OUTLINE_IMPORT_IMAGE;
-                if (n instanceof ImportDirectiveList) return OUTLINE_IMPORT_LIST_IMAGE;
-                if (n instanceof ClassDefinition) return OUTLINE_CLASS_IMAGE;
-                if (n instanceof InterfaceDefinition) return OUTLINE_INTERFACE_IMAGE;
-                if (n instanceof VariableBinding) {
+                Image result = getImageForClass(n.getClass());
+                if (result.equals(LOCAL_VAR_IMAGE)) {
                         IAst parent = ((VariableBinding) n).getParent().getParent();
                         if (parent instanceof VariableDefinition) {
@@ -103 +99 @@
                                 }
                                 return OUTLINE_PUBLIC_FIELD_IMAGE;
-                        } else {
-                                return LOCAL_VAR_IMAGE;
                         }
-                }
-                if (n instanceof FunctionDefinition) {
+                } else if (result.equals(OUTLINE_PUBLIC_METHOD_IMAGE)) {
                         FunctionDefinition method = (FunctionDefinition) n;
                         AttributeList attributes = method.getAttributes();
@@ -119 +112 @@
                         }
                         if (method.isConstructor) return OUTLINE_PUBLIC_CONSTRUCTOR_IMAGE;
-                        return OUTLINE_PUBLIC_METHOD_IMAGE;
-                }
-                return null;
+                } 
+                return result;
         }
 
@@ -168 +160 @@
                 fListeners.remove(listener);
         }
+
+        public static Image getImageForClass(Class<?> nodeClass) {
+                if (nodeClass == null) return null;
+                if (PackageDefinition.class.isAssignableFrom(nodeClass)) return OUTLINE_PACKAGE_IMAGE;
+                if (ImportDirective.class.isAssignableFrom(nodeClass)) return OUTLINE_IMPORT_IMAGE;
+                if (ImportDirectiveList.class.isAssignableFrom(nodeClass)) return OUTLINE_IMPORT_LIST_IMAGE;
+                if (ClassDefinition.class.isAssignableFrom(nodeClass)) return OUTLINE_CLASS_IMAGE;
+                if (InterfaceDefinition.class.isAssignableFrom(nodeClass)) return OUTLINE_INTERFACE_IMAGE;
+                if (VariableBinding.class.isAssignableFrom(nodeClass)) return LOCAL_VAR_IMAGE;
+                if (FunctionDefinition.class.isAssignableFrom(nodeClass)) return OUTLINE_PUBLIC_METHOD_IMAGE;
+                return null;
+        }
 }

org.axdt.as3/src/org/axdt/as3/util/AS3Util.java

@@ -3 +3 @@
 import org.axdt.as3.preferences.AS3Preferences;
 import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
 
 public class AS3Util {
-
         public static IContainer getSourceFolder(IResource res) {
                 IContainer[] folders = AS3Preferences.getSourcePaths(res);
+                if (res instanceof IProject) {
+                        return folders[0];
+                }
                 for (IContainer folder:folders) {
                         if (folder.getFullPath().isPrefixOf(res.getFullPath())) {
@@ -22 +26 @@
                 if (srcFolder == null) return "";
                 IPath srcPath = srcFolder.getFullPath();
-                IPath filePath = res.getFullPath();
+                IPath filePath = res instanceof IFile ? res.getFullPath().removeLastSegments(1) : res.getFullPath();
                 int i = filePath.matchingFirstSegments(srcPath);
                 IPath packge = filePath.removeFirstSegments(i);
@@ -32 +36 @@
                 return result.toString();
         }
+        public static String getExpectedMemberName(IResource res) {
+                return getExpectedMemberName(res.getFullPath());
+        }
+        public static String getExpectedMemberName(IPath path) {
+                return path.removeFileExtension().lastSegment();
+        }
+        public static String getExpectedPackageName(IResource file) {
+                return getExpectedPackageName(file, file.getFullPath());
+        }
+        public static String getExpectedPackageName(IResource res, IPath filePath) {
+                IContainer[] sourcePaths = AS3Preferences.getSourcePaths(res);
+                filePath = filePath.removeLastSegments(1);
+                for (IContainer container: sourcePaths) {
+                        IPath srcPath = container.getFullPath();
+                        if (srcPath.isPrefixOf(filePath)) {
+                                filePath = filePath.removeFirstSegments(srcPath.segmentCount());
+                                return filePath.toString().replace('/', '.');
+                        }
+                }
+                return "";
+        }
 }

org.axdt.common/META-INF/MANIFEST.MF

@@ -12 +12 @@
  org.eclipse.text,
  org.eclipse.debug.ui,
- org.eclipse.ui.ide
+ org.eclipse.ui.ide,
+ org.eclipse.jface.text;bundle-version="3.4.2"
 Eclipse-LazyStart: true
 Export-Package: org.axdt.actions,