Remove extra parameter added for #100238

For #100238. The data for this parameter already exists on options
microsoft · Jul 1, 2020 · 4fbaace · 4fbaace
1 parent b3d6826
commit 4fbaace
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/src/vs/workbench/browser/contextkeys.ts b/src/vs/workbench/browser/contextkeys.ts
@@ -210,7 +210,7 @@ export class WorkbenchContextKeysHandler extends Disposable {
  this.activeEditorContext.set(activeEditorPane.getId());
  this.activeEditorIsReadonly.set(activeEditorPane.input.isReadonly());
 
- const editors = activeEditorPane.input.resource ? this.editorService.getEditorOverrides(activeEditorPane.input.resource, undefined, activeGroup, undefined) : [];
+ const editors = activeEditorPane.input.resource ? this.editorService.getEditorOverrides(activeEditorPane.input.resource, undefined, activeGroup) : [];
  this.activeEditorAvailableEditorIds.set(editors.map(([_, entry]) => entry.id).join(','));
  } else {
  this.activeEditorContext.reset();

diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
@@ -451,7 +451,7 @@ export class CustomEditorContribution extends Disposable implements IWorkbenchCo
  open: (editor, options, group) => {
  return this.onEditorOpening(editor, options, group);
  },
- getEditorOverrides: (resource: URI, _options: IEditorOptions | undefined, group: IEditorGroup | undefined, id: string | undefined): IOpenEditorOverrideEntry[] => {
+ getEditorOverrides: (resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined): IOpenEditorOverrideEntry[] => {
  const currentEditor = group?.editors.find(editor => isEqual(editor.resource, resource));
 
  const defaultEditorOverride: IOpenEditorOverrideEntry = {
@@ -468,14 +468,14 @@ export class CustomEditorContribution extends Disposable implements IWorkbenchCo
  };
  };
 
- if (typeof id === 'string') {
+ if (typeof options?.override === 'string') {
  // A specific override was requested. Only return it.
 
- if (id === defaultEditorOverride.id) {
+ if (options.override === defaultEditorOverride.id) {
  return [defaultEditorOverride];
  }
 
- const matchingEditor = this.customEditorService.getCustomEditor(id);
+ const matchingEditor = this.customEditorService.getCustomEditor(options.override);
  return matchingEditor ? [toOverride(matchingEditor)] : [];
  }
 

diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -486,7 +486,7 @@ export class ExplorerView extends ViewPane {
  this.rootContext.set(!stat || (stat && stat.isRoot));
 
  if (resource) {
- const overrides = resource ? this.editorService.getEditorOverrides(resource, undefined, undefined, undefined) : [];
+ const overrides = resource ? this.editorService.getEditorOverrides(resource, undefined, undefined) : [];
  this.availableEditorIdsContext.set(overrides.map(([, entry]) => entry.id).join(','));
  } else {
  this.availableEditorIdsContext.reset();

diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts
@@ -490,10 +490,10 @@ export class EditorService extends Disposable implements EditorServiceImpl {
  return toDisposable(() => remove());
  }
 
- getEditorOverrides(resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined, id: string | undefined): [IOpenEditorOverrideHandler, IOpenEditorOverrideEntry][] {
+ getEditorOverrides(resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined): [IOpenEditorOverrideHandler, IOpenEditorOverrideEntry][] {
  const overrides = [];
  for (const handler of this.openEditorHandlers) {
- const handlers = handler.getEditorOverrides ? handler.getEditorOverrides(resource, options, group, id).map(val => [handler, val] as [IOpenEditorOverrideHandler, IOpenEditorOverrideEntry]) : [];
+ const handlers = handler.getEditorOverrides ? handler.getEditorOverrides(resource, options, group).map(val => [handler, val] as [IOpenEditorOverrideHandler, IOpenEditorOverrideEntry]) : [];
  overrides.push(...handlers);
  }
 
@@ -1347,7 +1347,7 @@ export class DelegatingEditorService implements IEditorService {
  isOpen(editor: IEditorInput | IResourceEditorInput): boolean { return this.editorService.isOpen(editor as IResourceEditorInput /* TS fail */); }
 
  overrideOpenEditor(handler: IOpenEditorOverrideHandler): IDisposable { return this.editorService.overrideOpenEditor(handler); }
- getEditorOverrides(resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined, id: string | undefined) { return this.editorService.getEditorOverrides(resource, options, group, id); }
+ getEditorOverrides(resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined) { return this.editorService.getEditorOverrides(resource, options, group); }
 
  invokeWithinEditorContext<T>(fn: (accessor: ServicesAccessor) => T): T { return this.editorService.invokeWithinEditorContext(fn); }
 

diff --git a/src/vs/workbench/services/editor/common/editorOpenWith.ts b/src/vs/workbench/services/editor/common/editorOpenWith.ts
@@ -42,14 +42,16 @@ export async function openEditorWith(
  return;
  }
 
- const allEditorOverrides = getAllAvailableEditors(resource, id, options, group, editorService);
+ const overrideOptions = { ...options, override: id };
+
+ const allEditorOverrides = getAllAvailableEditors(resource, id, overrideOptions, group, editorService);
  if (!allEditorOverrides.length) {
  return;
  }
 
  const overrideToUse = typeof id === 'string' && allEditorOverrides.find(([_, entry]) => entry.id === id);
  if (overrideToUse) {
- return overrideToUse[0].open(input, { ...options, override: id }, group, OpenEditorContext.NEW_EDITOR)?.override;
+ return overrideToUse[0].open(input, overrideOptions, group, OpenEditorContext.NEW_EDITOR)?.override;
  }
 
  // Prompt
@@ -134,7 +136,7 @@ export function getAllAvailableEditors(
  editorService: IEditorService
 ): Array<[IOpenEditorOverrideHandler, IOpenEditorOverrideEntry]> {
  const fileEditorInputFactory = Registry.as<IEditorInputFactoryRegistry>(EditorExtensions.EditorInputFactories).getFileEditorInputFactory();
- const overrides = editorService.getEditorOverrides(resource, options, group, id);
+ const overrides = editorService.getEditorOverrides(resource, options, group);
  if (!overrides.some(([_, entry]) => entry.id === DEFAULT_EDITOR_ID)) {
  overrides.unshift([
  {

diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts
@@ -36,7 +36,7 @@ export interface IOpenEditorOverrideEntry {
 
 export interface IOpenEditorOverrideHandler {
  open(editor: IEditorInput, options: IEditorOptions | ITextEditorOptions | undefined, group: IEditorGroup, context: OpenEditorContext): IOpenEditorOverride | undefined;
- getEditorOverrides?(resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined, id: string | undefined): IOpenEditorOverrideEntry[];
+ getEditorOverrides?(resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined): IOpenEditorOverrideEntry[];
 }
 
 export interface IOpenEditorOverride {
@@ -236,7 +236,7 @@ export interface IEditorService {
  /**
  * Get all available editor overrides for the editor input.
  */
- getEditorOverrides(resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined, id: string | undefined): [IOpenEditorOverrideHandler, IOpenEditorOverrideEntry][];
+ getEditorOverrides(resource: URI, options: IEditorOptions | undefined, group: IEditorGroup | undefined): [IOpenEditorOverrideHandler, IOpenEditorOverrideEntry][];
 
  /**
  * Allows to override the opening of editors by installing a handler that will