From 500fc7a3edc2aa954c55b3942031612425cb907e Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Thu, 16 Feb 2017 23:29:11 +0100
Subject: [PATCH] Resolve post-merge compilation error

---
 src/vs/editor/common/modes/textToHtmlTokenizer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/common/modes/textToHtmlTokenizer.ts b/src/vs/editor/common/modes/textToHtmlTokenizer.ts
index cf1d060c186..e135f341a55 100644
--- a/src/vs/editor/common/modes/textToHtmlTokenizer.ts
+++ b/src/vs/editor/common/modes/textToHtmlTokenizer.ts
@@ -29,7 +29,7 @@ export function tokenizeLineToHTML(text: string, viewLineTokens: ViewLineToken[]
 			continue;
 		}
 
-		const tokenType = token.type;
+		const tokenType = token.getType();
 		let partContentCnt = 0;
 		let partContent = '';
 
-- 
GitLab