Merge pull request #55 from SSlinky/dev

Bundle Package

Author: SSlinky

.vscode-test.mjs

@@ -2,7 +2,7 @@
 import { defineConfig } from '@vscode/test-cli';
 
 export default defineConfig({
-	files: 'client/out/test/**/*.test.js',
+	files: 'dist/client/out/test/**/*.test.js',
 	mocha: {
 		ui: 'tdd',
 		timeout: 4000

.vscode/launch.json

@@ -14,7 +14,7 @@
 			"outFiles": ["${workspaceRoot}/client/out/**/*.js"],
 			"preLaunchTask": {
 				"type": "npm",
-				"script": "watch"
+				"script": "compile"
 			}
 		},
 		{
@@ -74,9 +74,9 @@
 			"runtimeExecutable": "${execPath}",
 			"args": [
 			  "--extensionDevelopmentPath=${workspaceFolder}",
-			  "--extensionTestsPath=${workspaceFolder}/client/out/test/index"
+			  "--extensionTestsPath=${workspaceFolder}/dist/client/out/test/index"
 			],
-			"outFiles": ["${workspaceFolder}/client/out/test/**/*.test.js"]
+			"outFiles": ["${workspaceFolder}/dist/client/out/test/**/*.test.js"]
 		}
 	],
 	"compounds": [

.vscode/tasks.json

@@ -14,20 +14,42 @@
 			]
 		},
 		{
-			"type": "npm",
-			"script": "watch",
-			"isBackground": true,
+			"label": "watch",
+			"dependsOn": [
+				"npm: watch:tsc",
+				"npm: watch:esbuild"
+			],
+			"presentation": {
+				"reveal": "never"
+			},
 			"group": {
 				"kind": "build",
 				"isDefault": true
-			},
+			}
+		},
+		{
+			"type": "npm",
+			"script": "watch:esbuild",
+			"group": "build",
+			"problemMatcher": "$esbuild-watch",
+			"isBackground": true,
+			"label": "npm: watch:esbuild",
 			"presentation": {
-				"panel": "dedicated",
+				"group": "watch",
 				"reveal": "never"
-			},
-			"problemMatcher": [
-				"$tsc-watch"
-			]
+			}
+		},
+		{
+			"type": "npm",
+			"script": "watch:tsc",
+			"group": "build",
+			"problemMatcher": "$tsc-watch",
+			"isBackground": true,
+			"label": "npm: watch:tsc",
+			"presentation": {
+				"group": "watch",
+				"reveal": "never"
+			}
 		}
 	]
 }

.vscodeignore

@@ -33,21 +33,13 @@ sample*/**
 **/testFixture/**
 
 # Node modules
-node_modules/antlr4ng-cli/**
+node_modules/**
 
 # Client node modules
 client/node_modules/**
-!client/node_modules/vscode-jsonrpc/**
-!client/node_modules/vscode-languageclient/**
-!client/node_modules/vscode-languageserver-protocol/**
-!client/node_modules/vscode-languageserver-types/**
-!client/node_modules/{minimatch,brace-expansion,concat-map,balanced-match}/**
-!client/node_modules/{semver,lru-cache,yallist}/**
 
 # Server node modules
 server/node_modules/**
-!server/node_modules/vscode-jsonrpc/**
-!server/node_modules/vscode-languageserver/**
-!server/node_modules/vscode-languageserver-protocol/**
-!server/node_modules/vscode-languageserver-textdocument/**
-!server/node_modules/vscode-languageserver-types/**
+
+# Extension bundle
+!dist/**

client/out/placeholder.tmp

@@ -16,7 +16,7 @@
 		"vscode-languageclient": "^9.0.1"
 	},
 	"devDependencies": {
-		"@types/vscode": "^1.96.0",
+		"@types/vscode": "^1.99.0",
 		"@vscode/test-electron": "^2.4.1"
 	}
 }

client/package-lock.json

@@ -19,7 +19,7 @@ let client: LanguageClient;
 export function activate(context: ExtensionContext) {
 	// The server is implemented in node
 	const serverModule = context.asAbsolutePath(
-		path.join('server', 'out', 'server.js')
+		path.join('dist', 'server', 'out', 'server.js')
 	);
 	// The debug options for the server
 	// --inspect=6009: runs the server in Node's Inspector mode so VS Code can attach to the server for debugging

client/package.json

@@ -16,13 +16,18 @@ export interface LogMessage {
 
 export class VscodeLogger {
 	private static _outputChannel: vscode.OutputChannel;
-	static get outputChannel(): vscode.OutputChannel {
+	private static get outputChannel(): vscode.OutputChannel {
 		if (!VscodeLogger._outputChannel) {
 			VscodeLogger._outputChannel = vscode.window.createOutputChannel('VBAPro Output');
 			VscodeLogger._outputChannel.show();
 		}
 		return VscodeLogger._outputChannel;
 	}
+	private static get configuredLevel(): LogLevel {
+		const config = vscode.workspace.getConfiguration('vbaLanguageServer');
+		const levelString = config.get<string>('logLevel.outputChannel', 'warning');
+		return LogLevel[levelString as keyof typeof LogLevel];
+	}
 
 	static info = (msg: string, lvl?: number) => this.log(LogLevel.info, msg, lvl)
 	static debug = (msg: string, lvl?: number) => this.log(LogLevel.debug, msg, lvl)
@@ -32,6 +37,8 @@ export class VscodeLogger {
 	}
 
 	private static log(type: LogLevel, msg: string, lvl?: number): void {
+		if (type > this.configuredLevel) return;
+
 		const i = '> '.repeat(lvl ?? 0);
 		const t = `${this.getFormattedTimestamp()}`;
 		VscodeLogger.outputChannel.appendLine(`${t} [${LogLevel[type]}] ${i}${msg}`);

client/src/extension.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import * as assert from 'assert';
 import { getDocUri, activate } from './helper';
 
-suite('Should get text edits', () => {
+suite('Should get folding ranges', () => {
 	test('formatting.class.template', async () => {
 		const subFoo = {start: 23, end: 42};
 		const subBar = {start: 44, end: 58};