Initial VS Code 1.19 source merge (#571)

* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
2018-01-28 23:37:17 -08:00
committed by GitHub
parent 9a1ac20710
commit 251ae01c3e
8009 changed files with 93378 additions and 35634 deletions

View File

@@ -65,8 +65,8 @@ export class ResourceLabel extends IconLabel {
private registerListeners(): void {
// update when extensions are loaded with potentially new languages
this.extensionService.onReady().then(() => this.render(true /* clear cache */));
// update when extensions are registered with potentially new languages
this.toDispose.push(this.extensionService.onDidRegisterExtensions(() => this.render(true /* clear cache */)));
// react to model mode changes
this.toDispose.push(this.modelService.onModelModeChanged(e => this.onModelModeChanged(e)));
@@ -183,7 +183,7 @@ export class ResourceLabel extends IconLabel {
if (this.options && typeof this.options.title === 'string') {
iconLabelOptions.title = this.options.title;
} else if (resource) {
} else if (resource && resource.scheme !== Schemas.data /* do not accidentally inline Data URIs */) {
iconLabelOptions.title = getPathLabel(resource, void 0, this.environmentService);
}