Changeset 1138

Timestamp:

04/29/08 20:55:47 (6 months ago)

Author:

asterite

Message:

Now semantic analysis is only done when necessary in code selection. Fixed a bug that kept a proposal context info in setters floating around. Now the builder checks if the operation was canceled, and quickly aborts.

Files:

• trunk/descent.core/src/descent/internal/codeassist/SelectionEngine.java (modified) (10 diffs)
• trunk/descent.core/src/descent/internal/compiler/parser/TemplateDeclaration.java (modified) (1 diff)
• trunk/descent.core/src/descent/internal/core/builder/JavaBuilder.java (modified) (1 diff)
• trunk/descent.ui/src/descent/internal/ui/text/java/JavaParameterListValidator.java (modified) (1 diff)

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

@@ -162 +162 @@
-                module.moduleName = sourceUnit.getFullyQualifiedName();
-
-                context = CompilationUnitResolver.resolve(module, javaProject,
-                        owner);
-
-                long time2 = System.currentTimeMillis();
-                module.accept(this);
@@ -180 +177 @@
-        }
-    }
+    
+    private void doSemantic() {
+        if (context == null) {
+            try {
+                context = CompilationUnitResolver.resolve(module, javaProject,
+                        owner);
+            } catch (JavaModelException e) {
+                Util.log(e);
+            }
+        }
+    }
-
-    private char[] extractToken(Token token, int offset) {
@@ -229 +237 @@
-    public boolean visit(Module node) {
-        // Don't visit template instances in the module scope
-
-
+
+
+
-            if (null == dsymbol.isTemplateInstance()) {
-                dsymbol.accept(this);
@@ -313 +322 @@
-            return false;
-        }
+        
+        doSemantic();
-
-        if (node.resolvedSymbol != null) {
@@ -366 +377 @@
-    public boolean visit(Import node) {
-        if (isInRange(node.id)) {
+            doSemantic();
+            
-            Module mod = node.mod;
-            if (mod != null) {
@@ -392 +405 @@
-    @Override
-    public boolean visit(Argument node) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            }
-            return false;
@@ -407 +423 @@
-    @Override
-    public boolean visit(NewExp node) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            }
-            return false;
@@ -471 +491 @@
-
-    private void add(VarDeclaration node) {
+        doSemantic();
+        
-        if (node.getJavaElement() != null) {
-            addJavaElement(node.getJavaElement());
@@ -481 +503 @@
-
-    private void add(AliasDeclaration node) {
+        doSemantic();
+        
-        if (node.getJavaElement() != null) {
-            addJavaElement(node.getJavaElement());
@@ -491 +515 @@
-
-    private void add(TypedefDeclaration node) {
+        doSemantic();
+        
-        if (node.getJavaElement() != null) {
-            addJavaElement(node.getJavaElement());

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

@@ -854 +854 @@
-        buf.writestring(ident.toChars());
-        buf.writeByte('(');
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-        buf.writeByte(')');

trunk/descent.core/src/descent/internal/core/builder/JavaBuilder.java

@@ -77 +77 @@
-        monitor.beginTask("", 100 * resources.length);
-        for(IResource resource : resources) {
+            if (monitor.isCanceled()) {
+                return;
+            }
+            
-            build(resource, new SubProgressMonitor(monitor, 100));
-        }

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

@@ -241 +241 @@
-            if (position < line.getOffset() || position >= document.getLength())
-                return false;
+            
+            boolean isSetter = false;
+            int pos = fPosition;
+        loop:
+            while(pos >= 0) {
+                char c = document.getChar(pos);
+                switch(c) {
+                case '(':
+                    break loop;
+                case '=':
+                    isSetter = true;
+                    break loop;
+                }
+                pos--;
+            }
+            
+            if (isSetter) {
+                return Character.isJavaIdentifierPart(document.getChar(position));
+            }
-
-            return getCharCount(document, fPosition, position, "(", ")", false) >= 0; //$NON-NLS-1$ //$NON-NLS-2$