Adopt Monarch breaking change

.vscode/settings.json

@@ -7,5 +7,6 @@
 		"**/out": true
 	},
 	"editor.tabSize": 4,
-	"editor.insertSpaces": false
+	"editor.insertSpaces": false,
+	"typescript.tsdk": "./node_modules/typescript/lib"
 }

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: [

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;