Index: /branches/watchpoints/cocoa-ide/cocoa-editor.lisp =================================================================== --- /branches/watchpoints/cocoa-ide/cocoa-editor.lisp (revision 12886) +++ /branches/watchpoints/cocoa-ide/cocoa-editor.lisp (revision 12887) @@ -1491,29 +1491,41 @@ (> (#/clickCount event) 1)))))) (let* ((cache (hemlock-buffer-string-cache (#/hemlockString textstorage))) - (buffer (if cache (buffer-cache-buffer cache)))) - (when (and buffer (string= (hi::buffer-major-mode buffer) "Lisp")) - (let* ((hi::*current-buffer* buffer)) - (hi::with-mark ((m1 (hi::buffer-point buffer))) - (setq index (hi:mark-absolute-position m1)) - (hemlock::pre-command-parse-check m1) - (when (hemlock::valid-spot m1 nil) - (cond ((eql (hi::next-character m1) #\() - (hi::with-mark ((m2 m1)) - (when (hemlock::list-offset m2 1) - (ns:init-ns-range r index (- (hi:mark-absolute-position m2) index)) - (return-from HANDLED r)))) - ((eql (hi::previous-character m1) #\)) - (hi::with-mark ((m2 m1)) - (when (hemlock::list-offset m2 -1) - (ns:init-ns-range r (hi:mark-absolute-position m2) (- index (hi:mark-absolute-position m2))) - (return-from HANDLED r)))))))))))) - (call-next-method proposed g) - #+debug - (#_NSLog #@"range = %@, proposed = %@, granularity = %d" - :address (#_NSStringFromRange r) - :address (#_NSStringFromRange proposed) - :electionranularity g)))) - - + (buffer (buffer-cache-buffer cache)) + (hi::*current-buffer* buffer) + (point (hi::buffer-point buffer))) + (hi::with-mark ((mark point)) + (move-hemlock-mark-to-absolute-position mark cache index) + (when (selection-offset-for-double-click buffer mark) + ;; Act as if we started the selection at the other end, so the heuristic + ;; in #/selectionRangeForProposedRange does the right thing. ref bug #565. + (hi::move-mark point mark) + (let ((start index) + (end (hi::mark-absolute-position mark))) + (when (< end start) (rotatef start end)) + (ns:init-ns-range r start (- end start))) + #+debug + (#_NSLog #@"range = %@, proposed = %@, granularity = %d" + :address (#_NSStringFromRange r) + :address (#_NSStringFromRange proposed) + :electionranularity g) + (return-from HANDLED r)))))) + (prog1 + (call-next-method proposed g) + #+debug + (#_NSLog #@"range = %@, proposed = %@, granularity = %d" + :address (#_NSStringFromRange r) + :address (#_NSStringFromRange proposed) + :electionranularity g))))) + +;; Return nil to use the default Cocoa selection, which will be word for double-click, line for triple. +;; TODO: make this consistent with "current sexp". +(defun selection-offset-for-double-click (buffer mark) + (when (string= (hi::buffer-major-mode buffer) "Lisp") ;; gag + (hemlock::pre-command-parse-check mark) + (when (hemlock::valid-spot mark nil) + (cond ((eql (hi::next-character mark) #\() + (hemlock::list-offset mark 1)) + ((eql (hi::previous-character mark) #\)) + (hemlock::list-offset mark -1)))))) (defun append-output (view string) @@ -1534,8 +1546,7 @@ (affinity :electionffinity) (still-selecting :)) - #+debug - (#_NSLog #@"Set selected range called: location = %d, length = %d, affinity = %d, still-selecting = %d" - :int (pref r :ange.location) - :int (pref r :ange.length) + #+debug + (#_NSLog #@"Set selected range called: range = %@, affinity = %d, still-selecting = %d" + :address (#_NSStringFromRange r) :electionffinity affinity : (if still-selecting #$YES #$NO)) Index: /branches/watchpoints/cocoa-ide/hemlock/src/edit-defs.lisp =================================================================== --- /branches/watchpoints/cocoa-ide/hemlock/src/edit-defs.lisp (revision 12886) +++ /branches/watchpoints/cocoa-ide/hemlock/src/edit-defs.lisp (revision 12887) @@ -93,16 +93,5 @@ (error (c) (editor-error (format nil "~a" c))))))) - -#| -;;; "Edit Command Definition" is a hack due to creeping evolution in -;;; GO-TO-DEFINITION. We specify :function type and a name with "-COMMAND" -;;; instead of :command type and the real command name because this causes -;;; the right pattern to be created for searching. We could either specify -;;; that you always edit command definitions with this command (breaking -;;; "Go to Definition" for commands called as functions), fixing the code, -;;; or we can hack this command so everything works. -;;; (defcommand "Edit Command Definition" (p) - "Prompts for command definition name and goes to it for editing." "Prompts for command definition name and goes to it for editing." (multiple-value-bind @@ -116,8 +105,9 @@ (prompt-for-keyword :tables (list *command-names*) :prompt "Command to edit: ")) - (go-to-definition (fun-defined-from-pathname (command-function command)) - :function - (concatenate 'simple-string name "-COMMAND")))) - + (declare (ignore name)) + (handler-case (edit-definition (command-function command)) + (error (c) (editor-error (format nil "~a" c)))))) + +#| ;;; FUN-DEFINED-FROM-PATHNAME takes a symbol or function object. It ;;; returns a pathname for the file the function was defined in. If it was Index: /branches/watchpoints/cocoa-ide/hemlock/src/listener.lisp =================================================================== --- /branches/watchpoints/cocoa-ide/hemlock/src/listener.lisp (revision 12886) +++ /branches/watchpoints/cocoa-ide/hemlock/src/listener.lisp (revision 12887) @@ -601,7 +601,6 @@ (defcommand "Editor Evaluate Defun" (p) - "Evaluates the current or next top-level form in the editor Lisp. + "Evaluates the current or next top-level form. If the current region is active, this evaluates the region." - "Evaluates the current or next top-level form in the editor Lisp." (declare (ignore p)) (if (region-active-p) @@ -610,6 +609,5 @@ (defcommand "Editor Evaluate Region" (p) - "Evaluates lisp forms between the point and the mark in the editor Lisp." - "Evaluates lisp forms between the point and the mark in the editor Lisp." + "Evaluates lisp forms between the point and the mark" (declare (ignore p)) (if (region-active-p) @@ -634,7 +632,5 @@ (defcommand "Editor Re-evaluate Defvar" (p) "Evaluate the current or next top-level form if it is a DEFVAR. Treat the - form as if the variable is not bound. This occurs in the editor Lisp." - "Evaluate the current or next top-level form if it is a DEFVAR. Treat the - form as if the variable is not bound. This occurs in the editor Lisp." + form as if the variable is not bound." (declare (ignore p)) (with-input-from-region (stream (defun-region (current-point))) Index: /branches/watchpoints/level-1/l1-streams.lisp =================================================================== --- /branches/watchpoints/level-1/l1-streams.lisp (revision 12886) +++ /branches/watchpoints/level-1/l1-streams.lisp (revision 12887) @@ -3426,5 +3426,5 @@ (defmethod stream-external-format ((s character-stream)) - (make-external-format :character-encoding #+big-endian-target :utf32-be #+little-endian-target :utf32-le :line-termination :unix)) + (make-external-format :character-encoding #+big-endian-target :utf-32be #+little-endian-target :utf-32le :line-termination :unix)) Index: /branches/watchpoints/tools/advice-profiler/profiler.lisp =================================================================== --- /branches/watchpoints/tools/advice-profiler/profiler.lisp (revision 12886) +++ /branches/watchpoints/tools/advice-profiler/profiler.lisp (revision 12887) @@ -121,5 +121,5 @@ (ccl:rlet ((ts :mach_timespec)) (unless (zerop (#_clock_get_time (%get-ptr clock-port) ts)) - (error "error reading clock ~A: ~A~%" id (ccl::%strerror (ccl::%get-errno)))) + (error "error reading Mach clock: ~A~%" (ccl::%strerror (ccl::%get-errno)))) (mach-timespec->nanoseconds ts))))