web - enable hot exit by default again

Benjamin Pasero · Benjamin Pasero · commit 9d887e284a9d · 2019-07-05T18:03:59.000+02:00
diff --git a/src/vs/platform/lifecycle/browser/lifecycleService.ts b/src/vs/platform/lifecycle/browser/lifecycleService.ts
@@ -22,7 +22,7 @@ export class BrowserLifecycleService extends AbstractLifecycleService {
 	}
 
 	private registerListeners(): void {
-		window.addEventListener('beforeunload', () => this.beforeUnload());
+		window.onbeforeunload = () => this.beforeUnload();
 	}
 
 	private beforeUnload(): string | null {
diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts
@@ -311,7 +311,7 @@ configurationRegistry.registerConfiguration({
 			'type': 'string',
 			'scope': ConfigurationScope.APPLICATION,
 			'enum': [HotExitConfiguration.OFF, HotExitConfiguration.ON_EXIT, HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE],
-			'default': platform.isWeb ? HotExitConfiguration.OFF : HotExitConfiguration.ON_EXIT, // TODO@Ben enable once supported
+			'default': HotExitConfiguration.ON_EXIT,
 			'markdownEnumDescriptions': [
 				nls.localize('hotExit.off', 'Disable hot exit.'),
 				nls.localize('hotExit.onExit', 'Hot exit will be triggered when the last window is closed on Windows/Linux or when the `workbench.action.quit` command is triggered (command palette, keybinding, menu). All windows with backups will be restored upon next launch.'),
diff --git a/src/vs/workbench/services/backup/common/backupFileService.ts b/src/vs/workbench/services/backup/common/backupFileService.ts
@@ -310,7 +310,7 @@ class BackupFileServiceImpl implements IBackupFileService {
 			return contents.substr(0, newLineIndex);
 		}
 
-		throw new Error(`Could not find ${matchingString} in first ${maximumBytesToRead} bytes of ${file}`);
+		throw new Error(`Could not find ${JSON.stringify(matchingString)} in first ${maximumBytesToRead} bytes of ${file}`);
 	}
 
 	async resolveBackupContent<T extends object>(backup: URI): Promise<IResolvedBackup<T>> {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ export class BrowserLifecycleService extends AbstractLifecycleService {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`private registerListeners(): void {`
`25`		`- window.addEventListener('beforeunload', () => this.beforeUnload());`
	`25`	`+ window.onbeforeunload = () => this.beforeUnload();`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`private beforeUnload(): string \| null {`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ class BackupFileServiceImpl implements IBackupFileService {`
`310`	`310`	`return contents.substr(0, newLineIndex);`
`311`	`311`	`}`
`312`	`312`
`313`		- throw new Error(`Could not find ${matchingString} in first ${maximumBytesToRead} bytes of ${file}`);
	`313`	+ throw new Error(`Could not find ${JSON.stringify(matchingString)} in first ${maximumBytesToRead} bytes of ${file}`);
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`async resolveBackupContent<T extends object>(backup: URI): Promise<IResolvedBackup<T>> {`