strip comment only when normal parse failed

Author: zhiyuanliang-ms

src/JsonKeyValueAdapter.ts

@@ -26,27 +26,35 @@ export class JsonKeyValueAdapter implements IKeyValueAdapter {
     async processKeyValue(setting: ConfigurationSetting): Promise<[string, unknown]> {
         let parsedValue: unknown;
         if (setting.value !== undefined) {
-            try {
-                let rawJsonValue = setting.value;
-                if (setting.value) {
-                    rawJsonValue = stripComments(setting.value);
-                }
-                parsedValue = JSON.parse(rawJsonValue);
-            } catch (error) {
-                if (error instanceof SyntaxError) {
-                    parsedValue = setting.value;
+            const parseResult = this.#tryParseJson(setting.value);
+            if (parseResult.success) {
+                parsedValue = parseResult.result;
+            } else {
+                // Try parsing with comments stripped
+                const parseWithoutCommentsResult = this.#tryParseJson(stripComments(setting.value));
+                if (parseWithoutCommentsResult.success) {
+                    parsedValue = parseWithoutCommentsResult.result;
                 } else {
-                    // If the error is not a SyntaxError, rethrow it
-                    throw error;
+                    // If still not valid JSON, return the original value
+                    parsedValue = setting.value;
                 }
             }
-        } else {
-            parsedValue = setting.value;
         }
         return [setting.key, parsedValue];
     }
 
     async onChangeDetected(): Promise<void> {
         return;
     }
+
+        #tryParseJson(value: string): { success: true; result: unknown } | { success: false } {
+        try {
+            return { success: true, result: JSON.parse(value) };
+        } catch (error) {
+            if (error instanceof SyntaxError) {
+                return { success: false };
+            }
+            throw error;
+        }
+    }
 }