fix microsoft#57483

Benjamin Pasero · Benjamin Pasero · commit 6c369ea0877c · 2018-08-29T14:12:44.000+02:00
diff --git a/src/vs/platform/editor/common/editor.ts b/src/vs/platform/editor/common/editor.ts
@@ -55,6 +55,12 @@ export interface IResourceInput extends IBaseResourceInput {
 	 * The encoding of the text input if known.
 	 */
 	encoding?: string;
+
+	/**
+	 * Hint to indicate that this input should be treated as a file
+	 * that opens in an editor capable of showing file content.
+	 */
+	isFile?: boolean;
 }
 
 export interface IEditorOptions {
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
@@ -834,7 +834,7 @@ export class Workbench extends Disposable implements IPartService {
 			if (isNew) {
 				input = { filePath: resource.fsPath, options: { pinned: true } } as IUntitledResourceInput;
 			} else {
-				input = { resource, options: { pinned: true } } as IResourceInput;
+				input = { resource, options: { pinned: true }, isFile: true } as IResourceInput;
 			}
 
 			if (!isNew && p.lineNumber) {
diff --git a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
@@ -154,7 +154,7 @@ class FileEditorInputFactory implements IEditorInputFactory {
 			const resource = !!fileInput.resourceJSON ? URI.revive(fileInput.resourceJSON) : URI.parse(fileInput.resource);
 			const encoding = fileInput.encoding;
 
-			return accessor.get(IEditorService).createInput({ resource, encoding }, { forceFileInput: true }) as FileEditorInput;
+			return accessor.get(IEditorService).createInput({ resource, encoding, isFile: true }) as FileEditorInput;
 		});
 	}
 }
diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts
@@ -454,7 +454,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 
 	//#region createInput()
 
-	createInput(input: IEditorInputWithOptions | IEditorInput | IResourceEditor, options?: { forceFileInput: boolean }): EditorInput {
+	createInput(input: IEditorInputWithOptions | IEditorInput | IResourceEditor): EditorInput {
 
 		// Typed Editor Input Support (EditorInput)
 		if (input instanceof EditorInput) {
@@ -470,8 +470,8 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		// Side by Side Support
 		const resourceSideBySideInput = <IResourceSideBySideInput>input;
 		if (resourceSideBySideInput.masterResource && resourceSideBySideInput.detailResource) {
-			const masterInput = this.createInput({ resource: resourceSideBySideInput.masterResource }, options);
-			const detailInput = this.createInput({ resource: resourceSideBySideInput.detailResource }, options);
+			const masterInput = this.createInput({ resource: resourceSideBySideInput.masterResource });
+			const detailInput = this.createInput({ resource: resourceSideBySideInput.detailResource });
 
 			return new SideBySideEditorInput(
 				resourceSideBySideInput.label || masterInput.getName(),
@@ -484,8 +484,8 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		// Diff Editor Support
 		const resourceDiffInput = <IResourceDiffInput>input;
 		if (resourceDiffInput.leftResource && resourceDiffInput.rightResource) {
-			const leftInput = this.createInput({ resource: resourceDiffInput.leftResource }, options);
-			const rightInput = this.createInput({ resource: resourceDiffInput.rightResource }, options);
+			const leftInput = this.createInput({ resource: resourceDiffInput.leftResource });
+			const rightInput = this.createInput({ resource: resourceDiffInput.rightResource });
 			const label = resourceDiffInput.label || localize('compareLabels', "{0} ↔ {1}", this.toDiffLabel(leftInput), this.toDiffLabel(rightInput));
 
 			return new DiffEditorInput(label, resourceDiffInput.description, leftInput, rightInput);
@@ -510,13 +510,13 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 				label = basename(resourceInput.resource.fsPath); // derive the label from the path (but not for data URIs)
 			}
 
-			return this.createOrGet(resourceInput.resource, this.instantiationService, label, resourceInput.description, resourceInput.encoding, options && options.forceFileInput) as EditorInput;
+			return this.createOrGet(resourceInput.resource, this.instantiationService, label, resourceInput.description, resourceInput.encoding, resourceInput.isFile) as EditorInput;
 		}
 
 		return null;
 	}
 
-	private createOrGet(resource: URI, instantiationService: IInstantiationService, label: string, description: string, encoding?: string, forceFileInput?: boolean): ICachedEditorInput {
+	private createOrGet(resource: URI, instantiationService: IInstantiationService, label: string, description: string, encoding?: string, isFile?: boolean): ICachedEditorInput {
 		if (EditorService.CACHE.has(resource)) {
 			const input = EditorService.CACHE.get(resource);
 			if (input instanceof ResourceEditorInput) {
@@ -532,7 +532,7 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 		let input: ICachedEditorInput;
 
 		// File
-		if (this.fileService.canHandleResource(resource) || forceFileInput /* fix for https://github.com/Microsoft/vscode/issues/48275 */) {
+		if (isFile /* fix for https://github.com/Microsoft/vscode/issues/48275 */ || this.fileService.canHandleResource(resource)) {
 			input = this.fileInputFactory.createFileInput(resource, encoding, instantiationService);
 		}
 
diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts
@@ -166,5 +166,5 @@ export interface IEditorService {
 	/**
 	 * Converts a lightweight input to a workbench editor input.
 	 */
-	createInput(input: IResourceEditor, options?: { forceFileInput: boolean }): IEditorInput;
+	createInput(input: IResourceEditor): IEditorInput;
 }

Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ export class Workbench extends Disposable implements IPartService {`
`834`	`834`	`if (isNew) {`
`835`	`835`	`input = { filePath: resource.fsPath, options: { pinned: true } } as IUntitledResourceInput;`
`836`	`836`	`} else {`
`837`		`- input = { resource, options: { pinned: true } } as IResourceInput;`
	`837`	`+ input = { resource, options: { pinned: true }, isFile: true } as IResourceInput;`
`838`	`838`	`}`
`839`	`839`
`840`	`840`	`if (!isNew && p.lineNumber) {`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ class FileEditorInputFactory implements IEditorInputFactory {`
`154`	`154`	`const resource = !!fileInput.resourceJSON ? URI.revive(fileInput.resourceJSON) : URI.parse(fileInput.resource);`
`155`	`155`	`const encoding = fileInput.encoding;`
`156`	`156`
`157`		`- return accessor.get(IEditorService).createInput({ resource, encoding }, { forceFileInput: true }) as FileEditorInput;`
	`157`	`+ return accessor.get(IEditorService).createInput({ resource, encoding, isFile: true }) as FileEditorInput;`
`158`	`158`	`});`
`159`	`159`	`}`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,5 +166,5 @@ export interface IEditorService {`
`166`	`166`	`/**`
`167`	`167`	`* Converts a lightweight input to a workbench editor input.`
`168`	`168`	`*/`
`169`		`- createInput(input: IResourceEditor, options?: { forceFileInput: boolean }): IEditorInput;`
	`169`	`+ createInput(input: IResourceEditor): IEditorInput;`
`170`	`170`	`}`