Fix soft-lock on document updates

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
+	"packages/log",
 	"packages/parser",
 	"packages/server",
 	"packages/utils",
@@ -9,6 +10,12 @@ members = [
 
 [workspace.dependencies]
 anyhow = "1.0"
+bevy_app = "0.13.2"
+bevy_core = "0.13.2"
+bevy_derive = "0.13.2"
+bevy_log = "0.13.2"
+bevy_ecs = "0.13.2"
+bevy_utils = "0.13.2"
 bitflags = "2.5"
 gramatika = { version = "0.6.0", features = ["substr-source"] }
 parking_lot = "0.12"

package.json

@@ -44,7 +44,7 @@
 		"@swc/helpers": "~0.5.2",
 		"@types/jest": "29.4.4",
 		"@types/node": "18.16.9",
-		"@types/vscode": "^1.61.0",
+		"@types/vscode": "^1.75.0",
 		"@typescript-eslint/eslint-plugin": "7.3.0",
 		"@typescript-eslint/parser": "7.3.0",
 		"@vscode-devkit/grammar": "0.0.1",

packages/client/src/app/context.ts

@@ -1,4 +1,4 @@
-import { ExtensionContext, OutputChannel, window } from "vscode";
+import { ExtensionContext, LogOutputChannel, window } from "vscode";
 import { LanguageClient } from "vscode-languageclient/node";
 
 // prettier-ignore
@@ -8,12 +8,12 @@ class Context implements ExtensionContext {
 	inner: ExtensionContext;
 	client: LanguageClient;
 
-	private _channel: OutputChannel;
+	private _channel: LogOutputChannel;
 
 	constructor(ctx: ExtensionContext, client: LanguageClient) {
 		this.inner = ctx;
 		this.client = client;
-		this._channel = window.createOutputChannel("WGSL Language Client");
+		this._channel = window.createOutputChannel("WGSL Language Client", { log: true });
 
 		Context.instance = this;
 	}
@@ -39,8 +39,32 @@ class Context implements ExtensionContext {
 
 	get asAbsolutePath() { return this.inner.asAbsolutePath }
 
-	log(message: string): void {
-		this._channel.appendLine(message);
+	append(value: string): void {
+		this._channel.append(value);
+	}
+
+	appendLine(value: string): void {
+		this._channel.appendLine(value);
+	}
+
+	trace(message: string, ...args: any[]): void {
+		this._channel.trace(message, ...args);
+	}
+
+	debug(message: string, ...args: any[]): void {
+		this._channel.debug(message, ...args);
+	}
+
+	info(message: string, ...args: any[]): void {
+		this._channel.info(message, ...args);
+	}
+
+	warn(message: string, ...args: any[]): void {
+		this._channel.warn(message, ...args);
+	}
+
+	error(error: string | Error, ...args: any[]): void {
+		this._channel.error(error, ...args);
 	}
 }
 

packages/client/src/app/main.ts

@@ -10,8 +10,6 @@ import contentProviders, {
 
 // prettier-ignore
 export function activate(context: ExtensionContext) {
-	console.log("WGSL Language Support activated");
-
 	ctx.bootstrap(context, client.create());
 
 	contentProviders.register("wgsl-ast", DebugAstProvider);

packages/log/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "wgsl-lsp-log"
+version = "0.1.0"
+edition = "2021"
+license = "MIT OR Apache-2.0"
+
+[dependencies]
+bevy_app = { workspace = true }
+bevy_ecs = { workspace = true }
+bevy_utils = { workspace = true }
+time = { version = "0.3.36", features = ["formatting", "local-offset", "macros"]}
+tracing-error = "0.2.0"
+tracing-log = "0.2.0"
+tracing-subscriber = { version = "0.3.1", features = [
+  "env-filter",
+  "fmt",
+  "registry",
+  "std",
+  "time",
+]}