提交 936104d8 编写于 作者: J Johannes Rieken

rename TextDocumentShowOptions#column to TextDocumentShowOptions#viewColumn

上级 9f016428
...@@ -703,9 +703,11 @@ declare module 'vscode' { ...@@ -703,9 +703,11 @@ declare module 'vscode' {
*/ */
export interface TextDocumentShowOptions { export interface TextDocumentShowOptions {
/** /**
* An optional view column in which the [editor](#TextEditor) should be shown. The default is the [one](#ViewColumn.One), other values are adjusted to be __Min(column, columnCount + 1)__. * An optional view column in which the [editor](#TextEditor) should be shown.
* The default is the [one](#ViewColumn.One), other values are adjusted to
* be __Min(column, columnCount + 1)__.
*/ */
column?: ViewColumn, viewColumn?: ViewColumn,
/** /**
* An optional flag that when `true` will stop the [editor](#TextEditor) from taking focus. * An optional flag that when `true` will stop the [editor](#TextEditor) from taking focus.
......
...@@ -219,7 +219,7 @@ export class ExtHostApiCommands { ...@@ -219,7 +219,7 @@ export class ExtHostApiCommands {
label, label,
undefined, undefined,
editorOptions, editorOptions,
options ? typeConverters.fromViewColumn(options.column) : undefined options ? typeConverters.fromViewColumn(options.viewColumn) : undefined
]); ]);
}, { }, {
description: 'Opens the provided resources in the diff editor to compare their contents.', description: 'Opens the provided resources in the diff editor to compare their contents.',
......
...@@ -68,7 +68,7 @@ export class ExtHostEditors extends ExtHostEditorsShape { ...@@ -68,7 +68,7 @@ export class ExtHostEditors extends ExtHostEditorsShape {
}; };
} else if (typeof columnOrOptions === 'object') { } else if (typeof columnOrOptions === 'object') {
options = { options = {
position: TypeConverters.fromViewColumn(columnOrOptions.column), position: TypeConverters.fromViewColumn(columnOrOptions.viewColumn),
preserveFocus: columnOrOptions.preserveFocus, preserveFocus: columnOrOptions.preserveFocus,
pinned: columnOrOptions.preview === undefined ? true : !columnOrOptions.preview pinned: columnOrOptions.preview === undefined ? true : !columnOrOptions.preview
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册