From b5b35011ef83fd9c2c941e4414b9ab64bf5712c9 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 21 Dec 2016 15:53:21 +0200
Subject: [PATCH] Adopt Monarch breaking change

---
 .vscode/settings.json | 3 ++-
 src/less.ts           | 9 ++-------
 test/testRunner.ts    | 9 ++++-----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5dc190ce..e8b571ed 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,5 +7,6 @@
 		"**/out": true
 	},
 	"editor.tabSize": 4,
-	"editor.insertSpaces": false
+	"editor.insertSpaces": false,
+	"typescript.tsdk": "./node_modules/typescript/lib"
 }
\ No newline at end of file
diff --git a/src/less.ts b/src/less.ts
index c8db790a..2f1e0374 100644
--- a/src/less.ts
+++ b/src/less.ts
@@ -78,16 +78,11 @@ export var language = <ILanguage> {
 
 		nestedJSBegin: [
 			['``', 'delimiter.backtick'],
-			<any[]>['`', { token: 'delimiter.backtick', bracket: '@open', next: '@nestedJSEnd', nextEmbedded: 'text/javascript' }],
+			['`', { token: 'delimiter.backtick', bracket: '@open', next: '@nestedJSEnd', nextEmbedded: 'text/javascript' }],
 		],
 
 		nestedJSEnd: [
-			<any[]>['`', { token: 'delimiter.backtick', bracket: '@close', next: '@pop' }],
-			<any[]>['.', { token: '@rematch', next: '@javascript_block' }],
-		],
-
-		javascript_block: [
-			<any[]>['`', { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }],
+			['`', { token: 'delimiter.backtick', bracket: '@close', next: '@pop', nextEmbedded: '@pop' }],
 		],
 
 		operators: [
diff --git a/test/testRunner.ts b/test/testRunner.ts
index a1962f70..c250acc9 100644
--- a/test/testRunner.ts
+++ b/test/testRunner.ts
@@ -80,13 +80,12 @@ function runTest(languageId:string, test:ITestItem[]): void {
 	for (let lineNumber = 1, lineCount = model.getLineCount(); lineNumber <= lineCount; lineNumber++) {
 		let actual: IRelaxedToken[] = [];
 		let lineTokens:LineTokens = (<any>model).getLineTokens(lineNumber);
-		let token = lineTokens.firstToken();
-		while (token) {
+		let count = lineTokens.getTokenCount();
+		for (let i = 0; i < count; i++) {
 			actual.push({
-				startIndex: token.startOffset,
-				type: token.type
+				startIndex: lineTokens.getTokenStartOffset(i),
+				type: lineTokens.getTokenType(i)
 			});
-			token = token.next();
 		}
 
 		let expected = test[lineNumber - 1].tokens;