Changeset 12651

Timestamp:

Aug 23, 2009, 9:51:03 AM (15 years ago)

Author:

gz

Message:

In find-definition-by-context, start search at the beginning of buffer. Also, if there is only one occurance of the name in whole buffer, just go there no matter what the context.

In move-to-source-note, only use toplevel note if that has text, and then remember to move start mark if using it.

Collapse selection in move-point-leaving-mark so callers don't have to.

File:

• trunk/source/cocoa-ide/hemlock/src/edit-defs.lisp (modified) (4 diffs)

trunk/source/cocoa-ide/hemlock/src/edit-defs.lisp

@@ -313 +313 @@
   (let* ((base-name (ccl::definition-base-name def-type full-name))
          (string (string base-name))
-         (pattern (new-search-pattern :string-insensitive :forward string)))
-    (with-mark ((mark (current-point)))
-      (when (loop
-               while (find-pattern mark pattern)
-               thereis (and (match-definition-context mark def-type full-name)
-                            (backward-up-list mark))
-               do (character-offset mark 1))
+         (pattern (new-search-pattern :string-insensitive :forward string))
+         (found 0))
+    (with-mark ((mark (buffer-start-mark (current-buffer))))
+      (when (or (loop
+                  while (and (find-pattern mark pattern) (incf found))
+                  thereis (and (match-definition-context mark def-type full-name)
+                               (backward-up-list mark))
+                  do (character-offset mark 1))
+                ;; if there is only one instance, just go there
+                (and (eql found 1) (find-pattern (buffer-start mark) pattern))
+                ;; Else should try again, being less strict...
+                )
         (move-point-leaving-mark mark)))))
 
 (defun move-point-leaving-mark (target)
-  (let ((point (current-point)))
+  (let ((point (current-point-collapsing-selection)))
     (push-new-buffer-mark point)
     (move-mark point target)
@@ -342 +347 @@
           (declare (inline search))
           (with-mark ((temp-mark (current-point)))
-            (unless (move-to-absolute-position temp-mark start-pos)
-              (buffer-end temp-mark))
             (unless full-text
               ;; Someday, might only store a snippet for toplevel, so inner notes
@@ -349 +352 @@
               (let* ((toplevel (ccl::source-note-toplevel-note source))
                      (toplevel-start-pos (and (not (eq toplevel source))
-                                              (ccl:source-note-start-pos toplevel))))
-                (when toplevel-start-pos
+                                              (ccl:source-note-start-pos toplevel)))
+                     (text (and toplevel-start-pos (ccl:source-note-text toplevel))))
+                (when text
                   (setq offset (- start-pos toplevel-start-pos))
                   (setq start-pos toplevel-start-pos)
-                  (setq full-text (ccl:source-note-text toplevel)))))
+                  (setq full-text text)
+                  (character-offset temp-mark (- offset)))))
+            (unless (move-to-absolute-position temp-mark start-pos)
+              (buffer-end temp-mark))
+
             (when (or (null full-text)
                       (or (search temp-mark full-text :forward)
@@ -367 +375 @@
 
 (defun find-definition-in-buffer (def-type full-name source)
-  (current-point-collapsing-selection)
   (or (and (ccl:source-note-p source)
            (move-to-source-note source))