qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 00:07:56 -07:00
Code Releases Activity

misc/emacs/go-lang.el: Fix restoration of multiple windows in a frame after gofmt

Browse Source 
If a frame has multiple windows then the windows must all be restored
after gofmt has finished and the old windows must be restored.
Before this fix, only the Go code edit window would be left.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5280050
This commit is contained in:
Jan Newmarch 2011-10-31 11:33:14 -04:00 committed by Russ Cox
parent eef7809193
commit 350a5ce64f
1 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
misc/emacs/go-mode.el
View File

@ -7,6 +7,7 @@
;;; To do: ;;; To do:
;; * Indentation is *almost* identical to gofmt ;; * Indentation is *almost* identical to gofmt
;; ** We think struct literal keys are labels and outdent them
;; ** We disagree on the indentation of function literals in arguments ;; ** We disagree on the indentation of function literals in arguments
;; ** There are bugs with the close brace of struct literals ;; ** There are bugs with the close brace of struct literals
;; * Highlight identifiers according to their syntactic context: type, ;; * Highlight identifiers according to their syntactic context: type,
@ -87,7 +88,7 @@ some syntax analysis.")
(,(concat "\\<type\\>\\s *\\w+\\s *" type-name) 1 font-lock-type-face) (,(concat "\\<type\\>\\s *\\w+\\s *" type-name) 1 font-lock-type-face)
;; Arrays/slices/map value type ;; Arrays/slices/map value type
;; XXX Wrong. Marks 0 in expression "foo[0] * x" ;; XXX Wrong. Marks 0 in expression "foo[0] * x"
;; (,(concat "]" type-name) 1 font-lock-type-face) ;; (,(concat "]" type-name) 1 font-lock-type-face)
;; Map key type ;; Map key type
(,(concat "\\<map\\s *\\[" type-name) 1 font-lock-type-face) (,(concat "\\<map\\s *\\[" type-name) 1 font-lock-type-face)
;; Channel value type ;; Channel value type
@ -355,7 +356,7 @@ indented one level."
(save-excursion (save-excursion
(back-to-indentation) (back-to-indentation)
(let ((cs (go-mode-cs)) (case-fold-search nil)) (let ((cs (go-mode-cs)))
;; Treat comments and strings differently only if the beginning ;; Treat comments and strings differently only if the beginning
;; of the line is contained within them ;; of the line is contained within them
(when (and cs (= (point) (car cs))) (when (and cs (= (point) (car cs)))
@ -400,8 +401,7 @@ indented one level."
(setq first nil)))) (setq first nil))))
;; case, default, and labels are outdented 1 level ;; case, default, and labels are outdented 1 level
;; assume that labels are alone on the line (when (looking-at "\\<case\\>\\|\\<default\\>\\|\\w+\\s *:\\(\\S.\\|$\\)")
(when (looking-at "\\<case\\>\\|\\<default\\>\\|\\w+\\s *:\\s *$")
(decf indent tab-width)) (decf indent tab-width))
;; Continuation lines are indented 1 level ;; Continuation lines are indented 1 level
@ -500,47 +500,49 @@ Useful for development work."
;;;###autoload ;;;###autoload
(defun gofmt () (defun gofmt ()
"Pipe the current buffer through the external tool `gofmt`. "Pipe the current buffer through the external tool `gofmt`.
Replace the current buffer on success; display errors on failure." Replace the current buffer on success; display errors on failure."
(interactive) (interactive)
(let ((srcbuf (current-buffer))) (let ((currconf (current-window-configuration)))
(with-temp-buffer (let ((srcbuf (current-buffer)))
(let ((outbuf (current-buffer)) (with-temp-buffer
(errbuf (get-buffer-create "*Gofmt Errors*")) (let ((outbuf (current-buffer))
(coding-system-for-read 'utf-8) ;; use utf-8 with subprocesses (errbuf (get-buffer-create "*Gofmt Errors*"))
(coding-system-for-write 'utf-8)) (coding-system-for-read 'utf-8) ;; use utf-8 with subprocesses
(with-current-buffer errbuf (erase-buffer)) (coding-system-for-write 'utf-8))
(with-current-buffer srcbuf (with-current-buffer errbuf (erase-buffer))
(save-restriction (with-current-buffer srcbuf
(let (deactivate-mark) (save-restriction
(widen) (let (deactivate-mark)
(if (= 0 (shell-command-on-region (point-min) (point-max) "gofmt" (widen)
outbuf nil errbuf)) (if (= 0 (shell-command-on-region (point-min) (point-max) "gofmt"
;; gofmt succeeded: replace the current buffer with outbuf, outbuf nil errbuf))
;; restore the mark and point, and discard errbuf. ;; restore window config
(let ((old-mark (mark t)) (old-point (point))) ;; gofmt succeeded: replace the current buffer with outbuf,
(erase-buffer) ;; restore the mark and point, and discard errbuf.
(insert-buffer-substring outbuf) (let ((old-mark (mark t)) (old-point (point)))
(goto-char (min old-point (point-max))) (set-window-configuration currconf)
(if old-mark (push-mark (min old-mark (point-max)) t)) (erase-buffer)
(kill-buffer errbuf)) (insert-buffer-substring outbuf)
(goto-char (min old-point (point-max)))
(if old-mark (push-mark (min old-mark (point-max)) t))
(kill-buffer errbuf))
;; gofmt failed: display the errors ;; gofmt failed: display the errors
(display-buffer errbuf))))) (display-buffer errbuf)))))
;; Collapse any window opened on outbuf if shell-command-on-region ;; Collapse any window opened on outbuf if shell-command-on-region
;; displayed it. ;; displayed it.
(delete-windows-on outbuf))))) (delete-windows-on outbuf))))))
;;;###autoload ;;;###autoload
(defun gofmt-before-save () (defun gofmt-before-save ()
"Add this to .emacs to run gofmt on the current buffer when saving: "Add this to .emacs to run gofmt on the current buffer when saving:
(add-hook 'before-save-hook #'gofmt-before-save)" (add-hook 'before-save-hook #'gofmt-before-save)"
(interactive) (interactive)
(when (eq major-mode 'go-mode) (gofmt))) (when (eq major-mode 'go-mode) (gofmt)))
(defun godoc-read-query () (defun godoc-read-query ()
"Read a godoc query from the minibuffer." "Read a godoc query from the minibuffer."