bug#12634: Patch

[Ryan Crum <ryan.crum@eleostech.com>]

[-- Attachment #1: Type: text/plain, Size: 78 bytes --]

The attached patch applied successfully for me against trunk at rev. 111221.


[-- Attachment #2: json-pretty-print.diff --]
[-- Type: application/octet-stream, Size: 8756 bytes --]

*** a/json.el
--- b/json.el
***************
*** 3,9 ****
  ;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
  
  ;; Author: Edward O'Connor <ted@oconnor.cx>
! ;; Version: 1.3
  ;; Keywords: convenience
  
  ;; This file is part of GNU Emacs.
--- 3,9 ----
  ;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
  
  ;; Author: Edward O'Connor <ted@oconnor.cx>
! ;; Version: 1.4
  ;; Keywords: convenience
  
  ;; This file is part of GNU Emacs.
***************
*** 48,53 ****
--- 48,54 ----
  ;; 2006-12-29 - XEmacs support, from Aidan Kehoe <kehoea@parhasard.net>.
  ;; 2008-02-21 - Installed in GNU Emacs.
  ;; 2011-10-17 - Patch `json-alist-p' and `json-plist-p' to avoid recursion -tzz
+ ;; 2012-10-25 - Added pretty-printed reformatting -Ryan Crum (ryan@ryancrum.org)
  
  ;;; Code:
  
***************
*** 99,104 **** If this has the same value as `json-false', you might not be able to
--- 100,122 ----
  tell the difference between `false' and `null'.  Consider let-binding
  this around your call to `json-read' instead of `setq'ing it.")
  
+ (defvar json-encoding-separator ","
+   "Value to use as an element seperator when encoding.")
+ 
+ (defvar json-encoding-default-indentation "  "
+   "The default indentation level for encoding.
+ Used only when `json-encoding-pretty-print' is non-nil.")
+ 
+ (defvar json--encoding-current-indentation "\n"
+   "Internally used to keep track of the current indentation level of encoding.
+ Used only when `json-encoding-pretty-print' is non-nil.")
+ 
+ (defvar json-encoding-pretty-print nil
+   "If non-nil, then the output of `json-encode' will be pretty-printed.")
+ 
+ (defvar json-encoding-lisp-style-closings nil
+   "If non-nil, ] and } closings will be formatted lisp-style, without indentation.")
+ 
  \f
  
  ;;; Utilities
***************
*** 124,129 **** this around your call to `json-read' instead of `setq'ing it.")
--- 142,155 ----
                   'not-plist)))
    (null list))
  
+ (defmacro json--with-indentation (body)
+   `(let ((json--encoding-current-indentation
+           (if json-encoding-pretty-print
+               (concat json--encoding-current-indentation
+                       json-encoding-default-indentation)
+             "")))
+      ,body))
+ 
  ;; Reader utilities
  
  (defsubst json-advance (&optional n)
***************
*** 402,442 **** Please see the documentation of `json-object-type' and `json-key-type'."
  
  (defun json-encode-hash-table (hash-table)
    "Return a JSON representation of HASH-TABLE."
!   (format "{%s}"
            (json-join
             (let (r)
!              (maphash
!               (lambda (k v)
!                 (push (format "%s:%s"
!                               (json-encode-key k)
!                               (json-encode v))
!                       r))
!               hash-table)
               r)
!            ", ")))
  
  ;; List encoding (including alists and plists)
  
  (defun json-encode-alist (alist)
    "Return a JSON representation of ALIST."
!   (format "{%s}"
!           (json-join (mapcar (lambda (cons)
!                                (format "%s:%s"
!                                        (json-encode-key (car cons))
!                                        (json-encode (cdr cons))))
!                              alist)
!                      ", ")))
  
  (defun json-encode-plist (plist)
    "Return a JSON representation of PLIST."
    (let (result)
!     (while plist
!       (push (concat (json-encode-key (car plist))
!                     ":"
!                     (json-encode (cadr plist)))
!             result)
!       (setq plist (cddr plist)))
!     (concat "{" (json-join (nreverse result) ", ") "}")))
  
  (defun json-encode-list (list)
    "Return a JSON representation of LIST.
--- 428,497 ----
  
  (defun json-encode-hash-table (hash-table)
    "Return a JSON representation of HASH-TABLE."
!   (format "{%s%s}"
            (json-join
             (let (r)
!              (json--with-indentation
!               (maphash
!                (lambda (k v)
!                  (push (format
!                         (if json-encoding-pretty-print
!                             "%s%s: %s"
!                           "%s%s:%s")
!                         json--encoding-current-indentation
!                         (json-encode-key k)
!                         (json-encode v))
!                        r))
!                hash-table))
               r)
!            json-encoding-separator)
!           (if (or (not json-encoding-pretty-print)
!                   json-encoding-lisp-style-closings)
!               ""
!             json--encoding-current-indentation)))
  
  ;; List encoding (including alists and plists)
  
  (defun json-encode-alist (alist)
    "Return a JSON representation of ALIST."
!   (format "{%s%s}"
!           (json-join
!            (json--with-indentation
!             (mapcar (lambda (cons)
!                       (format (if json-encoding-pretty-print
!                                   "%s%s: %s"
!                                 "%s%s:%s")
!                               json--encoding-current-indentation
!                               (json-encode-key (car cons))
!                               (json-encode (cdr cons))))
!                     alist))
!            json-encoding-separator)
!           (if (or (not json-encoding-pretty-print)
!                   json-encoding-lisp-style-closings)
!               ""
!             json--encoding-current-indentation)))
  
  (defun json-encode-plist (plist)
    "Return a JSON representation of PLIST."
    (let (result)
!     (json--with-indentation
!       (while plist
!         (push (concat
!                json--encoding-current-indentation
!                (json-encode-key (car plist))
!                (if json-encoding-pretty-print
!                    ": "
!                  ":")
!                (json-encode (cadr plist)))
!               result)
!         (setq plist (cddr plist))))
!     (concat "{"
!             (json-join (nreverse result) json-encoding-separator)
!             (if (and json-encoding-pretty-print
!                      (not json-encoding-lisp-style-closings))
!                 json--encoding-current-indentation
!               "")
!             "}")))
  
  (defun json-encode-list (list)
    "Return a JSON representation of LIST.
***************
*** 475,481 **** become JSON objects."
  
  (defun json-encode-array (array)
    "Return a JSON representation of ARRAY."
!   (concat "[" (mapconcat 'json-encode array ", ") "]"))
  
  \f
  
--- 530,551 ----
  
  (defun json-encode-array (array)
    "Return a JSON representation of ARRAY."
!   (if (and json-encoding-pretty-print
!            (> (length array) 0))
!       (concat
!        (json--with-indentation
!          (concat (format "[%s" json--encoding-current-indentation)
!                  (json-join (mapcar 'json-encode array)
!                             (format "%s%s"
!                                     json-encoding-separator
!                                     json--encoding-current-indentation))))
!        (format "%s]"
!                (if json-encoding-lisp-style-closings
!                    ""
!                  json--encoding-current-indentation)))
!     (concat "["
!             (mapconcat 'json-encode array json-encoding-separator)
!             "]")))
  
  \f
  
***************
*** 542,547 **** Advances point just past JSON object."
--- 612,644 ----
          ((listp object)        (json-encode-list object))
          (t                     (signal 'json-error (list object)))))
  
+ ;; Pretty printing
+ 
+ (defun json-pretty-print-buffer ()
+   "Pretty-print current buffer."
+   (interactive)
+   (let* ((json-encoding-pretty-print t)
+          (json-string (json-encode (json-read-from-string (buffer-string))))
+          (buf (current-buffer)))
+     (with-current-buffer buf
+       (erase-buffer)
+       (insert json-string))))
+ 
+ (defun json-pretty-print ()
+   "Pretty-print selected region."
+   (interactive)
+   (unless mark-active
+     (error "No region selected."))
+   (let ((begin (region-beginning))
+         (end (region-end))
+         (json-encoding-pretty-print t))
+     (kill-region begin end)
+     (condition-case-unless-debug err
+         (insert (json-encode (json-read-from-string (current-kill 0))))
+       (error
+         (insert (current-kill 0))
+         (error "Unable to parse JSON.")))))
+ 
  (provide 'json)
  
  ;;; json.el ends here

[-- Attachment #3: Type: text/plain, Size: 2 bytes --]