From 6c30519b93c280138c9422aedeac5057a6a25788 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Wed, 18 Mar 2020 19:47:42 +0100 Subject: [PATCH] * Adds command "Debug Visualizer: Use Selection as Expression" (Shift+F1) * Changes text of command "Open a new Debug Visualizer View" to "Debug Visualizer: New View". --- extension/CHANGELOG.md | 2 ++ extension/package.json | 14 ++++++++- ...nnectionHandler.ts => ClientConnection.ts} | 10 ++++++- extension/src/Server.ts | 11 +++++-- extension/src/contract.ts | 5 ++++ extension/src/extension.ts | 30 +++++++++++++++++++ webview/src/model/Model.ts | 3 ++ 7 files changed, 70 insertions(+), 5 deletions(-) rename extension/src/{ConnectionHandler.ts => ClientConnection.ts} (93%) diff --git a/extension/CHANGELOG.md b/extension/CHANGELOG.md index 26e6ccf..62918ee 100644 --- a/extension/CHANGELOG.md +++ b/extension/CHANGELOG.md @@ -3,6 +3,8 @@ ## Unrealeased - Submits the expression when the expression input loses focus. +- Changes text of command "Open a new Debug Visualizer View" to "Debug Visualizer: New View". +- Adds command "Debug Visualizer: Use Selection as Expression" (Shift+F1) ## 0.13.0 diff --git a/extension/package.json b/extension/package.json index f5a6e75..7d8077c 100644 --- a/extension/package.json +++ b/extension/package.json @@ -24,6 +24,7 @@ ], "activationEvents": [ "onCommand:vscode-debug-visualizer.new-visualizer", + "onCommand:vscode-debug-visualizer.visualizer-set-expression", "onDebug", "onWebviewPanel:debugVisualizer" ], @@ -32,7 +33,18 @@ "commands": [ { "command": "vscode-debug-visualizer.new-visualizer", - "title": "Open a new Debug Visualizer View" + "title": "Debug Visualizer: New View" + }, + { + "command": "vscode-debug-visualizer.visualizer-set-expression", + "title": "Debug Visualizer: Use Selection as Expression" + } + ], + "keybindings": [ + { + "command": "vscode-debug-visualizer.visualizer-set-expression", + "key": "shift+f1", + "when": "editorTextFocus" } ], "configuration": { diff --git a/extension/src/ConnectionHandler.ts b/extension/src/ClientConnection.ts similarity index 93% rename from extension/src/ConnectionHandler.ts rename to extension/src/ClientConnection.ts index 528fd16..c16972f 100644 --- a/extension/src/ConnectionHandler.ts +++ b/extension/src/ClientConnection.ts @@ -9,11 +9,13 @@ import * as open from "open"; import chromeLauncher = require("chrome-launcher"); import { Config } from "./Config"; -export class ConnectionHandler { +export class ClientConnection { public readonly dispose = Disposable.fn(); @observable private watcher: EvaluationWatcher | undefined = undefined; + private readonly client: typeof debugVisualizerUIContract["TClientInterface"]; + constructor( dataSource: DataSource, stream: WebSocketStream, @@ -104,6 +106,8 @@ export class ConnectionHandler { } ); + this.client = client; + this.dispose.track( Disposable.create( autorun(() => { @@ -120,6 +124,10 @@ export class ConnectionHandler { this.dispose(); }); } + + public setExpression(expression: string) { + this.client.setExpression({ expression }); + } } async function launchChrome(url: string): Promise { diff --git a/extension/src/Server.ts b/extension/src/Server.ts index 2ec7ef7..22d7716 100644 --- a/extension/src/Server.ts +++ b/extension/src/Server.ts @@ -1,7 +1,7 @@ import { WebSocketStream } from "@hediet/typed-json-rpc-websocket"; import { AddressInfo } from "net"; import WebSocket = require("ws"); -import { ConnectionHandler } from "./ConnectionHandler"; +import { ClientConnection } from "./ClientConnection"; import * as express from "express"; import * as http from "http"; import * as serveStatic from "serve-static"; @@ -14,6 +14,8 @@ export class Server { private server: http.Server; public readonly secret = cryptoRandomString({ length: 20 }); + public readonly connections = new Set(); + constructor(dataSource: DataSource, config: Config) { const app = express(); @@ -28,15 +30,18 @@ export class Server { ); const wss = new WebSocket.Server({ server: this.server }); - wss.on("connection", ws => { + wss.on("connection", async ws => { const stream = new WebSocketStream(ws); - new ConnectionHandler( + const c = new ClientConnection( dataSource, stream, this, config, this.secret ); + this.connections.add(c); + await stream.onClosed; + this.connections.delete(c); }); } diff --git a/extension/src/contract.ts b/extension/src/contract.ts index d0a9bba..060ba1e 100644 --- a/extension/src/contract.ts +++ b/extension/src/contract.ts @@ -100,6 +100,11 @@ export const debugVisualizerUIContract = contract({ newState: unchecked(), }), }), + setExpression: requestContract({ + params: types.type({ + expression: types.string, + }), + }), }, server: { authenticate: requestContract({ diff --git a/extension/src/extension.ts b/extension/src/extension.ts index 379467e..1ecca65 100644 --- a/extension/src/extension.ts +++ b/extension/src/extension.ts @@ -61,6 +61,36 @@ export class Extension { } ) ); + + this.dispose.track( + commands.registerCommand( + "vscode-debug-visualizer.visualizer-set-expression", + () => { + const editor = window.activeTextEditor; + if (!editor) { + return; + } + + const selection = editor.selection; + const selectedText = editor.document.getText(selection); + + if (!selectedText) { + return; + } + + const connections = [...this.server.connections.values()]; + if (connections.length > 0) { + const latestConnection = + connections[connections.length - 1]; + + latestConnection.setExpression(selectedText); + } else { + // TODO pass expression + // this.views.createNew(); + } + } + ) + ); } } diff --git a/webview/src/model/Model.ts b/webview/src/model/Model.ts index dec9a63..43ec5dd 100644 --- a/webview/src/model/Model.ts +++ b/webview/src/model/Model.ts @@ -186,6 +186,9 @@ export class Model { this.state = newState; } }, + setExpression: async ({ expression }) => { + this.setExpression(expression); + }, } ); try {