SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 17:25:39 +01:00
Code Issues Projects Releases Packages Activity

Adopt Monarch breaking change

Browse source
This commit is contained in:
Alex Dima 2016-12-21 15:53:21 +02:00
parent 03eaf41470
commit b5b35011ef
3 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.vscode/settings.json vendored
View file

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

9
src/less.ts
View file

@ -78,16 +78,11 @@ export var language = <ILanguage> {
nestedJSBegin: [ nestedJSBegin: [
['``', 'delimiter.backtick'], ['``', 'delimiter.backtick'],
<any[]>['`', { token: 'delimiter.backtick', bracket: '@open', next: '@nestedJSEnd', nextEmbedded: 'text/javascript' }], ['`', { token: 'delimiter.backtick', bracket: '@open', next: '@nestedJSEnd', nextEmbedded: 'text/javascript' }],
], ],
nestedJSEnd: [ nestedJSEnd: [
<any[]>['`', { token: 'delimiter.backtick', bracket: '@close', next: '@pop' }], ['`', { token: 'delimiter.backtick', bracket: '@close', next: '@pop', nextEmbedded: '@pop' }],
<any[]>['.', { token: '@rematch', next: '@javascript_block' }],
],
javascript_block: [
<any[]>['`', { token: '@rematch', next: '@pop', nextEmbedded: '@pop' }],
], ],
operators: [ operators: [

9
test/testRunner.ts
View file

@ -80,13 +80,12 @@ function runTest(languageId:string, test:ITestItem[]): void {
for (let lineNumber = 1, lineCount = model.getLineCount(); lineNumber <= lineCount; lineNumber++) { for (let lineNumber = 1, lineCount = model.getLineCount(); lineNumber <= lineCount; lineNumber++) {
let actual: IRelaxedToken[] = []; let actual: IRelaxedToken[] = [];
let lineTokens:LineTokens = (<any>model).getLineTokens(lineNumber); let lineTokens:LineTokens = (<any>model).getLineTokens(lineNumber);
let token = lineTokens.firstToken(); let count = lineTokens.getTokenCount();
while (token) { for (let i = 0; i < count; i++) {
actual.push({ actual.push({
startIndex: token.startOffset, startIndex: lineTokens.getTokenStartOffset(i),
type: token.type type: lineTokens.getTokenType(i)
}); });
token = token.next();
} }
let expected = test[lineNumber - 1].tokens; let expected = test[lineNumber - 1].tokens;