Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

align vscode.diff options with API

Browse Source
This commit is contained in:
Johannes Rieken
2017-04-25 17:26:04 +02:00
parent 6147b54439
commit 9f01642853
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/vs/workbench/api/node/extHostApiCommands.ts
View File

@@ -17,6 +17,7 @@ import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
import { IOutline } from 'vs/editor/contrib/quickOpen/common/quickOpen';
import { IWorkspaceSymbolProvider } from 'vs/workbench/parts/search/common/search';
import { ICodeLensData } from 'vs/editor/contrib/codelens/common/codelens';
import { IEditorOptions } from 'vs/platform/editor/common/editor';
export class ExtHostApiCommands {
@@ -203,15 +204,30 @@ export class ExtHostApiCommands {
]
});
this._register('vscode.diff', (left: URI, right: URI, label: string, options?: { preserveFocus?: boolean, pinned?: boolean }) => {
return this._commands.executeCommand('_workbench.diff', [left, right, label, undefined, options]);
this._register('vscode.diff', (left: URI, right: URI, label: string, options?: vscode.TextDocumentShowOptions) => {
let editorOptions: IEditorOptions;
if (options) {
editorOptions = {
pinned: !options.preview,
preserveFocus: options.preserveFocus
};
}
return this._commands.executeCommand('_workbench.diff', [
left, right,
label,
undefined,
editorOptions,
options ? typeConverters.fromViewColumn(options.column) : undefined
]);
}, {
description: 'Opens the provided resources in the diff editor to compare their contents.',
args: [
{ name: 'left', description: 'Left-hand side resource of the diff editor', constraint: URI },
{ name: 'right', description: 'Right-hand side resource of the diff editor', constraint: URI },
{ name: 'title', description: '(optional) Human readable title for the diff editor', constraint: v => v === void 0 || typeof v === 'string' },
{ name: 'options', description: '(optional) Editor options' }
{ name: 'options', description: '(optional) Editor options, see vscode.TextDocumentShowOptions' }
]
});