Skip to content

Commit 72cf134

Browse files
committed
Don't transform viewColumn used when creating extHostWebviewPanel programatically
Fixes #111980 We should take the vscode.ViewColumn here, not the internal view column type
1 parent 32d935e commit 72cf134

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/vs/workbench/api/common/extHostCustomEditors.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import * as modes from 'vs/editor/common/modes';
1313
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
1414
import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
1515
import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths';
16+
import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
1617
import { ExtHostWebviews, toExtensionData } from 'vs/workbench/api/common/extHostWebview';
1718
import { ExtHostWebviewPanels } from 'vs/workbench/api/common/extHostWebviewPanels';
1819
import { EditorGroupColumn } from 'vs/workbench/common/editor';
@@ -260,8 +261,10 @@ export class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditor
260261
throw new Error(`No provider found for '${viewType}'`);
261262
}
262263

264+
const viewColumn = typeConverters.ViewColumn.to(position);
265+
263266
const webview = this._extHostWebview.createNewWebview(handle, options, entry.extension);
264-
const panel = this._extHostWebviewPanels.createNewWebviewPanel(handle, viewType, title, position, options, webview);
267+
const panel = this._extHostWebviewPanels.createNewWebviewPanel(handle, viewType, title, viewColumn, options, webview);
265268

266269
const revivedResource = URI.revive(resource);
267270

src/vs/workbench/api/common/extHostWebviewPanels.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ export class ExtHostWebviewPanels implements extHostProtocol.ExtHostWebviewPanel
287287
await serializer.deserializeWebviewPanel(revivedPanel, state);
288288
}
289289

290-
public createNewWebviewPanel(webviewHandle: string, viewType: string, title: string, position: number, options: modes.IWebviewOptions & modes.IWebviewPanelOptions, webview: ExtHostWebview) {
291-
const panel = new ExtHostWebviewPanel(webviewHandle, this._proxy, viewType, title, typeof position === 'number' && position >= 0 ? typeConverters.ViewColumn.to(position) : undefined, options, webview);
290+
public createNewWebviewPanel(webviewHandle: string, viewType: string, title: string, position: vscode.ViewColumn, options: modes.IWebviewOptions & modes.IWebviewPanelOptions, webview: ExtHostWebview) {
291+
const panel = new ExtHostWebviewPanel(webviewHandle, this._proxy, viewType, title, position, options, webview);
292292
this._webviewPanels.set(webviewHandle, panel);
293293
return panel;
294294
}

0 commit comments

Comments
 (0)