"Retry as sudo" claims it "failed to save" but it actually succeeded (fix microsoft#93602)

Benjamin Pasero · Benjamin Pasero · commit d532279cd0dc · 2020-03-30T09:01:22.000+02:00
diff --git a/src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts b/src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts
@@ -40,6 +40,7 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 import { IRemotePathService } from 'vs/workbench/services/path/common/remotePathService';
 import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
 import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-browser/environmentService';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export class NativeTextFileService extends AbstractTextFileService {
 
@@ -58,7 +59,8 @@ export class NativeTextFileService extends AbstractTextFileService {
 		@ITextModelService textModelService: ITextModelService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@IRemotePathService remotePathService: IRemotePathService,
-		@IWorkingCopyFileService workingCopyFileService: IWorkingCopyFileService
+		@IWorkingCopyFileService workingCopyFileService: IWorkingCopyFileService,
+		@ILogService private readonly logService: ILogService
 	) {
 		super(fileService, untitledTextEditorService, lifecycleService, instantiationService, modelService, environmentService, dialogService, fileDialogService, textResourceConfigurationService, filesConfigurationService, textModelService, codeEditorService, remotePathService, workingCopyFileService);
 	}
@@ -298,8 +300,16 @@ export class NativeTextFileService extends AbstractTextFileService {
 			sudoCommand.push('--file-write', `"${source}"`, `"${target}"`);
 
 			sudoPrompt.exec(sudoCommand.join(' '), promptOptions, (error: string, stdout: string, stderr: string) => {
-				if (error || stderr) {
-					reject(error || stderr);
+				if (stdout) {
+					this.logService.trace(`[sudo-prompt] received stdout: ${stdout}`);
+				}
+
+				if (stderr) {
+					this.logService.trace(`[sudo-prompt] received stderr: ${stderr}`);
+				}
+
+				if (error) {
+					reject(error);
 				} else {
 					resolve(undefined);
 				}
diff --git a/src/vs/workbench/services/workspaces/electron-browser/workspaceEditingService.ts b/src/vs/workbench/services/workspaces/electron-browser/workspaceEditingService.ts
@@ -140,8 +140,6 @@ export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingServi
 				return false;
 			}
 		}
-
-		return false;
 	}
 
 	async isValidTargetWorkspacePath(path: URI): Promise<boolean> {
diff --git a/src/vs/workbench/test/electron-browser/workbenchTestServices.ts b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts
@@ -27,7 +27,7 @@ import { IReadTextFileOptions, ITextFileStreamContent, ITextFileService } from '
 import { createTextBufferFactoryFromStream } from 'vs/editor/common/model/textModel';
 import { IOpenedWindow, IOpenEmptyWindowOptions, IWindowOpenable, IOpenWindowOptions } from 'vs/platform/windows/common/windows';
 import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
-import { LogLevel } from 'vs/platform/log/common/log';
+import { LogLevel, ILogService } from 'vs/platform/log/common/log';
 import { IRemotePathService } from 'vs/workbench/services/path/common/remotePathService';
 import { IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService';
 import { UTF16le, UTF16be, UTF8_with_bom } from 'vs/base/node/encoding';
@@ -74,7 +74,8 @@ export class TestTextFileService extends NativeTextFileService {
 		@ITextModelService textModelService: ITextModelService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@IRemotePathService remotePathService: IRemotePathService,
-		@IWorkingCopyFileService workingCopyFileService: IWorkingCopyFileService
+		@IWorkingCopyFileService workingCopyFileService: IWorkingCopyFileService,
+		@ILogService logService: ILogService
 	) {
 		super(
 			fileService,
@@ -91,7 +92,8 @@ export class TestTextFileService extends NativeTextFileService {
 			textModelService,
 			codeEditorService,
 			remotePathService,
-			workingCopyFileService
+			workingCopyFileService,
+			logService
 		);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,6 @@ export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingServi`
`140`	`140`	`return false;`
`141`	`141`	`}`
`142`	`142`	`}`
`143`		`-`
`144`		`- return false;`
`145`	`143`	`}`
`146`	`144`
`147`	`145`	`async isValidTargetWorkspacePath(path: URI): Promise<boolean> {`