From 6cceb4eab08718ef49d63426c753ec59f6481ba9 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 14 Jan 2021 17:06:03 -0800
Subject: [PATCH] Remove enabled setting and try to open simple browser to side
 of current editor

---
 extensions/simple-browser/src/extension.ts         | 12 +++++-------
 extensions/simple-browser/src/simpleBrowserView.ts |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/extensions/simple-browser/src/extension.ts b/extensions/simple-browser/src/extension.ts
index 9e645667153..8079e2396eb 100644
--- a/extensions/simple-browser/src/extension.ts
+++ b/extensions/simple-browser/src/extension.ts
@@ -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"),
diff --git a/extensions/simple-browser/src/simpleBrowserView.ts b/extensions/simple-browser/src/simpleBrowserView.ts
index 870abbeee87..104acfe9559 100644
--- a/extensions/simple-browser/src/simpleBrowserView.ts
+++ b/extensions/simple-browser/src/simpleBrowserView.ts
@@ -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,
-- 
GitLab