text files - move revert() error handler into model

Benjamin Pasero · Benjamin Pasero · commit f5a52f87cfac · 2020-01-26T09:30:33.000+01:00
diff --git a/src/vs/workbench/services/textfile/browser/textFileService.ts b/src/vs/workbench/services/textfile/browser/textFileService.ts
@@ -598,26 +598,13 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 		});
 
 		await Promise.all(fileModels.map(async model => {
-			try {
-				await model.revert(options);
-
-				// If model is still dirty, mark the resulting operation as error
-				if (model.isDirty()) {
-					const result = mapResourceToResult.get(model.resource);
-					if (result) {
-						result.error = true;
-					}
-				}
-			} catch (error) {
-
-				// FileNotFound means the file got deleted meanwhile, so ignore it
-				if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
-					return;
-				}
+			await model.revert(options);
 
-				// Otherwise bubble up the error
-				else {
-					throw error;
+			// If model is still dirty, mark the resulting operation as error
+			if (model.isDirty()) {
+				const result = mapResourceToResult.get(model.resource);
+				if (result) {
+					result.error = true;
 				}
 			}
 		}));
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -230,10 +230,14 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 				await this.load({ forceReadFromDisk: true });
 			} catch (error) {
 
-				// Set flags back to previous values, we are still dirty if revert failed
-				undo();
+				// FileNotFound means the file got deleted meanwhile, so ignore it
+				if ((<FileOperationError>error).fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
 
-				throw error;
+					// Set flags back to previous values, we are still dirty if revert failed
+					undo();
+
+					throw error;
+				}
 			}
 		}
 
