Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-12 11:39:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

less direct use of EditorInput

Browse Source
This commit is contained in:
Benjamin Pasero
2016-06-01 07:09:47 +02:00
parent efeffdd11f
commit 5ef42ec522
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/parts/editor/editorActions.ts
+2 -2
View File
@@ -14,7 +14,7 @@ import {EditorQuickOpenEntry, EditorQuickOpenEntryGroup, IEditorQuickOpenEntry,
import {IWorkbenchEditorService, GroupArrangement} from 'vs/workbench/services/editor/common/editorService';
import {IQuickOpenService, IPickOpenEntry} from 'vs/workbench/services/quickopen/common/quickOpenService';
import {IPartService} from 'vs/workbench/services/part/common/partService';
import {Position, IEditor, Direction} from 'vs/platform/editor/common/editor';
import {Position, IEditor, Direction, IResourceInput} from 'vs/platform/editor/common/editor';
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import {IEditorIdentifier} from 'vs/workbench/common/editor/editorStacksModel';
import {IHistoryService} from 'vs/workbench/services/history/common/history';
@@ -367,7 +367,7 @@ export class OpenToSideAction extends Action {
if (input instanceof EditorInput) {
typedInputPromise = TPromise.as(input);
} else {
typedInputPromise = this.editorService.createInput(input);
typedInputPromise = this.editorService.createInput(<IResourceInput>input);
}
return typedInputPromise.then(typedInput => this.editorService.openEditor(typedInput, entry.getOptions(), true));
src/vs/workbench/browser/quickopen.ts
+4 -4
View File
@@ -17,7 +17,7 @@ import {KeyMod} from 'vs/base/common/keyCodes';
import {Mode, IEntryRunContext, IAutoFocus, IModel} from 'vs/base/parts/quickopen/common/quickOpen';
import {QuickOpenEntry, IHighlight, QuickOpenEntryGroup, QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel';
import {EditorOptions, EditorInput} from 'vs/workbench/common/editor';
import {IResourceInput} from 'vs/platform/editor/common/editor';
import {IResourceInput, IEditorInput} from 'vs/platform/editor/common/editor';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpenService';
import {AsyncDescriptor} from 'vs/platform/instantiation/common/descriptors';
@@ -204,7 +204,7 @@ export interface IEditorQuickOpenEntry {
/**
* The editor input used for this entry when opening.
*/
getInput(): IResourceInput | EditorInput;
getInput(): IResourceInput | IEditorInput;
/**
* The editor options used for this entry when opening.
@@ -225,7 +225,7 @@ export class EditorQuickOpenEntry extends QuickOpenEntry implements IEditorQuick
return this._editorService;
}
public getInput(): IResourceInput | EditorInput {
public getInput(): IResourceInput | IEditorInput {
return null;
}
@@ -256,7 +256,7 @@ export class EditorQuickOpenEntry extends QuickOpenEntry implements IEditorQuick
*/
export class EditorQuickOpenEntryGroup extends QuickOpenEntryGroup implements IEditorQuickOpenEntry {
public getInput(): EditorInput {
public getInput(): IEditorInput {
return null;
}
src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts
+4 -4
View File
@@ -12,11 +12,11 @@ import {IEntryRunContext, Mode, IAutoFocus} from 'vs/base/parts/quickopen/common
import {QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel';
import {KeyMod} from 'vs/base/common/keyCodes';
import {QuickOpenHandler, EditorQuickOpenEntry, QuickOpenAction} from 'vs/workbench/browser/quickopen';
import {TextEditorOptions, EditorOptions, EditorInput} from 'vs/workbench/common/editor';
import {TextEditorOptions, EditorOptions} from 'vs/workbench/common/editor';
import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';
import {IEditor, IModelDecorationsChangeAccessor, OverviewRulerLane, IModelDeltaDecoration, IRange, IEditorViewState, ITextModel, IDiffEditorModel} from 'vs/editor/common/editorCommon';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
import {Position} from 'vs/platform/editor/common/editor';
import {Position, IEditorInput} from 'vs/platform/editor/common/editor';
import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpenService';
export const GOTO_LINE_PREFIX = ':';
@@ -88,8 +88,8 @@ class GotoLineEntry extends EditorQuickOpenEntry {
return this.runPreview();
}
public getInput(): EditorInput {
return <EditorInput>this.editorService.getActiveEditorInput();
public getInput(): IEditorInput {
return this.editorService.getActiveEditorInput();
}
public getOptions(): EditorOptions {
src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts
+4 -4
View File
@@ -15,14 +15,14 @@ import {IEntryRunContext, Mode, IAutoFocus} from 'vs/base/parts/quickopen/common
import {QuickOpenModel, IHighlight} from 'vs/base/parts/quickopen/browser/quickOpenModel';
import {QuickOpenHandler, EditorQuickOpenEntryGroup, QuickOpenAction} from 'vs/workbench/browser/quickopen';
import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';
import {TextEditorOptions, EditorOptions, EditorInput} from 'vs/workbench/common/editor';
import {TextEditorOptions, EditorOptions} from 'vs/workbench/common/editor';
import filters = require('vs/base/common/filters');
import {KeyMod} from 'vs/base/common/keyCodes';
import {IEditor, IModelDecorationsChangeAccessor, OverviewRulerLane, IModelDeltaDecoration, IRange, IModel, ITokenizedModel, IDiffEditorModel, IEditorViewState} from 'vs/editor/common/editorCommon';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpenService';
import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
import {Position} from 'vs/platform/editor/common/editor';
import {Position, IEditorInput} from 'vs/platform/editor/common/editor';
import {getDocumentSymbols} from 'vs/editor/contrib/quickOpen/common/quickOpen';
import {DocumentSymbolProviderRegistry, SymbolInformation, SymbolKind} from 'vs/editor/common/modes';
@@ -289,8 +289,8 @@ class SymbolEntry extends EditorQuickOpenEntryGroup {
return this.range;
}
public getInput(): EditorInput {
return <EditorInput>this.editorService.getActiveEditorInput();
public getInput(): IEditorInput {
return this.editorService.getActiveEditorInput();
}
public getOptions(): EditorOptions {
src/vs/workbench/services/editor/browser/editorService.ts
+4 -4
View File
@@ -47,7 +47,7 @@ export interface IEditorPart {
}
export class WorkbenchEditorService implements IWorkbenchEditorService {
public serviceId = IWorkbenchEditorService;
private editorPart: IEditorPart | IWorkbenchEditorService;
@@ -122,7 +122,7 @@ export class WorkbenchEditorService implements IWorkbenchEditorService {
// Workbench Input Support
if (input instanceof EditorInput) {
return this.doOpenEditor(<EditorInput>input, <EditorOptions>arg2, arg3);
return this.doOpenEditor(input, <EditorOptions>arg2, arg3);
}
// Support opening foreign resources (such as a http link that points outside of the workbench)
@@ -225,7 +225,7 @@ export class WorkbenchEditorService implements IWorkbenchEditorService {
// Resolve if applicable
if (workbenchInput instanceof EditorInput) {
return (<EditorInput>workbenchInput).resolve(!!refresh);
return workbenchInput.resolve(!!refresh);
}
}
@@ -239,7 +239,7 @@ export class WorkbenchEditorService implements IWorkbenchEditorService {
// Workbench Input Support
if (input instanceof EditorInput) {
return TPromise.as<EditorInput>(<EditorInput>input);
return TPromise.as<EditorInput>(input);
}
// Base Text Editor Support for inmemory resources