Refactors code.

This commit is contained in:
Henning Dieterichs
2019-08-12 10:48:33 +02:00
parent 9f833ffa4a
commit df6a8a8a22
8 changed files with 114 additions and 105 deletions

View File

@@ -1,3 +1,4 @@
# VS Code Debug Visualizer # VS Code Debug Visualizer
See [extension](extension) for the extension readme. See the [extension](extension) directory for the extension readme.
You can get the extension in the [marketplace](https://marketplace.visualstudio.com/items?itemName=hediet.debug-visualizer).

View File

@@ -17,7 +17,7 @@ export class Config {
); );
} }
public useChromeKioskModeKey(): boolean { public useChromeKioskMode(): boolean {
const c = workspace.getConfiguration(); const c = workspace.getConfiguration();
const b = c.get<boolean>(useChromeKioskModeKey); const b = c.get<boolean>(useChromeKioskModeKey);
if (b === undefined) { if (b === undefined) {

View File

@@ -4,9 +4,11 @@ import { ConsoleRpcLogger } from "@hediet/typed-json-rpc";
import { EvaluationWatcher } from "./DataSource/DataSource"; import { EvaluationWatcher } from "./DataSource/DataSource";
import { WebSocketStream } from "@hediet/typed-json-rpc-websocket"; import { WebSocketStream } from "@hediet/typed-json-rpc-websocket";
import { observable, autorun } from "mobx"; import { observable, autorun } from "mobx";
import { Sources } from "./extension"; import { Sources } from "./DataSource";
import { Server } from "./Server"; import { Server } from "./Server";
import * as open from "open"; import * as open from "open";
import chromeLauncher = require("chrome-launcher");
import { Config } from "./Config";
export class ConnectionHandler { export class ConnectionHandler {
public readonly dispose = Disposable.fn(); public readonly dispose = Disposable.fn();
@@ -49,7 +51,7 @@ export class ConnectionHandler {
}, },
openInBrowser: async ({}) => { openInBrowser: async ({}) => {
let opened = false; let opened = false;
if (config.useChromeKioskModeKey()) { if (config.useChromeKioskMode()) {
opened = await launchChrome(server.indexUrl); opened = await launchChrome(server.indexUrl);
} }
if (!opened) { if (!opened) {
@@ -91,12 +93,9 @@ export class ConnectionHandler {
} }
} }
import chromeLauncher = require("chrome-launcher");
import { Config } from "./Config";
async function launchChrome(url: string): Promise<boolean> { async function launchChrome(url: string): Promise<boolean> {
try { try {
const chrome = await chromeLauncher.launch({ const _chrome = await chromeLauncher.launch({
startingUrl: url, startingUrl: url,
// `--window-size=${width},${height}` // `--window-size=${width},${height}`
chromeFlags: ["--app=" + url], chromeFlags: ["--app=" + url],

View File

@@ -0,0 +1,5 @@
import { createJsDebuggerSource } from "./JsDebuggerSource";
export class Sources {
public readonly jsSource = createJsDebuggerSource();
}

View File

@@ -3,7 +3,7 @@ import { AddressInfo } from "net";
import WebSocket = require("ws"); import WebSocket = require("ws");
import { join } from "path"; import { join } from "path";
import { ConnectionHandler } from "./ConnectionHandler"; import { ConnectionHandler } from "./ConnectionHandler";
import { Sources } from "./extension"; import { Sources } from "./DataSource";
import * as express from "express"; import * as express from "express";
import * as http from "http"; import * as http from "http";
import * as serveStatic from "serve-static"; import * as serveStatic from "serve-static";
@@ -14,7 +14,8 @@ export class Server {
constructor(sources: Sources, config: Config) { constructor(sources: Sources, config: Config) {
const app = express(); const app = express();
app.use(serveStatic(join(__dirname, "../ui/dist"))); const distPath = join(__dirname, "../ui/dist");
app.use(serveStatic(distPath));
this.server = app.listen(); this.server = app.listen();
@@ -23,7 +24,6 @@ export class Server {
const stream = new WebSocketStream(ws); const stream = new WebSocketStream(ws);
new ConnectionHandler(sources, stream, this, config); new ConnectionHandler(sources, stream, this, config);
}); });
console.log(this.port);
} }
public get indexUrl(): string { public get indexUrl(): string {

View File

@@ -1,4 +1,5 @@
import { window, ExtensionContext, WebviewPanel, commands } from "vscode"; import { window, ExtensionContext, WebviewPanel, commands } from "vscode";
import { Disposable } from "@hediet/std/disposable";
import { import {
enableHotReload, enableHotReload,
hotRequireExportedFn, hotRequireExportedFn,
@@ -10,20 +11,13 @@ if (process.env.USE_DEV_UI) {
enableHotReload({ entryModule: module, loggingEnabled: true }); enableHotReload({ entryModule: module, loggingEnabled: true });
} }
import { Disposable } from "@hediet/std/disposable";
import { createJsDebuggerSource } from "./DataSource/JsDebuggerSource";
import { WebViews } from "./WebViews"; import { WebViews } from "./WebViews";
import { Server } from "./Server"; import { Server } from "./Server";
import { Config } from "./Config"; import { Config } from "./Config";
import { Sources } from "./DataSource";
registerUpdateReconciler(module); registerUpdateReconciler(module);
export class Sources {
public readonly jsSource = createJsDebuggerSource();
}
export class Extension { export class Extension {
public dispose = Disposable.fn(); public dispose = Disposable.fn();
@@ -39,11 +33,13 @@ export class Extension {
i.show(); i.show();
} }
commands.registerCommand( this.dispose.track(
"vscode-debug-visualizer.new-visualizer", commands.registerCommand(
() => { "vscode-debug-visualizer.new-visualizer",
this.views.createNew(); () => {
} this.views.createNew();
}
)
); );
} }
} }

View File

@@ -62,7 +62,7 @@ export class Model {
return this._loading; return this._loading;
} }
private readonly bridge = new MonacoBridge(this); private readonly _bridge = new MonacoBridge(this);
constructor() { constructor() {
if (window.serverPort) { if (window.serverPort) {

View File

@@ -1,13 +1,14 @@
import * as monaco from "monaco-editor"; import * as monaco from "monaco-editor";
import { Model } from "./Model"; import { Model } from "./Model";
import { Disposable } from "@hediet/std/disposable";
export class MonacoBridge { export class MonacoBridge {
public readonly dispose = Disposable.fn();
constructor(private readonly model: Model) { constructor(private readonly model: Model) {
monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({ monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
noSemanticValidation: false, noSemanticValidation: false,
noSyntaxValidation: false, noSyntaxValidation: false,
}); });
monaco.languages.typescript.javascriptDefaults.setCompilerOptions({ monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
target: monaco.languages.typescript.ScriptTarget.ES5, target: monaco.languages.typescript.ScriptTarget.ES5,
allowNonTsExtensions: true, allowNonTsExtensions: true,
@@ -17,88 +18,95 @@ export class MonacoBridge {
strict: true, strict: true,
}); });
const text = require("!!raw-loader!./lib.es5.d.ts.txt") const es5Lib = require("!!raw-loader!./lib.es5.d.ts.txt")
.default as string; .default as string;
monaco.languages.typescript.javascriptDefaults.addExtraLib(text);
const commonTypes = require("!!raw-loader!@hediet/debug-visualizer-data-extraction/src/CommonDataTypes.ts") const commonTypes = require("!!raw-loader!@hediet/debug-visualizer-data-extraction/src/CommonDataTypes.ts")
.default as string; .default as string;
monaco.languages.typescript.javascriptDefaults.addExtraLib( this.dispose.track([
commonTypes, monaco.languages.typescript.javascriptDefaults.addExtraLib(es5Lib),
`file:///node_modules/CommonDataTypes/index.ts` monaco.languages.typescript.javascriptDefaults.addExtraLib(
commonTypes,
`file:///node_modules/CommonDataTypes/index.ts`
),
monaco.languages.typescript.javascriptDefaults.addExtraLib(
`declare function $asData(data: import("CommonDataTypes").CommonDataType): import("CommonDataTypes").CommonDataType;`,
`file:///types.d.ts`
),
]);
this.dispose.track(
monaco.languages.registerCompletionItemProvider(
"javascript",
new DebugSessionCompletionProvider(this.model)
)
); );
monaco.languages.typescript.javascriptDefaults.addExtraLib( }
`declare function $asData(data: import("CommonDataTypes").CommonDataType): import("CommonDataTypes").CommonDataType;`, }
`file:///types.d.ts`
); class DebugSessionCompletionProvider
implements monaco.languages.CompletionItemProvider {
monaco.languages.registerCompletionItemProvider("javascript", { public readonly triggerCharacters = ["."];
triggerCharacters: ["."],
provideCompletionItems: async ( private readonly map = {
textModel, method: monaco.languages.CompletionItemKind.Method,
position function: monaco.languages.CompletionItemKind.Function,
): Promise<monaco.languages.CompletionList> => { constructor: monaco.languages.CompletionItemKind.Constructor,
const expression = textModel.getValue(); field: monaco.languages.CompletionItemKind.Field,
variable: monaco.languages.CompletionItemKind.Variable,
if (!this.model.server) { class: monaco.languages.CompletionItemKind.Class,
return { suggestions: [] }; interface: monaco.languages.CompletionItemKind.Interface,
} module: monaco.languages.CompletionItemKind.Module,
const completions = (await this.model.server.getCompletions({ property: monaco.languages.CompletionItemKind.Property,
text: expression, unit: monaco.languages.CompletionItemKind.Unit,
column: position.column, value: monaco.languages.CompletionItemKind.Value,
})).completions; enum: monaco.languages.CompletionItemKind.Enum,
keyword: monaco.languages.CompletionItemKind.Keyword,
const map = { snippet: monaco.languages.CompletionItemKind.Snippet,
method: monaco.languages.CompletionItemKind.Method, text: monaco.languages.CompletionItemKind.Text,
function: monaco.languages.CompletionItemKind.Function, color: monaco.languages.CompletionItemKind.Color,
constructor: file: monaco.languages.CompletionItemKind.File,
monaco.languages.CompletionItemKind.Constructor, reference: monaco.languages.CompletionItemKind.Reference,
field: monaco.languages.CompletionItemKind.Field, customcolor: monaco.languages.CompletionItemKind.Customcolor,
variable: monaco.languages.CompletionItemKind.Variable, };
class: monaco.languages.CompletionItemKind.Class,
interface: monaco.languages.CompletionItemKind.Interface, constructor(private readonly model: Model) {}
module: monaco.languages.CompletionItemKind.Module,
property: monaco.languages.CompletionItemKind.Property, public async provideCompletionItems(
unit: monaco.languages.CompletionItemKind.Unit, model: monaco.editor.ITextModel,
value: monaco.languages.CompletionItemKind.Value, position: monaco.Position,
enum: monaco.languages.CompletionItemKind.Enum, context: monaco.languages.CompletionContext
keyword: monaco.languages.CompletionItemKind.Keyword, ): Promise<monaco.languages.CompletionList> {
snippet: monaco.languages.CompletionItemKind.Snippet, const expression = model.getValue();
text: monaco.languages.CompletionItemKind.Text,
color: monaco.languages.CompletionItemKind.Color, if (!this.model.server) {
file: monaco.languages.CompletionItemKind.File, return { suggestions: [] };
reference: monaco.languages.CompletionItemKind.Reference, }
customcolor: const completions = (await this.model.server.getCompletions({
monaco.languages.CompletionItemKind.Customcolor, text: expression,
}; column: position.column,
})).completions;
const p = textModel.getWordAtPosition(position);
const p = model.getWordAtPosition(position);
return {
suggestions: completions.map< return {
monaco.languages.CompletionItem suggestions: completions.map<monaco.languages.CompletionItem>(c => {
>(c => { const startColumn =
const startColumn = c.start || (p && p.startColumn) || position.column;
c.start || (p && p.startColumn) || position.column;
return {
return { insertText: c.text || c.label,
insertText: c.text || c.label, label: c.label,
label: c.label, kind: this.map[c.type || "text"],
kind: map[c.type || "text"], range: {
range: { startColumn,
startColumn, endColumn: startColumn + (c.length || 0),
endColumn: startColumn + (c.length || 0), startLineNumber: 0,
startLineNumber: 0, endLineNumber: 0,
endLineNumber: 0, },
}, sortText: c.type === "property" ? "zzzzzzz" : c.label,
sortText: };
c.type === "property" ? "zzzzzzz" : c.label, }),
}; };
}),
};
},
});
} }
} }