Merge pull request #375 from jakejx/native-json-parsing

Use native JSON parsing when available

Author: josteink

README.md

@@ -345,3 +345,6 @@ this variable to non-nil value for Javascript buffers using `setq-local` macro.
 
 How long to wait after user input before highlighting the current identifier.
 
+##### tide-native-json-parsing `nil`
+
+Use the native JSON functions for encoding and decoding.

test/test.json

@@ -0,0 +1,40 @@
+{
+    "files": [
+        "./lib/cli.ts",
+        "./lib/index.ts",
+        "./test/indexSpec.ts",
+        "./typings/bundle.d.ts",
+        "./typings/empower/empower.d.ts",
+        "./typings/gulp/gulp.d.ts",
+        "./typings/mocha/mocha.d.ts",
+        "./typings/node/node.d.ts",
+        "./typings/orchestrator/orchestrator.d.ts",
+        "./typings/power-assert-formatter/power-assert-formatter.d.ts",
+        "./typings/power-assert/power-assert.d.ts",
+        "./typings/q/Q.d.ts",
+        "./node_modules/typescript/lib/lib.es6.d.ts"
+    ],
+    "exclude": [],
+    "filesGlob": [
+        "./**/*.ts",
+        "./**/*.tsx",
+        "!./**/*.d.ts",
+        "!./gulpfile.ts",
+        "./typings/**/*.d.ts",
+        "!./node_modules/**/*.ts",
+        "./node_modules/typescript/lib/lib.es6.d.ts"
+    ],
+    "compilerOptions": {
+        "noEmitOnError": true,
+        "newLine": "LF",
+        "listFiles": true,
+        "sourceMap": true,
+        "rootDir": ".",
+        "experimentalDecorators": true,
+        "removeComments": true,
+        "noImplicitAny": true,
+        "declaration": true,
+        "module": "commonjs",
+        "target": "es5"
+    }
+}

tide-tests.el

@@ -432,7 +432,61 @@ file that uses tabs for indentation."
                        "a")))
     (delete-process (tide-current-server))
     (kill-buffer buffer)))
-
-(provide 'tide-tests)
+(when (>= emacs-major-version 27)
+  (ert-deftest test-tide-safe-json-read-file ()
+    "Test that `tide-safe-json-read-file' produces the same output for both json.el and the native json parser"
+    (let ((native-output
+           (let ((tide-native-json-parsing t))
+             (tide-safe-json-read-file "test/test.json")))
+          (elisp-output
+           (let ((tide-native-json-parsing nil))
+             (tide-safe-json-read-file "test/test.json"))))
+      (should (equal native-output elisp-output)))))
+
+(when (>= emacs-major-version 27)
+  (ert-deftest test-tide-safe-json-read-string ()
+    "Test that `tide-safe-json-read-string' produces the same output for both native and elisp JSON libraries"
+    (let* ((test-json
+            (with-temp-buffer
+              (insert-file-contents "test/test.json")
+              (buffer-string)))
+           (native-output
+            (let ((tide-native-json-parsing t))
+              (tide-safe-json-read-string test-json)))
+           (elisp-output
+            (let ((tide-native-json-parsing nil))
+              (tide-safe-json-read-string test-json))))
+      (should (equal native-output elisp-output)))))
+
+(when (>= emacs-major-version 27)
+  (ert-deftest test-tide-json-read-object ()
+    "Test that `tide-json-read-object' produces the same output for both native and elisp JSON libraries"
+    (let* ((native-output
+            (with-temp-buffer
+              (insert-file-contents "test/test.json")
+              (let ((tide-native-json-parsing t))
+                (tide-json-read-object))))
+           (elisp-output
+            (with-temp-buffer
+              (insert-file-contents "test/test.json")
+              (let ((tide-native-json-parsing nil))
+                (tide-json-read-object)))))
+      (should (equal native-output elisp-output)))))
+
+(when (>= emacs-major-version 27)
+  (ert-deftest test-tide-json-encode ()
+    "Test that `tide-json-read-object' produces the same JSON string for both native and elisp libraries"
+    (let* ((json-obj `(:number 123
+                               :string "string"
+                               :true t
+                               :false ,json-false
+                               :array [(:number 123 :string "string" :true t :false ,json-false)]))
+           (native-string (let ((tide-native-json-parsing t))
+                            (tide-json-encode json-obj)))
+           (elisp-string (let ((tide-native-json-parsing nil))
+                           (tide-json-encode json-obj))))
+      (should (equal native-string elisp-string))))
+
+  (provide 'tide-tests))
 
 ;;; tide-tests.el ends here

tide.el

@@ -239,6 +239,15 @@ this variable to non-nil value for Javascript buffers using `setq-local' macro."
   :group 'tide
   :safe #'booleanp)
 
+(defcustom tide-native-json-parsing (and (>= emacs-major-version 27)
+                                         (functionp 'json-serialize)
+                                         (functionp 'json-parse-buffer)
+                                         (functionp 'json-parse-string)
+                                         nil)
+  "Use native JSON parsing (only emacs >= 27)."
+  :type 'boolean
+  :group 'tide)
+
 (defconst tide--minimal-emacs
   "24.4"
   "This is the oldest version of Emacs that tide supports.")
@@ -336,16 +345,36 @@ buffers, as they don't set `buffer-file-name' correctly."
 
 (defun tide-safe-json-read-file (filename)
   (condition-case nil
-      (let ((json-object-type 'plist))
-        (json-read-file filename))
+      (if tide-native-json-parsing
+          (with-temp-buffer
+            (insert-file-contents filename)
+            (goto-char (point-min))
+            (json-parse-buffer :object-type 'plist :null-object json-null :false-object json-false))
+        (let ((json-object-type 'plist))
+          (json-read-file filename)))
     (error '())))
 
 (defun tide-safe-json-read-string (string)
   (condition-case nil
-      (let ((json-object-type 'plist))
-        (json-read-from-string string))
+      (if tide-native-json-parsing
+          (json-parse-string string :object-type 'plist :null-object json-null :false-object json-false)
+        (let ((json-object-type 'plist))
+          (json-read-from-string string)))
     (error '())))
 
+(defun tide-json-read-object ()
+  (if tide-native-json-parsing
+      (json-parse-buffer :object-type 'plist :null-object json-null :false-object json-false :array-type 'list)
+    (let ((json-object-type 'plist)
+          (json-array-type 'list))
+      (json-read-object))))
+
+(defun tide-json-encode (obj)
+  "Encode OBJ into a JSON string. JSON arrays must be represented with vectors."
+  (if tide-native-json-parsing
+      (json-serialize obj :null-object json-null :false-object json-false)
+    (json-encode obj)))
+
 (defun tide-plist-get (list &rest args)
   (cl-reduce
    (lambda (object key)
@@ -591,7 +620,7 @@ Offset is one based."
   (let* ((request-id (tide-next-request-id))
          (command `(:command ,name :seq ,request-id :arguments ,args))
          (json-encoding-pretty-print nil)
-         (encoded-command (json-encode command))
+         (encoded-command (tide-json-encode command))
          (payload (concat encoded-command "\n")))
     (process-send-string (tide-current-server) payload)
     (when callback
@@ -814,9 +843,7 @@ Currently, two kinds of cleanups are done:
 
 (defun tide-decode-response (process)
   (with-current-buffer (process-buffer process)
-    (let ((length (tide-decode-response-legth))
-          (json-object-type 'plist)
-          (json-array-type 'list))
+    (let ((length (tide-decode-response-legth)))
       (when (and length (tide-enough-response-p length))
         (search-forward "{")
         (backward-char 1)
@@ -828,7 +855,7 @@ Currently, two kinds of cleanups are done:
                                    `(:success :json-false :type "response"
                                      :message ,tide-max-response-length-error-message
                                      :request_seq ,seq)))
-                          (json-read-object))))
+                          (tide-json-read-object))))
           (delete-region (point-min) (point))
           (when response
             (tide-dispatch response)))
@@ -1263,7 +1290,7 @@ Noise can be anything like braces, reserved keywords, etc."
    `(:file ,(tide-buffer-file-name)
      :startLine ,(tide-line-number-at-pos) :startOffset ,(tide-current-offset)
      :endLine ,(tide-line-number-at-pos) :endOffset ,(+ 1 (tide-current-offset))
-     :errorCodes ,(tide-get-flycheck-errors-ids-at-point))))
+     :errorCodes ,(vconcat (tide-get-flycheck-errors-ids-at-point)))))
 
 (defun tide-command:getCombinedCodeFix (fixId)
   (tide-send-command-sync "getCombinedCodeFix"
@@ -1561,7 +1588,7 @@ This function is used for the basic completions sorting."
   (let* ((source (plist-get (get-text-property 0 'completion name) :source))
          (entry-names (if source
                           `(:entryNames [(:name ,name :source ,source)])
-                        `(:entryNames (,name))))
+                        `(:entryNames [,name])))
          (arguments (-concat (get-text-property 0 'file-location name)
                              entry-names)))
     (-when-let (response (tide-send-command-sync "completionEntryDetails" arguments))
@@ -2439,12 +2466,11 @@ current buffer."
    t))
 
 ;;; Identifier highlighting
-
 (defun tide-command:documentHighlights (cb)
   (tide-send-command
    "documentHighlights"
    `(:file ,(tide-buffer-file-name) :line ,(tide-line-number-at-pos) :offset ,(tide-current-offset)
-     :filesToSearch (,(tide-buffer-file-name)))
+     :filesToSearch [,(tide-buffer-file-name)])
    cb))
 
 (defface tide-hl-identifier-face