editors - clarify view state resource (microsoft#155136)

Author: bpasero

src/vs/workbench/browser/parts/editor/editorWithViewState.ts

@@ -208,7 +208,9 @@ export abstract class AbstractEditorWithViewState<T extends object> extends Edit
 	 *
 	 * @param resource the expected `URI` for the view state. This
 	 * should be used as a way to ensure the view state in the
-	 * editor control is matching the resource expected.
+	 * editor control is matching the resource expected, for example
+	 * by comparing with the underlying model (this was a fix for
+	 * https://github.com/microsoft/vscode/issues/40114).
 	 */
 	protected abstract computeEditorViewState(resource: URI): T | undefined;
 

src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts

@@ -452,7 +452,6 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
 
 	protected computeEditorViewState(resource: URI): IMergeEditorViewState | undefined {
 		if (!isEqual(this.model?.result.uri, resource)) {
-			// TODO@bpasero Why not check `input#resource` and don't ask me for "forgein" resources?
 			return undefined;
 		}
 		const result = this.inputResultView.editor.saveViewState();