Changeset 1567fcce2711ee19e98902f8ef734f1a7dd9731f

Timestamp:

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

Author:

mb0 <mb0@…>

Children:

b32f7a496c511e07158f0d0752addedc2b378328

Parents:

364575fc79ca0a2d7d0efbd5c165c1d2dfc36a3b

git-author:

mb0 <mb0@…> (06/11/09 05:29:42)

git-committer:

mb0 <mb0@…> (06/28/09 23:36:50)

Message:

content proposer uses new parse stream when using backup ast.
if there is an error we can still collect accurate token information.

Files:

• org.axdt.as3/src/org/axdt/as3/imp/services/AS3ContentProposer.java (modified) (9 diffs)

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

@@ -28 +28 @@
 import org.eclipse.imp.editor.SourceProposal;
 import org.eclipse.imp.parser.IParseController;
+import org.eclipse.imp.parser.IParser;
 import org.eclipse.imp.services.IContentProposer;
-import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
@@ -38 +38 @@
         
         private boolean offsetWithinToken;
-        private boolean usingBackup;
         private int offset;
         private AS3ParseController control;
@@ -56 +55 @@
         private ITextViewer viewer;
 
-        private boolean dontTrustTokens;
+        private boolean usingBackup;
 
         private int originalOffset;
 
-        private boolean offsetBeforeToken;
 
         private int offsetDiff;
@@ -67 +65 @@
         
         private void clear() {
-                offsetWithinToken = offsetAfterToken = offsetBeforeToken = nextIsSemi = false;
-                usingBackup = dontTrustTokens = false;
+                offsetWithinToken = offsetAfterToken = nextIsSemi = false;
                 prefix = null; 
                 ancestors = null;
                 token = previous = next = null;
-                ast = node = null;
-                originalOffset = offset;
+                node = null;
         }
 
         public AS3ContentProposer() {
-        }
-        private boolean tokenIsValid(IToken t) {
-                String text = t.toString();
-                try {
-                        String string = viewer.getDocument().get(t.getStartOffset(), text.length());
-                        return text.equals(string);
-                } catch (BadLocationException e) {
-                        AS3Plugin.getDefault().debug("error validating token", e);
-                }
-                return false;
-        }
-        private String tokenIsValid(IToken t, int diff, int lendiff) {
-                try {
-                        String text = t.toString();
-                        int offset = t.getStartOffset()+diff;
-                        int length = text.length()+lendiff;
-                        String string = viewer.getDocument().get(offset, length);
-                        if (lendiff>0) {
-                                if (string.startsWith(text)) {
-                                        return string;
-                                }
-                        } else if (diff != 0) {
-                                if (text.equals(string))
-                                        return string;
-                        }
-                } catch (Exception e) {
-                        AS3Plugin.getDefault().debug("error validating token", e);
-                }
-                return null;
         }
         protected boolean collectInfo(IParseController controller, int offset, ITextViewer viewer) {
@@ -112 +79 @@
                 this.offset = offset;
                 offsetDiff = offset - originalOffset;
+                usingBackup = false;
+                ast = null;
                 ASTNode newast = getAst();
                 if (newast != null && newast == ast) {
                         AS3Plugin.getDefault().debug("using old ast nothing changed");
                         return true;
+                }
+                IParser parser = control.getParser();
+                IPrsStream stream = parser.getIPrsStream();
+                if (stream == null)  {
+                        AS3Plugin.getDefault().debug("no error lexing.");
+                        return false;
                 }
                 if (newast == null) {
@@ -125 +100 @@
                         }
                         newast = (ASTNode) backupAst;
-                        String validPrefix = tokenIsValid(token,0,offsetDiff);
-                        if (validPrefix != null) {
-                                if (offsetDiff>0) {
-                                        boolean previousIsValid = tokenIsValid(previous);
-                                        boolean nextIsValid = null != tokenIsValid(next,offsetDiff,0);
-                                        if (previousIsValid && nextIsValid) {
-                                                prefix = validPrefix;
-                                                dontTrustTokens = true;
-                                                this.offset = offset;  
-                                                AS3Plugin.getDefault().debug("recovery ok.");
-                                                return true;
-                                        }
-                                }
-                        }
-                        return false;
+                        usingBackup = true;
+                } else {
+                        originalOffset = offset;
                 }
                 clear();
                 try {
                         ast = newast;
-                        IPrsStream stream = control.getParser().getIPrsStream();
-                        int index = stream.getTokenIndexAtCharacter(offset);
+                        int myOffset = offset;
+                        int index = stream.getTokenIndexAtCharacter(myOffset);
                         token = getToken(stream, index < 0 ? -index + 1: index);
                         previous = getToken(stream, token.getTokenIndex()-1);
-                        if (previous.getEndOffset() == offset - 1) {
-                                offsetAfterToken = true;
+                        offsetAfterToken = previous.getEndOffset() == myOffset - 1;
+                        if (offsetAfterToken || token.getKind() == Sym.TK_SEMI 
+                                || (myOffset < token.getStartOffset()&& stream.getILexStream().getLineNumberOfCharAt(myOffset) < token.getLine())) {
                                 next = token;
                                 token = previous;
                                 previous = stream.getIToken(token.getTokenIndex()-1);
-                        } else {
+                        }
+                        if (next == null){
                                 next = stream.getIToken(stream.getNext(token.getTokenIndex()));
                         }
                         nextIsSemi = next.getKind() == Sym.TK_SEMI;
-                        offsetWithinToken = Sym.isWithinToken(offset, token);
-                        offsetBeforeToken = offset < token.getStartOffset();
+                        offsetWithinToken = Sym.isWithinToken(myOffset, token);
                         if ((offsetAfterToken||offsetWithinToken) && Sym.isKeyword(token)) 
                                 return false;
-                        this.prefix = offsetWithinToken ? Sym.getPrefix(offset, token) 
+                        this.prefix = offsetWithinToken ? Sym.getPrefix(myOffset, token) 
                                         : ( offsetAfterToken ? token.toString() : "");
                         node = getNode(token);
@@ -229 +193 @@
                                                 // in package header
                                                 IName nameNode = packdef.getName();
-                                                prefix = fetchName((IAst) nameNode);
+                                                if (!usingBackup)
+                                                        prefix = fetchName((IAst) nameNode);
                                                 IResource project = control.getProject().getResource();
                                                 String expectedName = AS3Util.getExpectedPackageName(project,project.getFullPath().append(control.getPath()));
@@ -236 +201 @@
                                         } else {
                                                 proposals.addUnitScopeProposals(node);
-                                                if (prefix.startsWith("import")) {
+                                                boolean isImport = token.getKind() == Sym.TK_import;
+                                                if (isImport || prefix.startsWith("import")) {
                                                         for (String packname:Index0r.getInstance().getPackageNames()) {
-                                                                proposals.addSourceProposal("import "+packname+".*", prefix, ImportDirective.class, !nextIsSemi);
+                                                                String proposed = (isImport ? "":"import ")+packname+".*";
+                                                                proposals.addSourceProposal(proposed, prefix, ImportDirective.class, !nextIsSemi);
                                                         }
                                                 }
@@ -244 +211 @@
                                 } else if (ancestor instanceof ImportDirective) {
                                         IName nameNode = ((ImportDirective)ancestor).getName();
-                                        prefix = fetchName((IAst) nameNode);
+                                        if (!usingBackup)
+                                                prefix = fetchName((IAst) nameNode);
                                         int dotIndex = prefix.lastIndexOf('.');
                                         Collection<String> packageNames = Index0r.getInstance().getPackageNames();