Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Addresses #26184 - use configuration for pinned default (#27357)

Browse Source 
* Addresses #26184 - use configuration for pinned default

* Honors the preview editor setting above all

* Removes passing undefined to pinned internally
re: requested code review changes

* Removes unnecessary undefined

* feedback
This commit is contained in:
Eric Amodio
2017-07-06 08:12:39 +02:00
committed by Benjamin Pasero
parent b5cd8121f5
commit 4f50b29e92
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,11 +205,10 @@ export class ExtHostApiCommands {
});
this._register('vscode.diff', (left: URI, right: URI, label: string, options?: vscode.TextDocumentShowOptions) => {
let editorOptions: IEditorOptions;
if (options) {
editorOptions = {
pinned: !options.preview,
pinned: typeof options.preview === 'boolean' ? !options.preview : undefined,
preserveFocus: options.preserveFocus
};
}

8
src/vs/workbench/api/node/extHostTextEditors.ts
View File

@@ -63,20 +63,18 @@ export class ExtHostEditors extends ExtHostEditorsShape {
if (typeof columnOrOptions === 'number') {
options = {
position: TypeConverters.fromViewColumn(columnOrOptions),
preserveFocus: preserveFocus,
pinned: true
preserveFocus
};
} else if (typeof columnOrOptions === 'object') {
options = {
position: TypeConverters.fromViewColumn(columnOrOptions.viewColumn),
preserveFocus: columnOrOptions.preserveFocus,
pinned: columnOrOptions.preview === undefined ? true : !columnOrOptions.preview
pinned: typeof columnOrOptions.preview === 'boolean' ? !columnOrOptions.preview : undefined
};
} else {
options = {
position: EditorPosition.ONE,
preserveFocus: false,
pinned: true
preserveFocus: false
};
}