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

Remove enabled setting and try to open simple browser to side of current editor

Browse Source
This commit is contained in:
Matt Bierner
2021-01-14 17:06:03 -08:00
parent 1e3a23b4e0
commit 6cceb4eab0
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/simple-browser/src/extension.ts
View File

@@ -3,11 +3,12 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { URL } from 'url';
import * as vscode from 'vscode';
import * as nls from 'vscode-nls';
import { SimpleBrowserManager } from './simpleBrowserManager';
declare const URL: typeof import('url').URL;
const localize = nls.loadMessageBundle();
const openApiCommand = 'simpleBrowser.api.open';
@@ -47,11 +48,6 @@ export function activate(context: vscode.ExtensionContext) {
context.subscriptions.push(vscode.window.registerExternalUriOpener(openerId, ['http', 'https'], {
canOpenExternalUri(uri: vscode.Uri) {
const configuration = vscode.workspace.getConfiguration('simpleBrowser');
if (!configuration.get('opener.enabled', false)) {
return vscode.ExternalUriOpenerPriority.None;
}
const originalUri = new URL(uri.toString());
if (enabledHosts.has(originalUri.hostname)) {
return isWeb()
@@ -62,7 +58,9 @@ export function activate(context: vscode.ExtensionContext) {
return vscode.ExternalUriOpenerPriority.None;
},
openExternalUri(resolveUri: vscode.Uri) {
return manager.show(resolveUri.toString());
return manager.show(resolveUri.toString(), {
viewColumn: vscode.window.activeTextEditor ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active
});
}
}, {
label: localize('openTitle', "Open in simple browser"),

2
extensions/simple-browser/src/simpleBrowserView.ts
View File

@@ -32,7 +32,7 @@ export class SimpleBrowserView extends Disposable {
super();
this._webviewPanel = this._register(vscode.window.createWebviewPanel(SimpleBrowserView.viewType, SimpleBrowserView.title, {
viewColumn: vscode.ViewColumn.Active,
viewColumn: showOptions?.viewColumn ?? vscode.ViewColumn.Active,
preserveFocus: showOptions?.preserveFocus
}, {
enableScripts: true,