Merge from vscode e1d3dd53d17fb1529a002e4d6fb066db0a0bd385 (#6460)

* Merge from vscode e1d3dd53d17fb1529a002e4d6fb066db0a0bd385

* fix servers icon

* fix tests
This commit is contained in:
Anthony Dresser
2019-07-22 18:28:21 -07:00
committed by GitHub
parent f2afacd8b2
commit 15fc7a077a
91 changed files with 2562 additions and 972 deletions

View File

@@ -128,7 +128,8 @@ export class Colorizer {
-1,
'none',
false,
false
false,
null
));
return renderResult.html;
}
@@ -195,7 +196,8 @@ function _fakeColorize(lines: string[], tabSize: number): string {
-1,
'none',
false,
false
false,
null
));
html = html.concat(renderResult.html);
@@ -231,7 +233,8 @@ function _actualColorize(lines: string[], tabSize: number, tokenizationSupport:
-1,
'none',
false,
false
false,
null
));
html = html.concat(renderResult.html);