From 541f0113680d1368dcf568ae709c1ed7e1efd3a9 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 23 Aug 2016 15:42:18 +0200
Subject: [PATCH] [plist] remove base helper, directly use node-module

---
 src/vs/base/node/plist.ts                     | 28 -------------------
 .../themes/electron-browser/themeService.ts   | 13 ++++-----
 2 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 src/vs/base/node/plist.ts

diff --git a/src/vs/base/node/plist.ts b/src/vs/base/node/plist.ts
deleted file mode 100644
index b3934a4fa92..00000000000
--- a/src/vs/base/node/plist.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import * as plist from 'fast-plist';
-
-interface PListObject {
-	parent: PListObject;
-	value: any;
-	lastKey?: string;
-}
-
-export function parse<T>(content: string) : { value: T; errors: string[]; } {
-	try {
-		let value = plist.parse(content);
-		return {
-			value: value,
-			errors: []
-		};
-	} catch (err) {
-		return {
-			value: null,
-			errors: [err.message]
-		};
-	}
-}
diff --git a/src/vs/workbench/services/themes/electron-browser/themeService.ts b/src/vs/workbench/services/themes/electron-browser/themeService.ts
index 05c7dc1da19..0d5a14f4d9c 100644
--- a/src/vs/workbench/services/themes/electron-browser/themeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/themeService.ts
@@ -26,7 +26,7 @@ import {IJSONSchema} from 'vs/base/common/jsonSchema';
 import {$} from 'vs/base/browser/builder';
 import Event, {Emitter} from 'vs/base/common/event';
 
-import plist = require('vs/base/node/plist');
+import * as plist from 'fast-plist';
 import pfs = require('vs/base/node/pfs');
 
 // implementation
@@ -611,12 +611,11 @@ function _loadThemeDocument(themePath: string) : TPromise<ThemeDocument> {
 				});
 			}
 			return TPromise.as(contentValue);
-		} else {
-			let parseResult = plist.parse(content.toString());
-			if (parseResult.errors && parseResult.errors.length) {
-				return TPromise.wrapError(new Error(nls.localize('error.cannotparse', "Problems parsing plist file: {0}", parseResult.errors.join(', '))));
-			}
-			return TPromise.as(parseResult.value);
+		}
+		try {
+			TPromise.as(plist.parse(content.toString()));
+		} catch (e) {
+			return TPromise.wrapError(new Error(nls.localize('error.cannotparse', "Problems parsing plist file: {0}", e.message)));
 		}
 	});
 }
-- 
GitLab