diff options
Diffstat (limited to 'src/vs/workbench/services/editor/common/editorResolverService.ts')
-rw-r--r-- | src/vs/workbench/services/editor/common/editorResolverService.ts | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/vs/workbench/services/editor/common/editorResolverService.ts b/src/vs/workbench/services/editor/common/editorResolverService.ts index 7cf047a1297..57f3e2c1508 100644 --- a/src/vs/workbench/services/editor/common/editorResolverService.ts +++ b/src/vs/workbench/services/editor/common/editorResolverService.ts @@ -16,7 +16,7 @@ import { Extensions as ConfigurationExtensions, IConfigurationNode, IConfigurati import { IResourceEditorInput, ITextResourceEditorInput } from 'vs/platform/editor/common/editor'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Registry } from 'vs/platform/registry/common/platform'; -import { EditorInputWithOptions, EditorInputWithOptionsAndGroup, IResourceDiffEditorInput, IUntitledTextResourceEditorInput, IUntypedEditorInput } from 'vs/workbench/common/editor'; +import { EditorInputWithOptions, EditorInputWithOptionsAndGroup, IResourceDiffEditorInput, IResourceMergeEditorInput, IUntitledTextResourceEditorInput, IUntypedEditorInput } from 'vs/workbench/common/editor'; import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService'; import { PreferredGroup } from 'vs/workbench/services/editor/common/editorService'; @@ -111,6 +111,8 @@ export type UntitledEditorInputFactoryFunction = (untitledEditorInput: IUntitled export type DiffEditorInputFactoryFunction = (diffEditorInput: IResourceDiffEditorInput, group: IEditorGroup) => EditorInputFactoryResult; +export type MergeEditorInputFactoryFunction = (mergeEditorInput: IResourceMergeEditorInput, group: IEditorGroup) => EditorInputFactoryResult; + export interface IEditorResolverService { readonly _serviceBrand: undefined; /** @@ -144,8 +146,9 @@ export interface IEditorResolverService { editorInfo: RegisteredEditorInfo, options: RegisteredEditorOptions, createEditorInput: EditorInputFactoryFunction, - createUntitledEditorInput?: UntitledEditorInputFactoryFunction | undefined, - createDiffEditorInput?: DiffEditorInputFactoryFunction + createUntitledEditorInput?: UntitledEditorInputFactoryFunction, + createDiffEditorInput?: DiffEditorInputFactoryFunction, + createMergeEditorInput?: MergeEditorInputFactoryFunction ): IDisposable; /** |