Buttons are cropped on the files save confirmation dialog while quitting VS Code (fixes microsoft#8008)

Benjamin Pasero · Benjamin Pasero · commit 3db7b4e7d394 · 2016-06-27T10:26:16.000+02:00
diff --git a/src/vs/workbench/parts/files/electron-browser/textFileServices.ts b/src/vs/workbench/parts/files/electron-browser/textFileServices.ts
@@ -33,6 +33,8 @@ import {IModelService} from 'vs/editor/common/services/modelService';
 
 export class TextFileService extends AbstractTextFileService {
 
+	private static MAX_CONFIRM_FILES = 10;
+
 	constructor(
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@IInstantiationService instantiationService: IInstantiationService,
@@ -90,7 +92,7 @@ export class TextFileService extends AbstractTextFileService {
 		// Save
 		if (confirm === ConfirmResult.SAVE) {
 			return this.saveAll(true /* includeUntitled */).then(result => {
-				if (result.results.some((r) => !r.success)) {
+				if (result.results.some(r => !r.success)) {
 					return true; // veto if some saves failed
 				}
 
@@ -147,7 +149,7 @@ export class TextFileService extends AbstractTextFileService {
 			return true;
 		}
 
-		return this.untitledEditorService.getDirty().some((dirty) => !resource || dirty.toString() === resource.toString());
+		return this.untitledEditorService.getDirty().some(dirty => !resource || dirty.toString() === resource.toString());
 	}
 
 	public confirmSave(resources?: URI[]): ConfirmResult {
@@ -161,12 +163,21 @@ export class TextFileService extends AbstractTextFileService {
 		}
 
 		let message = [
-			resourcesToConfirm.length === 1 ? nls.localize('saveChangesMessage', "Do you want to save the changes you made to {0}?", paths.basename(resourcesToConfirm[0].fsPath)) : nls.localize('saveChangesMessages', "Do you want to save the changes to the following files?")
+			resourcesToConfirm.length === 1 ? nls.localize('saveChangesMessage', "Do you want to save the changes you made to {0}?", paths.basename(resourcesToConfirm[0].fsPath)) : nls.localize('saveChangesMessages', "Do you want to save the changes to the following {0} files?", resourcesToConfirm.length)
 		];
 
 		if (resourcesToConfirm.length > 1) {
 			message.push('');
-			message.push(...resourcesToConfirm.map((r) => paths.basename(r.fsPath)));
+			message.push(...resourcesToConfirm.slice(0, TextFileService.MAX_CONFIRM_FILES).map(r => paths.basename(r.fsPath)));
+
+			if (resourcesToConfirm.length > TextFileService.MAX_CONFIRM_FILES) {
+				if (resourcesToConfirm.length - TextFileService.MAX_CONFIRM_FILES === 1) {
+					message.push(nls.localize('moreFile', "...1 additional file not shown"));
+				} else {
+					message.push(nls.localize('moreFiles', "...{0} additional files not shown", resourcesToConfirm.length - TextFileService.MAX_CONFIRM_FILES));
+				}
+			}
+
 			message.push('');
 		}
 
@@ -230,7 +241,7 @@ export class TextFileService extends AbstractTextFileService {
 		// split up between files and untitled
 		let filesToSave: URI[] = [];
 		let untitledToSave: URI[] = [];
-		toSave.forEach((s) => {
+		toSave.forEach(s => {
 			if (s.scheme === 'file') {
 				filesToSave.push(s);
 			} else if ((Array.isArray(arg1) || arg1 === true /* includeUntitled */) && s.scheme === 'untitled') {
