fix: parse .vscode/settings.json with json5

axetroy · Mar 1, 2020 · b3de3d3 · b3de3d3
1 parent 1be0c24
commit b3de3d3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/core/vscode_settings.ts b/core/vscode_settings.ts
@@ -1,6 +1,8 @@
 import * as path from "path";
 import * as fs from "fs";
 
+import json5 from "json5";
+
 import { pathExistsSync } from "./util";
 
 export type DenoPluginConfig = {
@@ -23,7 +25,7 @@ export function readConfigurationFromVscodeSettings(
     const content = fs.readFileSync(vscodeSettingsFile, { encoding: "utf8" });
 
     try {
-      const settings = JSON.parse(content);
+      const settings = json5.parse(content);
 
       const isEnable = !!settings["deno.enable"];
       const dts_file = settings["deno.dts_file"] || [];

diff --git a/package.json b/package.json
@@ -150,6 +150,7 @@
   "devDependencies": {
     "@types/deep-equal": "1.0.1",
     "@types/jest": "25.1.3",
+    "@types/json5": "^0.0.30",
     "@types/node": "12.12.29",
     "@types/which": "1.3.2",
     "@typescript-eslint/eslint-plugin": "2.21.0",
@@ -167,6 +168,7 @@
   },
   "dependencies": {
     "deepmerge": "^4.2.2",
+    "json5": "^2.1.1",
     "typescript-deno-plugin": "./typescript-deno-plugin",
     "vscode-nls-i18n": "^0.2.0"
   }

diff --git a/typescript-deno-plugin/package.json b/typescript-deno-plugin/package.json
@@ -9,10 +9,12 @@
   },
   "dependencies": {
     "deep-equal": "^2.0.1",
-    "deepmerge": "^4.2.2"
+    "deepmerge": "^4.2.2",
+    "json5": "^2.1.1"
   },
   "devDependencies": {
     "@types/deep-equal": "1.0.1",
+    "@types/json5": "^0.0.30",
     "typescript": "3.8.3"
   }
 }