Changeset 18859

Timestamp:

09/05/08 00:25:18 (4 months ago)

Author:

imakado

Message:

branches/new-anythingからtrunkへmerge

Files:

• lang/elisp/anything-c-moccur/trunk/anything-c-moccur.el (modified) (13 diffs)

lang/elisp/anything-c-moccur/trunk/anything-c-moccur.el

@@ -3 +3 @@
 
 ;; Author: Kenji.Imakado <ken.imakaado -at- gmail.com>
-;; Version: 0.1
+;; Version: 0.2
 ;; Keywords: occur
 ;; Prefix: anything-c-moccur-
@@ -217 +217 @@
   (anything-c-moccur-anything-try-execute-persistent-action))
 
-;;; Advise and Hack
-(defun anything-c-moccur-anything-execute-persistent-action ()
-  "If a candidate was selected then perform the associated action without quitting anything."
-  (interactive)
-  (save-selected-window
-    (select-window (get-buffer-window anything-buffer))
-    (select-window (setq minibuffer-scroll-window
-                         (if (one-window-p t) (split-window) (next-window (selected-window) 1))))
-    (let* ((anything-window (get-buffer-window anything-buffer))
-           ;;(same-window-regexps '("."))
-           (selection (if anything-saved-sources
-                          ;; the action list is shown
-                          anything-saved-selection
-                        (anything-get-selection)))
-           (default-action (anything-get-action))
-           (action (assoc-default 'persistent-action (anything-get-current-source))))
-      (setq action (or action default-action))
-      (if (and (listp action)
-               (not (functionp action))) ; lambda
-          ;; select the default action
-          (setq action (cdar action)))
-      (set-window-dedicated-p anything-window t)
-      (unwind-protect
-          (and action selection (funcall action selection))
-        (set-window-dedicated-p anything-window nil)))))
-
 (defun anything-c-moccur-initialize ()
-  (setq anything-c-moccur-anything-invoking-flag t)
-  (setq anything-c-moccur-anything-current-buffer (current-buffer))
-  (setq anything-c-moccur-saved-info nil))
+  (setq anything-c-moccur-saved-info nil
+        anything-c-moccur-anything-invoking-flag t))
 
 (defun anything-c-moccur-anything-try-execute-persistent-action ()
-  (when (and (ignore-errors (anything-get-current-source))
-             anything-c-moccur-enable-auto-look-flag)
-    (anything-c-moccur-anything-execute-persistent-action)))
+  (when (and anything-c-moccur-enable-auto-look-flag
+             anything-c-moccur-anything-invoking-flag)
+    (unless (zerop (buffer-size (get-buffer (anything-buffer-get))))
+      (anything-execute-persistent-action))))
 
 (defmacro anything-c-moccur-with-anything-env (sources &rest body)
@@ -261 +235 @@
                                 anything-c-moccur-anything-idle-delay)
                                (t anything-idle-delay))))
-     (anything-c-moccur-initialize)
      (add-hook  'anything-c-moccur-anything-after-update-hook 'anything-c-moccur-anything-try-execute-persistent-action)
      (unwind-protect
@@ -268 +241 @@
        (remove-hook 'anything-c-moccur-anything-after-update-hook 'anything-c-moccur-anything-try-execute-persistent-action))))
 
-(defun anything-c-moccur-anything-update-initial-pattern ()
-  (let ((minibuffer-window (active-minibuffer-window)))
-    (when (and minibuffer-window
-               (stringp anything-c-moccur-anything-initial-pattern))
-      (with-current-buffer (window-buffer minibuffer-window)
-        (insert anything-c-moccur-anything-initial-pattern)
-        (anything-check-minibuffer-input)))))
-
-(defadvice anything (around anything-c-moccur-enable-initial-pattern activate)
-  (cond ((and (boundp 'anything-c-moccur-anything-invoking-flag)
-              anything-c-moccur-anything-invoking-flag
-              (not (string-equal "" anything-c-moccur-anything-initial-pattern)))
-         (add-hook  'minibuffer-setup-hook 'anything-c-moccur-anything-update-initial-pattern)
-         (unwind-protect
-             ad-do-it
-           (remove-hook 'minibuffer-setup-hook 'anything-c-moccur-anything-update-initial-pattern)))
-        (t
-         ad-do-it)))
-
 (defun anything-c-moccur-clean-up ()
   (setq anything-c-moccur-anything-invoking-flag nil)
-
   (when (overlayp anything-c-moccur-current-line-overlay)
     (delete-overlay anything-c-moccur-current-line-overlay)))
-
-(defadvice anything-cleanup (after anything-c-moccur-clean-up activate protect)
-  (ignore-errors
-    (anything-c-moccur-clean-up)))
 
 ;; (anything-next-line) 後のanything-update-hook
@@ -301 +250 @@
 (defvar anything-c-moccur-anything-after-update-hook nil)
 (defadvice anything-process-delayed-sources (after anything-c-moccur-anything-after-update-hook activate protect)
-   (when (and (boundp 'anything-c-moccur-anything-invoking-flag)
-              anything-c-moccur-anything-invoking-flag)
-     (ignore-errors
-       (run-hooks 'anything-c-moccur-anything-after-update-hook))))
+  (when (and (boundp 'anything-c-moccur-anything-invoking-flag)
+             anything-c-moccur-anything-invoking-flag)
+    (ignore-errors
+      (run-hooks 'anything-c-moccur-anything-after-update-hook))))
 
 (defadvice anything-select-action (before anything-c-moccur-saved-info activate)
@@ -391 +340 @@
 
 (defun anything-c-moccur-occur-by-moccur-get-candidates ()
-  (anything-c-moccur-moccur-search anything-pattern t (list anything-c-moccur-anything-current-buffer))
+  (anything-c-moccur-moccur-search anything-pattern t (list anything-current-buffer))
   (anything-c-moccur-occur-by-moccur-scraper))
 
 (defun anything-c-moccur-occur-by-moccur-persistent-action (candidate)
-  (pop-to-buffer anything-c-moccur-anything-current-buffer)
   (anything-c-moccur-widen-if-need)
   (goto-line (string-to-number candidate))
@@ -416 +364 @@
     (action . (("Goto line" . anything-c-moccur-occur-by-moccur-goto-line)))
     (persistent-action . anything-c-moccur-occur-by-moccur-persistent-action)
+    (init . anything-c-moccur-initialize)
+    (cleanup . anything-c-moccur-clean-up)
     (match . (identity))
     (requires-pattern . 3)
@@ -426 +376 @@
     (let* ((initial-pattern (if anything-c-moccur-enable-initial-pattern
                                 (or (thing-at-point 'symbol) "")
-                              ""))
-           (anything-c-moccur-anything-initial-pattern initial-pattern))
+                              "")))
       (when anything-c-moccur-push-mark-flag
         (push-mark))
-      (anything))))
+      (anything nil initial-pattern))))
 
 (defun anything-c-moccur-occur-by-moccur-only-function ()
   (interactive)
   (anything-c-moccur-with-anything-env (list anything-c-source-occur-by-moccur)
-    (let ((anything-c-moccur-anything-initial-pattern "! "))
-      (when anything-c-moccur-push-mark-flag
-        (push-mark))
-      (anything))))
+    (when anything-c-moccur-push-mark-flag
+      (push-mark))
+    (anything nil "! ")))
 
 (defun anything-c-moccur-occur-by-moccur-only-comment ()
   (interactive)
   (anything-c-moccur-with-anything-env (list anything-c-source-occur-by-moccur)
-    (let ((anything-c-moccur-anything-initial-pattern ";;; "))
-      (when anything-c-moccur-push-mark-flag
-        (push-mark))
-      (anything))))
+    (when anything-c-moccur-push-mark-flag
+      (push-mark))
+    (anything ";;; ")))
 
 ;;; dmoccur
@@ -483 +430 @@
   (anything-c-moccur-next-line-if-info-line)
 
-  (let ((real-candidate (if anything-saved-sources
-                            ;; the action list is shown
-                            anything-saved-selection
-                          (anything-get-selection))))
+  (let ((real-candidate (anything-get-selection)))
   
     (multiple-value-bind (buffer file-path)
@@ -494 +438 @@
                  (stringp file-path)
                  (file-readable-p file-path))
-        (find-file-other-window file-path)
+        
+        (find-file file-path)
       
         (anything-c-moccur-widen-if-need)
@@ -529 +474 @@
     (match . (identity))
     (requires-pattern . 5)
+    (init . anything-c-moccur-initialize)
+    (cleanup . anything-c-moccur-clean-up)    
     (delayed)
     (volatile)))
@@ -565 +512 @@
     (match . (identity))
     (requires-pattern . 3)
+    (init . anything-c-moccur-initialize)
+    (cleanup . anything-c-moccur-clean-up)    
     (delayed)
     (volatile)))
@@ -651 +600 @@
   (anything-c-moccur-match-only-internal "\" "))
 
+
+(dont-compile
+  (when (fboundp 'expectations)
+    (expectations
+      (desc "initialize test")
+      (expect t
+        (let (v)
+          (anything-test-candidates
+           '(((name . "TEST")
+            (candidates "foo")
+            (init . (lambda ()
+                      (anything-c-moccur-initialize)
+                      (setq v anything-c-moccur-anything-invoking-flag)))
+            (cleanup . anything-c-moccur-clean-up))))
+            v))
+      (desc "cleanup test")
+      (expect nil
+        (let ((anything-c-moccur-anything-invoking-flag t))
+          (anything-test-candidates
+           '(anything-c-source-occur-by-moccur))
+          anything-c-moccur-anything-invoking-flag))
+      (desc "anything-c-source-occur-by-moccur")
+      (expect '(("Occur by Moccur" ("    2 bbb")))
+        (let ((buf (get-buffer-create "*test anything-c-moccur*")))
+        (with-current-buffer buf
+          (insert "aaa\nbbb\nccc")
+          (prin1
+           (anything-test-candidates
+            '(anything-c-source-occur-by-moccur) "bbb")
+           (kill-buffer buf)))))
+        )))
+
+
 (provide 'anything-c-moccur)