Changeset 14248

Timestamp:

Sep 10, 2010, 2:49:47 PM (14 years ago)

Author:

R. Matthew Emerson

Message:

Add Open Selection menu item to File Menu, with shortcut of cmd-D.
Find Previous is now shift-cmd-G (which is standard).

Add a Source Of contextual menu item. This seems of dubious utility, but
maybe someone out there doesn't know about M-. yet.

Update MainMenu.nib nib file format.

Location:

trunk/source/cocoa-ide

Files:

• cocoa-editor.lisp (modified) (5 diffs)
• ide-contents/Resources/English.lproj/MainMenu.nib/classes.nib (deleted)
• ide-contents/Resources/English.lproj/MainMenu.nib/info.nib (deleted)
• ide-contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib (modified) ( previous)

trunk/source/cocoa-ide/cocoa-editor.lisp

@@ -1807 +1807 @@
       pathname)))
 
-;;; If we get here, we've already checked that the selection represents
-;;; a valid pathname.
+(defun find-symbol-in-packages (string pkgs)
+  (setq string (string-upcase string))
+  (let (sym)
+    (dolist (p pkgs)
+      (when (setq sym (find-symbol string p))
+        (return)))
+    sym))
+
 (objc:defmethod (#/openSelection: :void) ((self hemlock-text-view) sender)
   (declare (ignore sender))
@@ -1815 +1821 @@
          (pathname (pathname-for-namestring-fragment
                     (lisp-string-from-nsstring selection))))
-    (ed pathname)))
+    (when (pathnamep pathname)
+      (ed pathname))))
 
 ;;; If we get here, we've already checked that the selection represents
@@ -1823 +1830 @@
   (let* ((text (#/string self))
          (selection (#/substringWithRange: text (#/selectedRange self)))
-         (symbol-name (string-upcase (lisp-string-from-nsstring selection))))
-    (inspect (find-symbol symbol-name))))
+         (symbol-name (string-upcase (lisp-string-from-nsstring selection)))
+         (buffer (hemlock-buffer self))
+         (package-name (hi::variable-value 'hemlock::current-package :buffer buffer)))
+    (inspect (find-symbol-in-packages symbol-name 
+                                      (cons package-name
+                                            (package-use-list package-name))))))
+
+(objc:defmethod (#/sourceForSelection: :void) ((self hemlock-text-view) sender)
+  (declare (ignore sender))
+  (let* ((text (#/string self))
+         (selection (#/substringWithRange: text (#/selectedRange self)))
+         (sym (find-symbol-in-packages (lisp-string-from-nsstring selection)
+                                       (list-all-packages))))
+    (ed sym)))
 
 ;;; If we don't override this, NSTextView will start adding Google/
@@ -1836 +1855 @@
          (menu (if (> (length s) 0)
                  (#/copy (#/menu self))
-                 (#/retain (#/menu self)))))
-    (when (find-symbol (string-upcase s))
+                 (#/retain (#/menu self))))
+         (buffer (hemlock-buffer self))
+         (package-name (hi::variable-value 'hemlock::current-package :buffer buffer)))
+    (when (find-symbol-in-packages (string-upcase s)
+                                   (cons package-name
+                                         (package-use-list package-name)))
       (let* ((title (#/stringByAppendingString: #@"Inspect " selection))
              (item (make-instance 'ns:ns-menu-item :with-title title
                      :action (@selector #/inspectSelection:)
+                     :key-equivalent #@"")))
+        (#/setTarget: item self)
+        (#/insertItem:atIndex: menu item 0)
+        (#/release item)))
+    (when (find-symbol-in-packages (string-upcase s) (list-all-packages))
+      (let* ((title (#/stringByAppendingString: #@"Source of " selection))
+             (item (make-instance 'ns:ns-menu-item :with-title title
+                     :action (@selector #/sourceForSelection:)
                      :key-equivalent #@"")))
         (#/setTarget: item self)
@@ -2609 +2640 @@
                   (pathname (hi::buffer-pathname buffer)))
              (not (null pathname))))
+          ((eql action (@selector #/openSelection:))
+           (let* ((text (#/string self))
+                  (selection (#/substringWithRange: text (#/selectedRange self))))
+             (pathname-for-namestring-fragment (lisp-string-from-nsstring selection))))
           (t (call-next-method item)))))