Merge branch 'bug-8-trailing-comma'

aaronpowell · Jul 19, 2019 · 5e35e9f · 5e35e9f
2 parents 92ee249 + 6159c21
commit 5e35e9f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 60 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -136,7 +136,7 @@
   },
   "dependencies": {
     "fs-extra": "^8.0.1",
-    "jsonc": "^2.0.0",
+    "jsonc-parser": "^2.1.0",
     "vsls": "^0.3.1291"
   }
 }
diff --git a/src/settingsHelper.ts b/src/settingsHelper.ts
@@ -3,7 +3,7 @@ import * as vscode from "vscode";
 import * as os from "os";
 import * as path from "path";
 import { Settings } from "./services/config";
-import { jsonc } from "jsonc";
+import * as jsonc from "jsonc-parser";
 
 export enum OsType {
   Windows = 1,
@@ -124,7 +124,7 @@ export default class SettingsHelper {
 
     let newSettings = Object.assign({}, existingSettings, update);
 
-    let settingsAsJson = jsonc.stringify(newSettings, { space: 4 });
+    let settingsAsJson = JSON.stringify(newSettings, null, 4);
 
     await fs.writeFile(this.getSettingsPath(), settingsAsJson, {
       encoding: "utf8"