1. Singleton Import Bazel Project wizard

2. Build to Java 11 and Node 10

Author: AlexeiShmidman

.github/workflows/build.yml

@@ -8,6 +8,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@1
+        with:
+          java-version: 11
+
+      - name: Build VSCode extension
+      - uses: actions/setup-node@v2
         with:
           node-version: '10'
       - run: sudo npm install -g vsce

src/editor.ts

@@ -5,39 +5,41 @@ import * as bazelproject from './bazelproject';
 import * as bazelmodule from './bazelmodule';
 
 
-export function handleMessages(extCtx: vscode.ExtensionContext, webPanel: vscode.WebviewPanel, message: any) {
-    switch (message.command) {
-        case 'importProject': {
-            const bi: bazelproject.BazelProject = new bazelproject.BazelProject(message.source, message.target);
-            bi.openProject(message.modules);
-            return;
-        }
-        case 'browseWorkspace':
-            vscode.window.showOpenDialog({
-                'title': 'Select WORKSPACE location',
-                'canSelectFolders': false,
-                'canSelectFiles': true,
-                'canSelectMany': false,
-                'openLabel': 'Select'
-            }).then((fileUri) => postLocation(fileUri, webPanel, 'setworkspace'));
-            return;
-        case 'browseTarget':
-            vscode.window.showOpenDialog({
-                'title': 'Select target folder',
-                'canSelectFolders': true,
-                'canSelectFiles': false,
-                'canSelectMany': false,
-                'openLabel': 'Select'
-            }).then((fileUri) => postLocation(fileUri, webPanel, 'settarget'));
-            return;
-        case 'loadModules': {
-            const bi: bazelproject.BazelProject = new bazelproject.BazelProject(message.source, message.target);
-            const modules: bazelmodule.BazelModule[] = bi.lookupModules();
-            webPanel.webview.postMessage({
-                command: 'listModules',
-                data: modules
-            });
-            return;
+export function handleMessages(extCtx: vscode.ExtensionContext, webPanel: vscode.WebviewPanel | undefined, message: any) {
+    if (webPanel) {
+        switch (message.command) {
+            case 'importProject': {
+                const bi: bazelproject.BazelProject = new bazelproject.BazelProject(message.source, message.target);
+                bi.openProject(message.modules);
+                return;
+            }
+            case 'browseWorkspace':
+                vscode.window.showOpenDialog({
+                    'title': 'Select WORKSPACE location',
+                    'canSelectFolders': false,
+                    'canSelectFiles': true,
+                    'canSelectMany': false,
+                    'openLabel': 'Select'
+                }).then((fileUri) => postLocation(fileUri, webPanel, 'setworkspace'));
+                return;
+            case 'browseTarget':
+                vscode.window.showOpenDialog({
+                    'title': 'Select target folder',
+                    'canSelectFolders': true,
+                    'canSelectFiles': false,
+                    'canSelectMany': false,
+                    'openLabel': 'Select'
+                }).then((fileUri) => postLocation(fileUri, webPanel, 'settarget'));
+                return;
+            case 'loadModules': {
+                const bi: bazelproject.BazelProject = new bazelproject.BazelProject(message.source, message.target);
+                const modules: bazelmodule.BazelModule[] = bi.lookupModules();
+                webPanel.webview.postMessage({
+                    command: 'listModules',
+                    data: modules
+                });
+                return;
+            }
         }
     }
 }
@@ -87,7 +89,7 @@ export function getWebviewContent(panel: vscode.WebviewPanel, extCtx: vscode.Ext
         <br>
         <div>
             <div>
-                <label for="filterModules">Filter modules:</label>
+                <label for="filterModules">Filter modules by name:</label>
                 <input type="text" id="filterModules" name="filterModules" style="width: 50%; height: 1.5em;" disabled>
                 <button id="resetFilter" name="resetFilter" style="height: 1.5em;" disabled>Reset filter</button>
             </div>
@@ -96,6 +98,7 @@ export function getWebviewContent(panel: vscode.WebviewPanel, extCtx: vscode.Ext
                 <label for="useSelected">Filter selected modules</label>
             </div>
         </div>
+        <br>
         <hr>
     
         <div id="moduleList" style="width: 100%; height: 50%; overflow-y: scroll;">

src/extension.ts

@@ -3,32 +3,49 @@ import * as path from 'path';
 import * as pieditor from './editor';
 
 export function activate(context: vscode.ExtensionContext) {
+	let panel: vscode.WebviewPanel | undefined = undefined;
 
 	console.log('Extension "bazelimport" is now active!');
 
 	let viewTitleDisp = vscode.commands.registerCommand('bazelimport.menus.viewtitle', () => {
-		const panel = vscode.window.createWebviewPanel(
-			'bazelImportWizard', // Identifies the type of the webview. Used internally
-			'Import wizard', // Title of the panel displayed to the user
-			vscode.ViewColumn.One, // Editor column to show the new webview panel in.
-			{
-				enableScripts: true,
-				retainContextWhenHidden: true,
-				localResourceRoots: [
-					vscode.Uri.file(path.join(context.extensionPath, 'js')),
-					vscode.Uri.file(path.join(context.extensionPath, 'css'))
-				]
-			}
-		);
-
-		panel.webview.html = pieditor.getWebviewContent(panel, context);
-
-		// Handle messages from the webview
-		panel.webview.onDidReceiveMessage(
-			message => pieditor.handleMessages(context, panel, message),
-			undefined,
-			context.subscriptions
-		);
+		const columnToShowIn = vscode.window.activeTextEditor
+			? vscode.window.activeTextEditor.viewColumn
+			: undefined;
+		if (panel) {
+			// If we already have a panel, show it in the target column
+			panel.reveal(columnToShowIn);
+		} else {
+			panel = vscode.window.createWebviewPanel(
+				'bazelImportWizard', // Identifies the type of the webview. Used internally
+				'Import wizard', // Title of the panel displayed to the user
+				vscode.ViewColumn.One, // Editor column to show the new webview panel in.
+				{
+					enableScripts: true,
+					retainContextWhenHidden: true,
+					localResourceRoots: [
+						vscode.Uri.file(path.join(context.extensionPath, 'js')),
+						vscode.Uri.file(path.join(context.extensionPath, 'css'))
+					]
+				}
+			);
+
+			panel.webview.html = pieditor.getWebviewContent(panel, context);
+
+			// Handle messages from the webview
+			panel.webview.onDidReceiveMessage(
+				message => pieditor.handleMessages(context, panel, message),
+				undefined,
+				context.subscriptions
+			);
+
+			panel.onDidDispose(
+				() => {
+					panel = undefined;
+				},
+				null,
+				context.subscriptions
+			);
+		}
 	});
 
 	context.subscriptions.push(viewTitleDisp);