Using removeComments from commandLineParser. This is more robust as it removes both single and multiline comments

jramsay · jramsay · commit 18883f9d32ad · 2016-02-23T13:30:24.000-08:00
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -503,7 +503,7 @@ namespace ts {
      *
      * This method replace comment content by whitespace rather than completely remove them to keep positions in json parsing error reporting accurate.
      */
-    function removeComments(jsonText: string): string {
+    export function removeComments(jsonText: string): string {
         let output = "";
         const scanner = createScanner(ScriptTarget.ES5, /* skipTrivia */ false, LanguageVariant.Standard, jsonText);
         let token: SyntaxKind;
diff --git a/src/services/jsTyping.ts b/src/services/jsTyping.ts
@@ -21,8 +21,7 @@ namespace ts.JsTyping {
     function tryParseJson(jsonPath: string, host: TypingResolutionHost): any {
         if (host.fileExists(jsonPath)) {
             try {
-                // Strip out single-line comments
-                const contents = host.readFile(jsonPath).replace(/^\s*\/\/(.*)$/gm, "");
+                const contents = removeComments(host.readFile(jsonPath));
                 return JSON.parse(contents);
             }
             catch (e) { }

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ namespace ts {`
`503`	`503`	`*`
`504`	`504`	`* This method replace comment content by whitespace rather than completely remove them to keep positions in json parsing error reporting accurate.`
`505`	`505`	`*/`
`506`		`- function removeComments(jsonText: string): string {`
	`506`	`+ export function removeComments(jsonText: string): string {`
`507`	`507`	`let output = "";`
`508`	`508`	`const scanner = createScanner(ScriptTarget.ES5, /* skipTrivia */ false, LanguageVariant.Standard, jsonText);`
`509`	`509`	`let token: SyntaxKind;`