fix microsoft#127901

meganrogge · meganrogge · commit 09be5968d5c1 · 2021-08-05T12:52:19.000-07:00
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts
@@ -5,7 +5,7 @@
 
 import { dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
-import { IEditorInput } from 'vs/workbench/common/editor';
+import { IEditorInput, IUntypedEditorInput } from 'vs/workbench/common/editor';
 import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { ITerminalInstance, ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
@@ -194,4 +194,15 @@ export class TerminalEditorInput extends EditorInput {
 			this._isDetached = true;
 		}
 	}
+
+	public override toUntyped(): IUntypedEditorInput {
+		return {
+			resource: this.resource,
+			options: {
+				override: TerminalEditor.ID,
+				pinned: true,
+				forceReload: true
+			}
+		};
+	}
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts
@@ -162,7 +162,7 @@ export class TerminalEditorService extends Disposable implements ITerminalEditor
 		const resource = this.resolveResource(instance);
 		if (resource) {
 			await this._editorService.openEditor({
-				resource: URI.revive(resource),
+				resource,
 				options:
 				{
 					pinned: true,
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -200,13 +200,14 @@ export class TerminalService implements ITerminalService {
 					}
 				}
 				const resolvedResource = this._terminalEditorService.resolveResource(instance || resource);
-				const editor = this._terminalEditorService.getInputFromResource(resolvedResource) || { editor: URI.revive(resolvedResource) };
+				const editor = this._terminalEditorService.getInputFromResource(resolvedResource) || { editor: resolvedResource };
 				return {
 					editor,
 					options: {
 						...options,
 						pinned: true,
-						forceReload: true
+						forceReload: true,
+						override: TerminalEditor.ID
 					}
 				};
 			});

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ export class TerminalEditorService extends Disposable implements ITerminalEditor`
`162`	`162`	`const resource = this.resolveResource(instance);`
`163`	`163`	`if (resource) {`
`164`	`164`	`await this._editorService.openEditor({`
`165`		`- resource: URI.revive(resource),`
	`165`	`+ resource,`
`166`	`166`	`options:`
`167`	`167`	`{`
`168`	`168`	`pinned: true,`
Original file line number	Diff line number	Diff line change
`@@ -200,13 +200,14 @@ export class TerminalService implements ITerminalService {`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`	`const resolvedResource = this._terminalEditorService.resolveResource(instance \|\| resource);`
`203`		`- const editor = this._terminalEditorService.getInputFromResource(resolvedResource) \|\| { editor: URI.revive(resolvedResource) };`
	`203`	`+ const editor = this._terminalEditorService.getInputFromResource(resolvedResource) \|\| { editor: resolvedResource };`
`204`	`204`	`return {`
`205`	`205`	`editor,`
`206`	`206`	`options: {`
`207`	`207`	`...options,`
`208`	`208`	`pinned: true,`
`209`		`- forceReload: true`
	`209`	`+ forceReload: true,`
	`210`	`+ override: TerminalEditor.ID`
`210`	`211`	`}`
`211`	`212`	`};`
`212`	`213`	`});`