Changeset 1192

Timestamp:

06/20/08 23:19:43 (2 months ago)

Author:

asterite

Message:

Implemented autocompletion for selective imports. Now some autocompletions just write out the name of it, without arguments: that is the case for selective imports and function pointers (if you write &foo and autocomplete, and foo has arguments, it won't write them anymore :-))

Files:

• trunk/descent.core/src/descent/core/CompletionProposal.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java (modified) (9 diffs)
• trunk/descent.core/src/descent/internal/codeassist/InternalCompletionProposal.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/codeassist/complete/CompletionOnImport.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/codeassist/complete/CompletionParser.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/SourceElementParser.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/compiler/parser/Parser.java (modified) (10 diffs)
• trunk/descent.ui/src/descent/internal/ui/text/java/ExperimentalFunctionCallProposal.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/ExperimentalMethodProposal.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/ExperimentalTemplateProposal.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/ExperimentalTemplatedFunctionProposal.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/JavaMethodCompletionProposal.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/JavaTemplateCompletionProposal.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/JavaTemplatedFunctionCompletionProposal.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/LazyJavaMethodCompletionProposal.java (modified) (2 diffs)
• trunk/descent.ui/src/descent/internal/ui/text/java/LazyJavaTypeCompletionProposal.java (modified) (1 diff)

trunk/descent.core/src/descent/core/CompletionProposal.java

@@ -1992 +1992 @@
-    }
-    
+    /**
+     * Returns whether the proposal is intended to be written with
+     * arguments or just the name of the proposal.
+     */
+    @Override
+    public boolean wantArguments() {
+        return super.wantArguments();
+    }
+    
-    @Override
-    public String toString() {

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

@@ -269 +269 @@
-    boolean isCompletingSuperCall = false;
-    boolean isBetweenMethodName = false;
+    boolean wantArguments = true;
-    
-    Scope rootScope;
@@ -444 +445 @@
-                    !requestor.isIgnored(CompletionProposal.COMPILATION_UNIT_REF)) {
-                CompletionOnImport node = (CompletionOnImport) assistNode;
-
+
+
+
+
+
-            } else if (assistNode instanceof CompletionOnArgumentName) {
-                CompletionOnArgumentName node = (CompletionOnArgumentName) assistNode;
@@ -708 +713 @@
-    }
-    
+    private void completeSelectiveImport(CompletionOnImport node) throws JavaModelException {
+        doSemantic();
+        
+        if (node.mod != null) {
+            if (node.selectiveName == null) {
+                this.startPosition = actualCompletionPosition;
+                this.endPosition = actualCompletionPosition;
+                this.currentName = CharOperation.NO_CHAR;
+            } else {
+                this.currentName = computePrefixAndSourceRange(node.selectiveName);
+            }
+            this.wantArguments = false;
+            suggestMembers(node.mod.members, false, new HashtableOfCharArrayAndObject(), INCLUDE_TYPES | INCLUDE_VARIABLES | INCLUDE_FUNCTIONS);
+        }
+    }
+    
-    private void completeImport(CompletionOnImport node) {
-        char[] fqn = node.getFQN();
@@ -2393 +2414 @@
-                                    CompletionProposal.METHOD_REF, 
-                                this.actualCompletionPosition, func);
+                    
+                    if (parser.isInAddrExp) {
+                        proposal.wantArguments = false;
+                    }
-                    
-                    if (constructor || opCall) {
@@ -3011 +3036 @@
-        proposal.nameLookup = this.nameEnvironment.nameLookup;
-        proposal.completionEngine = this;
+        proposal.wantArguments = this.wantArguments;
-        return proposal;
-    }
@@ -3239 +3265 @@
-        
-        CompletionProposal proposal = this.createProposal(CompletionProposal.METHOD_REF, this.actualCompletionPosition, null);
+        
+        if (parser.isInAddrExp) {
+            proposal.wantArguments = false;
+        }
-        
-        int relevance = computeBaseRelevance();
@@ -3307 +3337 @@
-                    return R_EXPECTED_TYPE;
-                }
+            } else if (expectedType instanceof TypeDelegate) {
+                if (type.covariant(expectedType.next, semanticContext) == 1) {
+                    return R_EXPECTED_TYPE;
+                }
-            }
-            
@@ -3332 +3366 @@
-        }
-        
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            return computeRelevanceForExpectedType(Signature.getReturnType(signature));
-        }
-        
-        if (CharOperation.equals(expectedTypeSignature, signature)) {
-            return R_EXACT_EXPECTED_TYPE;
-        }
-        
@@ -3372 +3408 @@
-    }
-
+    private boolean isFunctionSignature(char[] signature) {
+        return signature.length > 0 && signature[0] == Signature.C_D_LINKAGE || signature[0] == Signature.C_C_LINKAGE ||
+                signature[0] == Signature.C_CPP_LINKAGE || signature[0] == Signature.C_PASCAL_LINKAGE ||
+                signature[0] == Signature.C_WINDOWS_LINKAGE;
+    }
+
-    private boolean isImported(char[] fullyQualifiedName) {
+        // This module is "imported"
+        if (CharOperation.equals(fullyQualifiedName, this.sourceUnitFqn)) {
+            return true;
+        }
+        
-        if (module.aimports != null) {
-            for(Object sym : module.aimports) {

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

@@ -54 +54 @@
-    protected int declarationStart = -1;
-    protected boolean isAlias; // Whether the proposal is an alias for another symbol
+    protected boolean wantArguments; // Whether the proposal is intended to be completed with arguments or just the name
-    
-    protected char[][] createDefaultParameterNames(int length) {
@@ -167 +168 @@
-    }
-    
-    
-    protected char[][] getParameterTypeNames() {
-        return this.parameterTypeNames;
-    }
-    
+    protected boolean wantArguments() {
+        return this.wantArguments;
+    }
+    
-    protected void setDeclarationPackageName(char[] declarationPackageName) {
-        this.declarationPackageName = declarationPackageName;

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

@@ -26 +26 @@
-    
-    public int completePosition;
+    public boolean isSelective;
+    public IdentifierExp selectiveName;
-
-    public CompletionOnImport(Loc loc, Identifiers packages, IdentifierExp id, IdentifierExp aliasId, boolean isstatic, int completePosition) {

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

@@ -86 +86 @@
-    public boolean inNewExp;
-    public boolean isInExp;
+    public boolean isInAddrExp;
-    
-    public char[] completionToken;
@@ -202 +203 @@
-            return super.newImport(loc, packages, module, aliasid, isstatic);
-        }
+    }
+    
+    @Override
+    protected Import addImportAlias(Import s, IdentifierExp name, IdentifierExp alias) {
+        super.addImportAlias(s, name, alias);
+        
+        if (alias != null  && alias.start <= cursorLocation && cursorLocation <= alias.start + alias.length) {
+            wantAssist = false;
+            wantKeywords = false;
+            return s;
+        }
+        
+        if (prevToken.ptr <= cursorLocation && cursorLocation <= token.ptr) {
+            CompletionOnImport coi = new CompletionOnImport(s.loc, s.packages, s.id, s.aliasId, s.isstatic, cursorLocation);
+            if (name != null && name.start <= cursorLocation && cursorLocation <= name.start + name.length) {
+                coi.selectiveName = name;
+            }
+            coi.isSelective = true;
+            assistNode = coi;
+            wantKeywords = false;
+            return coi;
+        }
+        
+        return s;
-    }
-
@@ -691 +716 @@
-        }
-        return super.newCondExp(loc, e, e1, e2);
+    }
+    
+    @Override
+    protected Expression newAddrExp(Loc loc, Expression e) {
+        if (e == assistNode) {
+            isInAddrExp = true;
+        }
+        return super.newAddrExp(loc, e);
-    }
-    

trunk/descent.core/src/descent/internal/compiler/SourceElementParser.java

@@ -524 +524 @@
-        }
-        
-
+
+
+
+
+
+
+
+
+
-        return true;
-    }

trunk/descent.core/src/descent/internal/compiler/parser/Parser.java

@@ -2223 +2223 @@
-
-                // First, look ahead to see if it is a TypeParameter or a
-¿
+ￜ
-                
-                t = peek(token);
@@ -2595 +2595 @@
-                s.preComments = lastComments;
-                s.first = prev == null;
-
+//
-                if (prev == null) {
-                    s.firstStart = start;
@@ -2613 +2613 @@
-
-                        if (token.value != TOKidentifier) {
-
+
+
+
+
+
+
-                            break;
-                        }
@@ -2622 +2627 @@
-                            nextToken();
-                            if (token.value != TOKidentifier) {
+                                // Signal an empty alias added
+                                s = addImportAlias(s, newIdentifierExp(), null);
+                                
-                                parsingErrorInsertTokenAfter(prevToken, "Identifier");
+                                
+                                decldefs.add(s);
-                                break;
-                            }
@@ -2631 +2641 @@
-                            alias = null;
-                        }
-
+
+
-                        s.setSourceRange(sStart, prevToken.ptr + prevToken.sourceLen - sStart);
-                    } while (token.value == TOKcomma);
-                    break; // no comma-separated imports of this form
-                } else {
+                    decldefs.add(s);
-                    s.setSourceRange(sStart, prevToken.ptr + prevToken.sourceLen - sStart);
-                }
@@ -2652 +2664 @@
-    }
-    
+    
+
-    public Type parseType() {
-        return parseType(null, null);
@@ -6610 +6624 @@
-            nextToken();
-            e = parseUnaryExp();
- 
+
-            break;
-
@@ -6832 +6846 @@
-
-        return e;
-
+  
-
-    private void parsePrimaryExp_case_delegate(Expression[] e, TOK save, boolean isEmptySyntax) {
@@ -7895 +7909 @@
-    }
-    
+    protected Expression newAddrExp(Loc loc, Expression e) {
+        return new AddrExp(loc, e);
+    }
+    
-    protected VarDeclaration newVarDeclaration(Loc loc, Type type, IdentifierExp ident, Initializer init) {
-        return new VarDeclaration(loc, type, ident, init);
@@ -7933 +7951 @@
-    protected AggregateDeclaration endAggregateDeclaration(AggregateDeclaration a) {
-        return a;
+    }
+    
+    protected Import addImportAlias(Import s, IdentifierExp name, IdentifierExp alias) {
+        if (name != null && alias != null) {
+            s.addAlias(name, alias);
+        }
+        return s;
-    }
-    

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

@@ -87 +87 @@
-     */
-    protected String computeReplacementString() {
+        if (!fProposal.wantArguments()) {
+            return new String(fProposal.getName());
+        }
-        
-
+ {
-            return super.computeReplacementString();
+        }
-        
-        char[][] parameterTypes= Signature.getParameterTypes(fProposal.getTypeSignature());

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

@@ -86 +86 @@
-     */
-    protected String computeReplacementString() {
+        if (!fProposal.wantArguments()) {
+            return new String(fProposal.getName());
+        }
-        
-
+ {
-            return super.computeReplacementString();
+        }
-        
-        char[][] parameterNames= fProposal.findParameterNames(null);

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

@@ -86 +86 @@
-     */
-    protected String computeReplacementString() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
-        if (prefs.beforeFunctionClosingParen)
-            buffer.append(SPACE);
-
-        buffer.append(RPAREN);
-
-        return buffer.toString();
-    }
-

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

@@ -92 +92 @@
-     */
-    protected String computeReplacementString() {
+        try{
+            if (!hasParameters() || !hasArgumentList()) {
+                return super.computeReplacementString();
+            }
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
-        if (prefs.afterOpeningParen)
-            buffer.append(SPACE);
-        
-        for (int i= 0; i != tempCount; i++) {
-            if (i != 0) {
-                if (prefs.beforeFunctionComma)
-                    buffer.append(SPACE);
-                buffer.append(COMMA);
-                if (prefs.afterFunctionComma)
-                    buffer.append(SPACE);
-            }
-            
-            fTempArgumentOffsets[i]= buffer.length();
-            buffer.append(tempParameterNames[i]);
-            fTempArgumentLengths[i]= tempParameterNames[i].length;
-        }
-        
-        if (prefs.beforeFunctionClosingParen)
-            buffer.append(SPACE);
-
-        buffer.append(RPAREN);
-        
-        buffer.append(LPAREN);
-        
-        if (tempCount == 0) {
-            setCursorPosition(buffer.length());
-        }
-        
-        if (prefs.afterOpeningParen)
-            buffer.append(SPACE);
-        
-        for (int i= 0; i != count; i++) {
-            if (i != 0) {
-                if (prefs.beforeFunctionComma)
-                    buffer.append(SPACE);
-                buffer.append(COMMA);
-                if (prefs.afterFunctionComma)
-                    buffer.append(SPACE);
-            }
-            
-            fArgumentOffsets[i]= buffer.length();
-            buffer.append(parameterNames[i]);
-            fArgumentLengths[i]= parameterNames[i].length;
-        }
-        
-        buffer.append(RPAREN);
-
-        return buffer.toString();
-    }
-

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

@@ -193 +193 @@
-     */
-    protected String computeReplacementString() {
-
+
+
+
+
+
-            return super.computeReplacementString();
+        }
-        
-        // we're inserting a method plus the argument list - respect formatter preferences

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

@@ -139 +139 @@
-     */
-    protected String computeReplacementString() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            
-
+
+
+
+
+
+
-                buffer.append(SPACE);
+            buffer.append(EXCLAMATION);
+            buffer.append(LPAREN);
-            
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    

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

@@ -153 +153 @@
-     */
-    protected String computeReplacementString() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            
-
+
+
+
+
+
+
-                buffer.append(SPACE);
+            buffer.append(EXCLAMATION);
+            buffer.append(LPAREN);
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                setCursorPosition(buffer.length());
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-