Debugger improvements (#86)

* Bump to 1.7.0
* Bump bzl to 1.2.14
* Remove typescript codelens provider
* only start adapter and bazel server if this is a launch config

Author: pcj

package-lock.json

@@ -2,7 +2,7 @@
     "name": "bazel-stack-vscode",
     "displayName": "bazel-stack-vscode",
     "description": "Bazel Support for Visual Studio Code",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "publisher": "StackBuild",
     "license": "Apache-2.0",
     "icon": "stackb-full.png",
@@ -234,7 +234,7 @@
                 },
                 "bsv.bzl.server.release": {
                     "type": "string",
-                    "default": "v1.1.2",
+                    "default": "v1.2.14",
                     "description": "Bzl release version"
                 },
                 "bsv.bzl.server.command": {
@@ -659,7 +659,7 @@
             "bazel-explorer": [
                 {
                     "id": "bsv.workspace",
-                    "name": "Stack VSCode v1.6.0",
+                    "name": "Stack VSCode v1.7.0",
                     "icon": "media/bazel-wireframe.svg",
                     "contextualTitle": "Current Bazel Workspace",
                     "when": "resourceLangId == bazel"
@@ -821,4 +821,4 @@
         "tabWidth": 2,
         "arrowParens": "avoid"
     }
-}
+}

package.json

@@ -253,7 +253,7 @@ export class BzlSettings extends Settings<BzlConfiguration> {
       enabled: config.get<boolean>('enabled', true),
       autoLaunch: config.get<boolean>('autoLaunch', true),
       downloadBaseURL: config.get<string>('downloadBaseUrl', 'https://get.bzl.io'),
-      release: config.get<string>('release', 'v1.1.2'),
+      release: config.get<string>('release', 'v1.2.14'),
       executable: normalize(config.get<string>('executable', '')),
       address: address,
       command: config.get<string[]>('command', ['serve', '--address=${address}']),

src/bezel/codelens.ts

@@ -15,7 +15,7 @@ import { isDefined } from 'vscode-common/out/types';
 
 export class StarlarkDebugger
   extends LaunchableComponent<StarlarkDebuggerConfiguration>
-  implements vscode.Disposable, vscode.DebugAdapterDescriptorFactory, vscode.DebugConfigurationProvider {
+  implements vscode.DebugAdapterDescriptorFactory, vscode.DebugConfigurationProvider {
 
   constructor(
     public readonly settings: StarlarkDebuggerSettings,
@@ -171,31 +171,41 @@ export class StarlarkDebugger
    * @return The resolved debug configuration or undefined or null.
    */
   async resolveDebugConfigurationWithSubstitutedVariables(folder: vscode.WorkspaceFolder | undefined, config: vscode.DebugConfiguration, token?: vscode.CancellationToken): Promise<vscode.DebugConfiguration | undefined> {
-    let targetLabel = config.targetLabel;
-    if (!targetLabel) {
-      targetLabel = await this.handleCommandAskForDebugTargetLabel();
-    }
-    if (!targetLabel) {
-      vscode.window.showInformationMessage('A label for the "bazel build" command is required.  Please add it to your launch configuration.');
-      return;
+    if (config.request !== 'launch') {
+      return config
     }
 
+    //
     // launch the debug adapter if it not already running
+    //
+
     if (this.status !== Status.READY && this.status !== Status.DISABLED) {
       // this needs to wait until the thing is actually running!
       await this.handleCommandLaunch();
       this.restart();
     }
 
-    // launch the bazel debugger if this is a launch config
-    if (config.request === 'launch') {
-      const bazelSettings = await this.bazelSettings.get();
-      const flags = bazelSettings.starlarkDebugFlags || [];
-      const extraFlags = config.extraBazelFlags || [];
+    //
+    // make sure target label is defined
+    //
 
-      await vscode.commands.executeCommand(CommandName.Invoke,
-        ['build', targetLabel, ...flags, ...extraFlags].filter(arg => isDefined(arg)));
+    if (!config.targetLabel) {
+      config.targetLabel = await this.handleCommandAskForDebugTargetLabel();
     }
+    if (!config.targetLabel) {
+      vscode.window.showInformationMessage('A label for the "bazel build" command is required.  Please add it to your launch configuration.');
+      return;
+    }
+
+    //
+    // run bazel debug
+    //
+    const bazelSettings = await this.bazelSettings.get();
+    const flags = bazelSettings.starlarkDebugFlags || [];
+    const extraFlags = config.extraBazelFlags || [];
+
+    await vscode.commands.executeCommand(CommandName.Invoke,
+      ['build', config.targetLabel, ...flags, ...extraFlags].filter(arg => isDefined(arg)));
 
     return config;
   }

src/bezel/configuration.ts

@@ -2,8 +2,6 @@ import * as vscode from 'vscode';
 import { API } from '../api';
 import { Bzl } from './bzl';
 import { BuiltInCommands } from '../constants';
-import { Container } from '../container';
-import { BazelCodelensProvider } from './codelens';
 import {
   SubscriptionSettings,
   BazelConfiguration,
@@ -147,9 +145,6 @@ export class BzlFeature implements vscode.Disposable {
         new StarlarkDebugger(debugSettings, bazelSettings, bzlSettings, workspaceFolder)
       ));
       const codeSearch = this.addComponent(new CodeSearch(codeSearchSettings, bzl));
-      this.addDisposable(
-        new BazelCodelensProvider(lspClient, bazelServer, codeSearch, bzl, starlarkDebugger)
-      );
       this.addDisposable(
         new BezelWorkspaceView(
           lspClient,

src/bezel/debugger.ts

@@ -64,6 +64,7 @@ export class BzlLanguageClient
   }
 
   private handleStateChangeEvent(e: StateChangeEvent) {
+    // console.log('lsp StateChangeEvent new =>', e.newState);
     let status = Status.UNKNOWN;
     switch (e.newState) {
       case State.Starting:
@@ -309,9 +310,7 @@ function createLanguageClient(cfg: LanguageServerConfiguration): LanguageClient
     args: cfg.command,
   };
 
-  // Options to control the language client
   let clientOptions: LanguageClientOptions = {
-    // Register the server for plain text documents
     documentSelector: [
       { scheme: 'file', language: 'starlark' },
       { scheme: 'file', language: 'bazel' },
@@ -321,10 +320,8 @@ function createLanguageClient(cfg: LanguageServerConfiguration): LanguageClient
       // workspace
       fileEvents: vscode.workspace.createFileSystemWatcher('**/BUILD.bazel'),
     },
-    // initializationFailedHandler: err => {
-    //   this.setError(err instanceof Error ? err : new Error(err));
-    //   return false;
-    // },
+    progressOnInitialization: true,
+    initializationOptions: {},
   };
 
   const forceDebug = false;