Changeset 1103

Timestamp:

04/12/08 13:23:27 (9 months ago)

Author:

asterite

Message:

Started more serious autocompletion tests, and improving the look&feel (completion labels, for example).

Files:

• trunk/descent.core/src/descent/core/CompletionProposal.java (modified) (1 diff)
• trunk/descent.core/src/descent/core/Signature.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/codeassist/CompletionEngine.java (modified) (19 diffs)
• trunk/descent.core/src/descent/internal/codeassist/InternalCompletionProposal.java (modified) (3 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/ModuleBuilder.java (modified) (2 diffs)
• trunk/descent.core/src/descent/internal/compiler/lookup/SemanticRest.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/core/CompilationUnit.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/core/InternalSignature.java (modified) (1 diff)
• trunk/descent.tests/descent/tests/assist/AbstractCompletionTest.java (modified) (2 diffs)
• trunk/descent.tests/descent/tests/assist/FieldProposal_Test.java (added)
• trunk/descent.tests/descent/tests/mangling/SignatureKind_Test.java (added)
• trunk/descent.ui/src/descent/internal/ui/text/java/AbstractJavaCompletionProposal.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/LazyJavaMethodCompletionProposal.java (modified) (5 diffs)
• trunk/descent.ui/src/descent/ui/text/java/CompletionProposalLabelProvider.java (modified) (1 diff)
• trunk/todos.txt (modified) (1 diff)

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

@@ -1319 +1319 @@
-    
-    public char[] getTypeSignature() {
-Nam
+Signatur
-    }
-    

trunk/descent.core/src/descent/core/Signature.java

@@ -764 +764 @@
-     */
-    public static final String SIG_DCHAR                                = "w";
+    
+    /**
+     * Kind constant for a primitive type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int PRIMITIVE_TYPE_SIGNATURE = 1;
+    
+    /**
+     * Kind constant for a pointer type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int POINTER_TYPE_SIGNATURE = 2;
+    
+    /**
+     * Kind constant for a dynamic array type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int DYNAMIC_ARRAY_TYPE_SIGNATURE = 3;
+    
+    /**
+     * Kind constant for a static array type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int STATIC_ARRAY_TYPE_SIGNATURE = 4;
+    
+    /**
+     * Kind constant for an associative type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int ASSOCIATIVE_ARRAY_TYPE_SIGNATURE = 5;
+    
+    /**
+     * Kind constant for a typeof type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int TYPEOF_TYPE_SIGNATURE = 6;
+    
+    /**
+     * Kind constant for a slice type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int SLICE_TYPE_SIGNATURE = 7;
+    
+    /**
+     * Kind constant for a module signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int MODULE_SIGNATURE = 8;
+    
+    /**
+     * Kind constant for a class type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int CLASS_TYPE_SIGNATURE = 9;
+    
+    /**
+     * Kind constant for a struct type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int STRUCT_TYPE_SIGNATURE = 10;
+    
+    /**
+     * Kind constant for a union type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int UNION_TYPE_SIGNATURE = 11;
+    
+    /**
+     * Kind constant for an interface type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int INTERFACE_TYPE_SIGNATURE = 12;
+    
+    /**
+     * Kind constant for an identifier type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int IDENTIFIER_TYPE_SIGNATURE = 13;
+    
+    /**
+     * Kind constant for a function type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int FUNCTION_TYPE_SIGNATURE = 14;
+    
+    /**
+     * Kind constant for a delegate type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int DELEGATE_TYPE_SIGNATURE = 15;
+    
+    /**
+     * Kind constant for a template type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int TEMPLATE_TYPE_SIGNATURE = 16;
+    
+    /**
+     * Kind constant for a template instance type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int TEMPLATE_INSTANCE_TYPE_SIGNATURE = 17;
+    
+    /**
+     * Kind constant for a function signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int FUNCTION_SIGNATURE = 18;
+    
+    /**
+     * Kind constant for a templated class type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int TEMPLATED_CLASS_TYPE_SIGNATURE = 19;
+    
+    /**
+     * Kind constant for a templated struct type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int TEMPLATED_STRUCT_TYPE_SIGNATURE = 20;
+    
+    /**
+     * Kind constant for a templated union type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int TEMPLATED_UNION_TYPE_SIGNATURE = 21;
+    
+    /**
+     * Kind constant for a templated interface type signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int TEMPLATED_INTERFACE_TYPE_SIGNATURE = 22;
+    
+    /**
+     * Kind constant for a templated function signature.
+     * @see #getTypeSignatureKind(String)
+     * @since 3.0
+     */
+    public static final int TEMPLATED_FUNCTION_SIGNATURE = 23;
+    
+    
-        
-private Signature() {
@@ -1847 +2010 @@
-}
-
+/**
+ * Returns the kind a given signature.
+ * @param signature a signature
+ * @return  the kind of type signature
+ */
+public static int getTypeSignatureKind(String signature) {
+    final int[] kind = { 0 };
+    SignatureProcessor.process(signature, false, new SignatureRequestorAdapter() {
+        @Override
+        public void acceptPrimitive(TypeBasic type) {
+            kind[0] = PRIMITIVE_TYPE_SIGNATURE;
+        }
+        @Override
+        public void acceptPointer(String signature) {
+            kind[0] = POINTER_TYPE_SIGNATURE;
+        }
+        @Override
+        public void acceptAssociativeArray(String signature) {
+            kind[0] = ASSOCIATIVE_ARRAY_TYPE_SIGNATURE;
+        }
+        @Override
+        public void acceptDelegate(String signature) {
+            kind[0] = DELEGATE_TYPE_SIGNATURE;
+        }
+        @Override
+        public void acceptDynamicArray(String signature) {
+            kind[0] = DYNAMIC_ARRAY_TYPE_SIGNATURE;
+        }
+        @Override
+        public void acceptIdentifier(char[][] compoundName, String signature) {
+            kind[0] = IDENTIFIER_TYPE_SIGNATURE;
+        }
+        @Override
+        public void acceptModule(char[][] compoundName, String signature) {
+            kind[0] = MODULE_SIGNATURE;
+        }
+        @Override
+        public void acceptSlice(char[] lwr, char[] upr, String signature) {
+            kind[0] = SLICE_TYPE_SIGNATURE;
+        }
+        @Override
+        public void acceptStaticArray(char[] dimension, String signature) {
+            kind[0] = STATIC_ARRAY_TYPE_SIGNATURE;
+        }
+        @Override
+        public void acceptSymbol(char type, char[] name, int startPosition, String signature) {
+            switch(type) {
+            case ISignatureConstants.CLASS:
+                kind[0] = CLASS_TYPE_SIGNATURE;
+                break;
+            case ISignatureConstants.STRUCT:
+                kind[0] = STRUCT_TYPE_SIGNATURE;
+                break;
+            case ISignatureConstants.UNION:
+                kind[0] = UNION_TYPE_SIGNATURE;
+                break;
+            case ISignatureConstants.INTERFACE:
+                kind[0] = INTERFACE_TYPE_SIGNATURE;
+                break;
+            case ISignatureConstants.FUNCTION:
+                kind[0] = FUNCTION_SIGNATURE;
+                break;
+            case ISignatureConstants.TEMPLATE:
+                kind[0] = TEMPLATE_TYPE_SIGNATURE;
+                break;
+            case ISignatureConstants.TEMPLATED_CLASS:
+                kind[0] = TEMPLATED_CLASS_TYPE_SIGNATURE;
+                break;
+            case ISignatureConstants.TEMPLATED_STRUCT:
+                kind[0] = TEMPLATED_STRUCT_TYPE_SIGNATURE;
+                break;
+            case ISignatureConstants.TEMPLATED_UNION:
+                kind[0] = TEMPLATED_UNION_TYPE_SIGNATURE;
+                break;
+            case ISignatureConstants.TEMPLATED_INTERFACE:
+                kind[0] = TEMPLATED_INTERFACE_TYPE_SIGNATURE;
+                break;
+            case ISignatureConstants.TEMPLATED_FUNCTION:
+                kind[0] = TEMPLATED_FUNCTION_SIGNATURE;
+                break;
+            }
+        }
+        @Override
+        public void acceptTypeof(char[] expression, String signature) {
+            kind[0] = TYPEOF_TYPE_SIGNATURE;
+        }
+        @Override
+        public void exitFunctionType(LINK link, char argumentBreak, String signature) {
+            kind[0] = FUNCTION_TYPE_SIGNATURE;
+        }
+        @Override
+        public void exitTemplateInstance(String signature) {
+            kind[0] = TEMPLATE_INSTANCE_TYPE_SIGNATURE;
+        }
+    });
+    return kind[0];
+}
+
+/**
+ * Returns the kind a given signature.
+ * @param signature a signature
+ * @return the kind of signature
+ */
+public static int getTypeSignatureKind(char[] signature) {
+    return getTypeSignatureKind(new String(signature));
+}
+
-/*
- * Given a string, this method gets it's length, and, seen as a string,

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

@@ -121 +121 @@
-import descent.internal.core.INamingRequestor;
-import descent.internal.core.InternalNamingConventions;
-import descent.internal.core.InternalSignature;
-import descent.internal.core.SearchableEnvironment;
-import descent.internal.core.util.Util;
@@ -471 +470 @@
-                            return;
-                        }
+                    } else if (isGetter((TypeFunction) type)) {
+                        type = ((TypeFunction) type).next;
+                        if (type == null) {
+                            return;
+                        }
-                    }
-                }
@@ -506 +510 @@
-        return type != null && type.next == Type.tvoid
-            && type.parameters != null && type.parameters.size() == 1;
+    }
+    
+    private boolean isGetter(TypeFunction type) {
+        return type != null && type.next != Type.tvoid
+            && (type.parameters == null || type.parameters.isEmpty());
-    }
-
@@ -1368 +1377 @@
-        proposal.setCompletion(CharOperation.concat(currentName, "()".toCharArray()));
-        proposal.setSignature(signature);
-Nam
+Signatur
-        proposal.setRelevance(relevance);
-        proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
@@ -1383 +1392 @@
-        
-        if (type.isintegral()) {
-
+type.getSignature().toCharArray()
-        }
-        
@@ -1394 +1403 @@
-    private void suggestAllTypesProperties(Type type) {
-        suggestProperties(
+                type.getSignature().toCharArray(),
-                allTypesProperties, 
-                new Type[] { type, typeInt, typeInt, typeCharArray, typeCharArray }, 
@@ -1400 +1410 @@
-    
-    public final static char[][] integralTypesProperties = { Id.max, Id.min };
-
+char[] declarationSignature
-        suggestProperties(
+                declarationSignature,
-                integralTypesProperties, 
-                new Type[] { typeInt, typeInt },
@@ -1410 +1421 @@
-    private void suggestFloatingProperties(Type type) {
-        suggestProperties(
+                type.getSignature().toCharArray(),
-                floatingPointTypesProperties, 
-                new Type[] { type, type, typeInt, type, typeInt, typeInt, typeInt, typeInt, typeInt, type, type },
@@ -1420 +1432 @@
-        suggestAllTypesProperties(type);
-        suggestProperties(
+                type.getSignature().toCharArray(),
-                staticAndDynamicArrayProperties, 
-                new Type[] { type, type, typeInt, typeInt, type },
@@ -1428 +1441 @@
-        suggestAllTypesProperties(type);
-        suggestProperties(
+                type.getSignature().toCharArray(),
-                staticAndDynamicArrayProperties,
-                new Type[] { type, type, typeInt, typeInt, type },
@@ -1437 +1451 @@
-        suggestAllTypesProperties(type);
-        suggestProperties(
+                type.getSignature().toCharArray(),
-                associativeArrayProperties,
-                new Type[] { typeInt, 
@@ -1512 +1527 @@
-        // If the base type of the enum is integral, also suggest integer properties
-        if (enumDeclaration.memtype.isintegral()) {
-
+enumDeclaration.getSignature().toCharArray()
-        }
-    }
@@ -1653 +1668 @@
-                    proposal.setName(ident);
-                    proposal.setCompletion(ident);
-Nam
+Signatur
-                    proposal.setSignature(sig);
+                    proposal.setDeclarationSignature(var.parent.getSignature().toCharArray());
-                    proposal.setFlags(flags | var.getFlags());
-                    proposal.setRelevance(relevance);
@@ -1695 +1711 @@
-                    boolean isLocal = alias.parent instanceof FuncDeclaration;
-                    
-FIELD
+TYPE
-                    proposal.setName(ident);
-                    proposal.setCompletion(ident);
@@ -1743 +1759 @@
-                    relevance += computeRelevanceForExpectedType(type);
-                    
-Nam
+Signatur
-                    proposal.setFlags(flags | alias.getFlags() | Flags.AccAlias);
-                    proposal.setRelevance(relevance);
@@ -1766 +1782 @@
-                    boolean isLocal = typedef.parent instanceof FuncDeclaration;
-                    
-FIELD
+TYPE
-                    proposal.setName(ident);
-                    proposal.setCompletion(ident);
-                    proposal.setSignature(sigChars);
-Nam
+Signatur
-                    proposal.setFlags(flags | typedef.getFlags() | Flags.AccTypedef);
-                    proposal.setRelevance(relevance);
@@ -1915 +1931 @@
-                        proposal.setSignature(sig.toCharArray());
-                    }
-Nam
+Signatur
-                    proposal.setFlags(flags | func.getFlags());
-                    proposal.setRelevance(relevance);
@@ -2058 +2074 @@
-    }
-
-
+
+
-            char[][] properties,
-            Type[] types,
@@ -2077 +2094 @@
-                proposal.setName(property);
-                proposal.setCompletion(property);
-
+
+
+
-                proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
-                CompletionEngine.this.requestor.accept(proposal);

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

@@ -41 +41 @@
-    protected char[] declarationTypeName;
-    protected char[] packageName;
-Nam
+Signatur
-    protected char[][] parameterPackageNames;
-    protected char[][] parameterTypeNames;
@@ -158 +158 @@
-    
-    protected char[] getTypeSignature() {
-Nam
+Signatur
-    }
-    
@@ -182 +182 @@
-    }
-    
-Name(char[] typeNam
-Name = typeNam
+Signature(char[] typeSignatur
+Signature = typeSignatur
-    }
-    

trunk/descent.core/src/descent/internal/compiler/lookup/ModuleBuilder.java

@@ -83 +83 @@
-     * One ring to rule them all. 
-     */
-false; 
+true;
-    
-    /*
@@ -204 +204 @@
-            time = System.currentTimeMillis() - time;
-            if (time != 0) {
-//
+
-            }
-        } catch (JavaModelException e) {

trunk/descent.core/src/descent/internal/compiler/lookup/SemanticRest.java

@@ -20 +20 @@
-
-    public void setSemanticContext(Scope scope, SemanticContext context) {
-
-
+
+
+
-        }
-        
-        this.sc = scope;
-        this.linkage = scope.linkage;
-        this.context = context;
-    }

trunk/descent.core/src/descent/internal/core/CompilationUnit.java

@@ -998 +998 @@
-    if (buffer == null) return null;
-    
+    if (buffer.getOwner() == null) {
+        buffer = 
+            isWorkingCopy 
+                ? this.owner.createBuffer(this) 
+                : BufferManager.getDefaultBufferManager().createBuffer(this);
+    }
+    
-    // set the buffer source
-    if (buffer.getCharacters() == null) {

trunk/descent.core/src/descent/internal/core/InternalSignature.java

@@ -405 +405 @@
-                    // found it
-                    descent.core.ICompilationUnit unit = pack
-ompilationUnit
+lassFile
-                    if (!unit.exists()) {
-lassFile
+ompilationUnit
-                        if (!unit.exists())
-                            continue;

trunk/descent.tests/descent/tests/assist/AbstractCompletionTest.java

@@ -94 +94 @@
-            assertEquals(end, prop.getReplaceEnd());
-            
-
-
+
+
+
+
-                case LABEL:
-                    assertTrue(expectations[i] instanceof String);
@@ -112 +114 @@
-                    break;
-                case DECLARATION_SIGNATURE:
-
+== null || expectations[i] 
-                    String declSignature = (String) expectations[i];
-
+
+
+
+
+
-                    break;
-                }

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

@@ -285 +285 @@
-    
-                // fix for PR #5533. Assumes that no eating takes place.
-
+
+
+
-                    buffer.insert(getCursorPosition(), trigger);
-                    setCursorPosition(getCursorPosition() + 1);

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

@@ -54 +54 @@
-public class LazyJavaMethodCompletionProposal extends LazyJavaCompletionProposal {
-    /** Triggers for types. Do not modify. */
-
+=', ';', '
-    /** Triggers for types in javadoc. Do not modify. */
-    protected static final char[] JDOC_TYPE_TRIGGERS= new char[] { '#', '}', ' ', '.' };
@@ -69 +69 @@
-    private boolean fIsGetter;
-    private boolean fIsGetterComputed= false;
+    private boolean fWantProperty = false;
-    private int[] fArgumentOffsets;
-    private int[] fArgumentLengths;
@@ -277 +278 @@
-    public void apply(IDocument document, char trigger, int offset) {
-        try {
-
-
-
-
-
+
+
+
+
+
+
+
-            
-            super.apply(document, trigger, offset);
@@ -558 +561 @@
-    
-    private boolean computeIsSetter() throws IllegalArgumentException {
+        if (!fWantProperty) {
+            return false;
+        }
+        
-        char[] retType = Signature.getReturnType(fProposal.getTypeSignature());
-        if (retType.length == 1 && retType[0] == 'v') {
@@ -566 +573 @@
-    
-    private boolean computeIsGetter() throws IllegalArgumentException {
+        if (!fWantProperty) {
+            return false;
+        }
+        
-        char[] retType = Signature.getReturnType(fProposal.getTypeSignature());
-        if (retType.length != 1 || retType[0] != 'v') {

trunk/descent.ui/src/descent/ui/text/java/CompletionProposalLabelProvider.java

@@ -493 +493 @@
-        buf.append(proposal.getName());
-        
-Nam
-Name != null && typeNam
+Signatur
+Signature != null && typeSignatur
-            buf.append("    "); //$NON-NLS-1$
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        

trunk/todos.txt

@@ -2 +2 @@
- - Test code select and binding for aliased symbols (i.e. alias Foo.Bar myAlias).
- - See why "Box!(int) box = new |" shrinks icons, etc.
+ - Implement ClassFile#buildStructure to use a File to get it's contents.