Changing character casing in file name doesn't take effect in editor (fix microsoft#100436)

Benjamin Pasero · Benjamin Pasero · commit 59aad0d061db · 2020-06-20T09:51:37.000+02:00
diff --git a/src/vs/workbench/common/editor/textResourceEditorInput.ts b/src/vs/workbench/common/editor/textResourceEditorInput.ts
@@ -163,7 +163,7 @@ export abstract class AbstractTextResourceEditorInput extends EditorInput {
 		return false;
 	}
 
-	async save(group: GroupIdentifier, options?: ITextFileSaveOptions): Promise<IEditorInput | undefined> {
+	save(group: GroupIdentifier, options?: ITextFileSaveOptions): Promise<IEditorInput | undefined> {
 		return this.doSave(group, options, false);
 	}
 
@@ -185,7 +185,12 @@ export abstract class AbstractTextResourceEditorInput extends EditorInput {
 			return undefined; // save cancelled
 		}
 
-		return this.editorService.createEditorInput({ resource: target });
+		// If the target is a different resource, return with a new editor input
+		if (!extUri.isEqual(target, this.resource)) {
+			return this.editorService.createEditorInput({ resource: target });
+		}
+
+		return this;
 	}
 
 	async revert(group: GroupIdentifier, options?: IRevertOptions): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ export abstract class AbstractTextResourceEditorInput extends EditorInput {`
`163`	`163`	`return false;`
`164`	`164`	`}`
`165`	`165`
`166`		`- async save(group: GroupIdentifier, options?: ITextFileSaveOptions): Promise<IEditorInput \| undefined> {`
	`166`	`+ save(group: GroupIdentifier, options?: ITextFileSaveOptions): Promise<IEditorInput \| undefined> {`
`167`	`167`	`return this.doSave(group, options, false);`
`168`	`168`	`}`
`169`	`169`
`@@ -185,7 +185,12 @@ export abstract class AbstractTextResourceEditorInput extends EditorInput {`
`185`	`185`	`return undefined; // save cancelled`
`186`	`186`	`}`
`187`	`187`
`188`		`- return this.editorService.createEditorInput({ resource: target });`
	`188`	`+ // If the target is a different resource, return with a new editor input`
	`189`	`+ if (!extUri.isEqual(target, this.resource)) {`
	`190`	`+ return this.editorService.createEditorInput({ resource: target });`
	`191`	`+ }`
	`192`	`+`
	`193`	`+ return this;`
`189`	`194`	`}`
`190`	`195`
`191`	`196`	`async revert(group: GroupIdentifier, options?: IRevertOptions): Promise<void> {`