Use semantic for completion instead of homegrown

[#29 state:invalid] [#30 state:invalid] [#31 state:invalid]
m0smith · Mar 17, 2009 · e79d116 · e79d116
1 parent 6722975
commit e79d116
Show file tree

Hide file tree

Showing 7 changed files with 147 additions and 360 deletions.
diff --git a/src/main/lisp/malabar-complete.el b/src/main/lisp/malabar-complete.el
diff --git a/src/main/lisp/malabar-mode.el b/src/main/lisp/malabar-mode.el
@@ -35,7 +35,6 @@
 (require 'malabar-abbrevs)
 (require 'malabar-annotations)
 (require 'malabar-codegen)
-(require 'malabar-complete)
 (require 'malabar-groovy)
 (require 'malabar-import)
 (require 'malabar-misc)
@@ -44,6 +43,7 @@
 (require 'malabar-test)
 (require 'malabar-util)
 (require 'malabar-variables)
+(require 'malabar-semanticdb)
 
 (define-derived-mode malabar-mode java-mode "malabar"
   "A new, better, Java mode."
@@ -138,7 +138,10 @@ present."
                              :test-not #'eql
                              :key #'semantic-tag-class)
                     result))))))
-    (push (semantic-tag-function-arguments (semantic-current-tag-of-class 'function)) result)
+    ;; Add this and super
+    (push (list (semantic-tag-new-variable "this" (semantic-tag-name (semantic-current-tag-of-class 'type)))
+                (semantic-tag-new-variable "super" (semantic-tag-type-superclasses (semantic-current-tag-of-class 'type))))
+          result)
     (apply 'append result)))
 
 (provide 'malabar-mode)
diff --git a/src/main/lisp/malabar-reflection.el b/src/main/lisp/malabar-reflection.el
@@ -249,6 +249,42 @@ e.g. `malabar-choose'."
                unqualified))
       (error "Class not found %s" unqualified)))
 
+(defun malabar--get-type-tag (typename &optional buffer)
+  (let ((class-info (malabar-get-class-info typename buffer)))
+    (when class-info
+      (semantic-tag-new-type (malabar--get-name class-info)
+                             (cond ((malabar--interface-p class-info)
+                                    "interface")
+                                   ;; TODO enums
+                                   (t
+                                    "class"))
+                             (remove nil
+                                     (mapcar (lambda (spec)
+                                               (cond ((malabar--field-p spec)
+                                                      (malabar--as-variable-tag spec))
+                                                     ((malabar--method-p spec)
+                                                      (malabar--as-function-tag spec))
+                                                     (t
+                                                      nil)))
+                                             (malabar--get-members class-info)))
+                             (cons (malabar--get-super-class class-info)
+                                   (malabar--get-interfaces class-info))))))
+
+(defun malabar--as-variable-tag (spec)
+  nil)
+
+(defun malabar--as-function-tag (spec)
+  (semantic-tag-new-function (malabar--get-name spec)
+                             (malabar--get-return-type spec)
+                             (let ((arg-name-maker (malabar--arg-name-maker)))
+                               (mapcar (lambda (arg)
+                                         (semantic-tag-new-variable
+                                          (funcall arg-name-maker arg)
+                                          (getf arg :type)))
+                                       (malabar--get-arguments spec)))
+                             :typemodifiers (mapcar #'symbol-name
+                                                    (malabar--get-modifiers spec))))
+
 (provide 'malabar-reflection)
 
 ;; Local Variables: