history - only allow file inputs for persisted history

src/vs/code/electron-main/launch.ts

@@ -191,6 +191,7 @@ export class LaunchService implements ILaunchService {
 
 	public getLogsPath(): TPromise<string> {
 		this.logService.trace('Received request for logs path from other instance.');
+
 		return TPromise.as(this.environmentService.logsPath);
 	}
 

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

@@ -52,13 +52,13 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { attachStylerCallback } from 'vs/platform/theme/common/styler';
 import { widgetShadow, editorWidgetBackground } from 'vs/platform/theme/common/colorRegistry';
+import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { deepClone } from 'vs/base/common/objects';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
 // TODO@Sandeep layer breaker
 // tslint:disable-next-line:import-patterns
 import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { deepClone } from 'vs/base/common/objects';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
 function toEditorWithEncodingSupport(input: IEditorInput): IEncodingSupport {
 	if (input instanceof SideBySideEditorInput) {

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

@@ -16,7 +16,7 @@ import types = require('vs/base/common/types');
 import { IDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { IDiffEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { BaseTextEditor, IEditorConfiguration } from 'vs/workbench/browser/parts/editor/textEditor';
-import { TextEditorOptions, EditorInput, EditorOptions, TEXT_DIFF_EDITOR_ID, IFileEditorInput } from 'vs/workbench/common/editor';
+import { TextEditorOptions, EditorInput, EditorOptions, TEXT_DIFF_EDITOR_ID, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { DiffNavigator } from 'vs/editor/browser/widget/diffNavigator';
@@ -32,10 +32,10 @@ import { IWorkbenchEditorService, DelegatingWorkbenchEditorService } from 'vs/wo
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IEditorInput } from 'vs/platform/editor/common/editor';
 import { ScrollType } from 'vs/editor/common/editorCommon';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { Registry } from 'vs/platform/registry/common/platform';
 
 /**
  * The text editor that leverages the diff text editor for the editing experience.
@@ -205,12 +205,13 @@ export class TextDiffEditor extends BaseTextEditor {
 			const binaryDiffInput = new DiffEditorInput(input.getName(), input.getDescription(), originalInput, modifiedInput, true);
 
 			// Forward binary flag to input if supported
-			if (types.isFunction(((originalInput as IEditorInput) as IFileEditorInput).setForceOpenAsBinary)) {
-				((originalInput as IEditorInput) as IFileEditorInput).setForceOpenAsBinary();
+			const fileInputFactory = Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories).getFileInputFactory();
+			if (fileInputFactory.isFileInput(originalInput)) {
+				originalInput.setForceOpenAsBinary();
 			}
 
-			if (types.isFunction(((modifiedInput as IEditorInput) as IFileEditorInput).setForceOpenAsBinary)) {
-				((modifiedInput as IEditorInput) as IFileEditorInput).setForceOpenAsBinary();
+			if (fileInputFactory.isFileInput(modifiedInput)) {
+				modifiedInput.setForceOpenAsBinary();
 			}
 
 			this.editorService.openEditor(binaryDiffInput, options, this.position).done(null, onUnexpectedError);

src/vs/workbench/common/editor.ts

@@ -36,7 +36,10 @@ export const TEXT_DIFF_EDITOR_ID = 'workbench.editors.textDiffEditor';
 export const BINARY_DIFF_EDITOR_ID = 'workbench.editors.binaryResourceDiffEditor';
 
 export interface IFileInputFactory {
+
 	createFileInput(resource: URI, encoding: string, instantiationService: IInstantiationService): IFileEditorInput;
+
+	isFileInput(obj: any): obj is IFileEditorInput;
 }
 
 export interface IEditorInputFactoryRegistry {

src/vs/workbench/parts/files/electron-browser/files.contribution.ts

@@ -100,6 +100,10 @@ Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
 Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories).registerFileInputFactory({
 	createFileInput: (resource, encoding, instantiationService): IFileEditorInput => {
 		return instantiationService.createInstance(FileEditorInput, resource, encoding);
+	},
+
+	isFileInput: (obj): obj is IFileEditorInput => {
+		return obj instanceof FileEditorInput;
 	}
 });
 

src/vs/workbench/services/history/electron-browser/history.ts

@@ -10,7 +10,7 @@ import errors = require('vs/base/common/errors');
 import URI from 'vs/base/common/uri';
 import { IEditor } from 'vs/editor/common/editorCommon';
 import { IEditor as IBaseEditor, IEditorInput, ITextEditorOptions, IResourceInput, ITextEditorSelection, Position as GroupPosition } from 'vs/platform/editor/common/editor';
-import { Extensions as EditorExtensions, EditorInput, IEditorCloseEvent, IEditorGroup, IEditorInputFactoryRegistry, toResource } from 'vs/workbench/common/editor';
+import { Extensions as EditorExtensions, EditorInput, IEditorCloseEvent, IEditorGroup, IEditorInputFactoryRegistry, toResource, Extensions as EditorInputExtensions, IFileInputFactory } from 'vs/workbench/common/editor';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { FileChangesEvent, IFileService, FileChangeType, FILES_EXCLUDE_CONFIG } from 'vs/platform/files/common/files';
@@ -125,6 +125,8 @@ export class HistoryService implements IHistoryService {
 	private loaded: boolean;
 	private resourceFilter: ResourceGlobMatcher;
 
+	private fileInputFactory: IFileInputFactory;
+
 	constructor(
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
@@ -139,6 +141,8 @@ export class HistoryService implements IHistoryService {
 		this.toUnbind = [];
 		this.activeEditorListeners = [];
 
+		this.fileInputFactory = Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories).getFileInputFactory();
+
 		this.index = -1;
 		this.lastIndex = -1;
 		this.stack = [];
@@ -572,10 +576,8 @@ export class HistoryService implements IHistoryService {
 	}
 
 	private preferResourceInput(input: IEditorInput): IEditorInput | IResourceInput {
-		const resource = input ? input.getResource() : void 0;
-		const preferResourceInput = resource && this.fileService.canHandleResource(resource); // file'ish things prefer resources
-		if (preferResourceInput) {
-			return { resource };
+		if (this.fileInputFactory.isFileInput(input)) {
+			return { resource: input.getResource() };
 		}
 
 		return input;