Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues
This commit is contained in:
Anthony Dresser
2019-12-04 19:28:22 -08:00
committed by GitHub
parent a8818ab0df
commit f5ce7fb2a5
1507 changed files with 42813 additions and 27370 deletions

View File

@@ -35,7 +35,7 @@ export class BrowserTextFileService extends AbstractTextFileService {
return false; // no dirty: no veto
}
if (!this.isHotExitEnabled) {
if (!this.filesConfigurationService.isHotExitEnabled) {
return true; // dirty without backup: veto
}
@@ -46,7 +46,7 @@ export class BrowserTextFileService extends AbstractTextFileService {
const model = this.models.get(dirtyResource);
hasBackup = !!(model?.hasBackup());
} else if (dirtyResource.scheme === Schemas.untitled) {
hasBackup = this.untitledEditorService.hasBackup(dirtyResource);
hasBackup = this.untitledTextEditorService.hasBackup(dirtyResource);
}
if (!hasBackup) {