Changeset 1147

Timestamp:

05/01/08 12:11:31 (4 months ago)

Author:

asterite

Message:

More autocompletion improvements! Now requesting it in between a name allows you to see all matching symbols starting from that name, allowing you to insert the new proposal or overwrite the old one.

Files:

• trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java (modified) (8 diffs)
• trunk/descent.core/src/descent/internal/codeassist/complete/CompletionParser.java (modified) (4 diffs)
• trunk/descent.ui/src/descent/internal/ui/text/java/LazyJavaMethodCompletionProposal.java (modified) (1 diff)

trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java

@@ -264 +264 @@
-    boolean isCompletingThisCall = false;
-    boolean isCompletingSuperCall = false;
+    boolean isBetweenMethodName = false;
-    
-    Scope rootScope;
@@ -660 +661 @@
-        CompletionContext context = new CompletionContext();
-        context.setOffset(this.offset);
+        if (parser.completionToken != null) {
+            context.setTokenKind(CompletionContext.TOKEN_KIND_NAME);
+            context.setToken(parser.completionToken);
+            context.setTokenRange(parser.completionTokenStart, parser.completionTokenEnd);
+        }
-        return context;
-    }
@@ -1456 +1462 @@
-    }
-    private void completeExpression(Expression e1, IdentifierExp ident) throws JavaModelException {
+        isBetweenMethodName = ident != null && ident.resolvedSymbol != null;
+        
-        if (e1 instanceof VarExp) {
-            VarExp var = (VarExp) e1;
@@ -1659 +1667 @@
-            proposal.setCompletion(CharOperation.NO_CHAR);
-        } else {
-
+
+
+
+
+
-        }
-        
@@ -2293 +2305 @@
-                            handleContextInfo(func, funcNameIsOpCall, proposal);
-                        } else {
-
+
+
+
+
+
-                        }
-                    } else {
@@ -2300 +2316 @@
-                            handleContextInfo(func, funcNameIsOpCall, proposal);
-                        } else {
-
+
+
+
+
+
-                        }
-                    }
@@ -2707 +2727 @@
-    private char[] computePrefixAndSourceRange(IdentifierExp ident) {
-        char[] prefix;
-
+
+
+
+
+
+
-            this.startPosition = this.actualCompletionPosition;
-            this.endPosition = this.actualCompletionPosition;
@@ -2716 +2741 @@
-            prefix = ident.ident;
-        }
+        
-        return prefix;
-    }

trunk/descent.core/src/descent/internal/codeassist/complete/CompletionParser.java

@@ -85 +85 @@
-    public boolean inNewExp;
-    public boolean isInExp;
+    
+    public char[] completionToken;
+    public int completionTokenStart;
+    public int completionTokenEnd;
-
-    public CompletionParser(int apiLevel, char[] source, char[] filename) {
@@ -242 +246 @@
-    @Override
-    protected IdentifierExp newIdentifierExp() {
-
+
+
+
+
+
-            assistNode = new CompletionOnIdentifierExp(loc, token);
-            return (IdentifierExp) assistNode;
@@ -261 +269 @@
-    @Override
-    protected TypeQualified newTypeIdentifier(Loc loc, IdentifierExp id) {
-+ id.length == cursorLocation
+<= cursorLocation && cursorLocation <= id.start + id.length
-            assistNode = new CompletionOnTypeIdentifier(loc, id);
-            return (TypeQualified) assistNode;
@@ -435 +443 @@
-    @Override
-    protected DotIdExp newDotIdExp(Loc loc, Expression e, IdentifierExp id) {
-+ prevToken.sourceLen == cursorLocation || token.ptr + token.sourceLen == cursorLocatio
+<= cursorLocation && cursorLocation <= prevToken.ptr + prevToken.sourceLe
-            if (cursorLocation <= id.start) {
-                assistNode = new CompletionOnDotIdExp(loc, e, new IdentifierExp(CharOperation.NO_CHAR));
-                return (DotIdExp) assistNode;
-            } else {
+                completionTokenStart = prevToken.ptr;
+                completionTokenEnd = prevToken.ptr + prevToken.sourceLen;
+                completionToken = CharOperation.subarray(input, completionTokenStart, cursorLocation);
+                
-                assistNode = new CompletionOnDotIdExp(loc, e, id);
-                return (DotIdExp) assistNode;

trunk/descent.ui/src/descent/internal/ui/text/java/LazyJavaMethodCompletionProposal.java

@@ -117 +117 @@
-        if (!hasParameters() || !hasArgumentList()) {
-            setCursorPosition(replacement.length() + (getVariadic() != IMethod.VARARGS_NO ? 1 : 2));
-
-
-
+//
+//
+//
-                return replacement;
-
+//
-        }
-