From 24f219194adc8a098a3065dde87f64842ce5ac88 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 29 Mar 2017 13:44:20 +0200
Subject: [PATCH] vscode-textmate@3.1.2

---
 npm-shrinkwrap.json                           |  6 ++--
 package.json                                  |  2 +-
 .../electron-browser/textMate/TMSyntax.ts     | 30 ++-----------------
 3 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index e5d138138de..cad01175cda 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -420,9 +420,9 @@
       "resolved": "https://registry.npmjs.org/vscode-ripgrep/-/vscode-ripgrep-0.0.11.tgz"
     },
     "vscode-textmate": {
-      "version": "3.1.1",
-      "from": "vscode-textmate@3.1.1",
-      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-3.1.1.tgz"
+      "version": "3.1.2",
+      "from": "vscode-textmate@3.1.2",
+      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-3.1.2.tgz"
     },
     "windows-foreground-love": {
       "version": "0.1.0",
diff --git a/package.json b/package.json
index c58d33973e5..220d5d34c8a 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "v8-profiler": "jrieken/v8-profiler#vscode",
     "vscode-debugprotocol": "1.18.0",
     "vscode-ripgrep": "0.0.11",
-    "vscode-textmate": "^3.1.1",
+    "vscode-textmate": "^3.1.2",
     "winreg": "1.2.0",
     "xterm": "Tyriar/xterm.js#vscode-release/1.11",
     "yauzl": "2.3.1"
diff --git a/src/vs/editor/electron-browser/textMate/TMSyntax.ts b/src/vs/editor/electron-browser/textMate/TMSyntax.ts
index cfe617a5ff7..bdd8af61328 100644
--- a/src/vs/editor/electron-browser/textMate/TMSyntax.ts
+++ b/src/vs/editor/electron-browser/textMate/TMSyntax.ts
@@ -7,7 +7,6 @@
 import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
 import * as types from 'vs/base/common/types';
-import * as objects from 'vs/base/common/objects';
 import Event, { Emitter } from 'vs/base/common/event';
 import { join, normalize } from 'path';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -16,14 +15,14 @@ import { ExtensionMessageCollector } from 'vs/platform/extensions/common/extensi
 import { ITokenizationSupport, TokenizationRegistry, IState, LanguageId } from 'vs/editor/common/modes';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { INITIAL, StackElement, IGrammar, Registry, IEmbeddedLanguagesMap as IEmbeddedLanguagesMap2 } from 'vscode-textmate';
-import { IWorkbenchThemeService, ITokenColorizationRule } from 'vs/workbench/services/themes/common/workbenchThemeService';
+import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { ITextMateService } from 'vs/editor/node/textMate/textMateService';
 import { grammarsExtPoint, IEmbeddedLanguagesMap, ITMSyntaxExtensionPoint } from 'vs/editor/node/textMate/TMGrammars';
 import { TokenizationResult, TokenizationResult2 } from 'vs/editor/common/core/token';
 import { TokenMetadata } from 'vs/editor/common/model/tokensBinaryEncoding';
 import { nullTokenize2 } from 'vs/editor/common/modes/nullMode';
 import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization';
-import { Color, isValidHexColor } from 'vs/base/common/color';
+import { Color } from 'vs/base/common/color';
 
 export class TMScopeRegistry {
 
@@ -160,32 +159,9 @@ export class MainProcessTextMateSyntax implements ITextMateService {
 		return result;
 	}
 
-	static _removeInvalidColors(settings: ITokenColorizationRule[]): ITokenColorizationRule[] {
-		if (!Array.isArray(settings)) {
-			return settings;
-		}
-		settings = settings.slice(0);
-		for (let i = 0, len = settings.length; i < len; i++) {
-			let setting = settings[i];
-			if (setting.settings) {
-				let foreground = setting.settings.foreground;
-				if (typeof foreground !== 'undefined' && !isValidHexColor(foreground)) {
-					let settingClone = objects.deepClone(setting);
-					delete settingClone.settings.foreground;
-					settings[i] = settingClone;
-				}
-			}
-		}
-		return settings;
-	}
-
 	private _updateTheme(): void {
 		let colorTheme = this._themeService.getColorTheme();
-
-		// Remove unparsable foreground colors
-		let settings = MainProcessTextMateSyntax._removeInvalidColors(colorTheme.tokenColors);
-
-		this._grammarRegistry.setTheme({ name: colorTheme.label, settings: settings });
+		this._grammarRegistry.setTheme({ name: colorTheme.label, settings: colorTheme.tokenColors });
 		let colorMap = MainProcessTextMateSyntax._toColorMap(this._grammarRegistry.getColorMap());
 		let cssRules = generateTokensCSSForColorMap(colorMap);
 		this._styleElement.innerHTML = cssRules;