refactor: Moved formatter to server

feat: vscode settings can notify server
feat server console log now works

Author: ViTeXFTW

.vscode/launch.json

@@ -11,20 +11,8 @@
 			"outFiles": ["${workspaceRoot}/client/out/**/*.js"],
 			"preLaunchTask": {
 				"type": "npm",
-				"script": "watch"
+				"script": "compile"
 			}
-		},
-		{
-			"name": "Language Server E2E Test",
-			"type": "extensionHost",
-			"request": "launch",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"--extensionDevelopmentPath=${workspaceRoot}",
-				"--extensionTestsPath=${workspaceRoot}/client/out/test/index",
-				"${workspaceRoot}/client/testFixture"
-			],
-			"outFiles": ["${workspaceRoot}/client/out/test/**/*.js"]
 		}
 	]
 }

.vscode/settings.json

@@ -3,6 +3,6 @@
 	"typescript.tsc.autoDetect": "off",
 	"typescript.preferences.quoteStyle": "single",
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	}
 }

client/src/extension.ts

@@ -15,9 +15,12 @@ import {
 
 let client: LanguageClient;
 let languageServerRunning = false;
+
 const ZSconfig = vscode.workspace.getConfiguration('ZeroSyntax');
 const EditorConfig = vscode.workspace.getConfiguration('editor')
 
+let forceAddModule = ZSconfig.get<boolean>('forceAddModule', false)
+
 export function activate(context: vscode.ExtensionContext) {
 
 	// const command = "extension.formatDocument";
@@ -26,21 +29,17 @@ export function activate(context: vscode.ExtensionContext) {
 
 	let languageServerRunning = ZSconfig.get<boolean>('serverStartupSetting', false); // Default to 2 if not set
 
-	context.subscriptions.push(vscode.languages.registerDocumentFormattingEditProvider('ini', {
-		provideDocumentFormattingEdits: (document: vscode.TextDocument): vscode.TextEdit[] => {
-			return formatDocument(document);
-		}
-	}));
-
 	context.subscriptions.push(vscode.commands.registerCommand('ZeroSyntax.stopLanguageServer', () => {
 		if(languageServerRunning) {
+			console.log(`Stopping LS...`)
 			client.stop();
 			languageServerRunning = false;
 		}
 	}));
 
 	context.subscriptions.push(vscode.commands.registerCommand('ZeroSyntax.startLanguageServer', () => {
 		if(!languageServerRunning) {
+			console.log(`Starting LS...`)
 			client.start();
 			languageServerRunning = true;
 		}
@@ -59,7 +58,7 @@ export function activate(context: vscode.ExtensionContext) {
 		run: { module: serverModule, transport: TransportKind.ipc },
 		debug: {
 			module: serverModule,
-			transport: TransportKind.ipc,
+			transport: TransportKind.ipc
 		}
 	};
 
@@ -70,16 +69,13 @@ export function activate(context: vscode.ExtensionContext) {
 		synchronize: {
 			// Notify the server about file changes to '.clientrc files contained in the workspace
 			fileEvents: vscode.workspace.createFileSystemWatcher('**/.clientrc')
-		},
-		initializationOptions: {
-			forceAddmodule: ZSconfig.get<boolean>('forceAddModule', false)
 		}
 	};
 
 	// Create the language client and start the client.
 	client = new LanguageClient(
-		'languageServerExample',
-		'Language Server Example',
+		'ZeroSyntax',
+		'Zero Hour Language Server',
 		serverOptions,
 		clientOptions
 	);
@@ -90,64 +86,6 @@ export function activate(context: vscode.ExtensionContext) {
 	}
 }
 
-function formatDocument(document: vscode.TextDocument): vscode.TextEdit[] {
-	const edits: vscode.TextEdit[] = [];
-	let indentlevel = 0;
-
-	const indentSize = EditorConfig.get<number>('tabSize', 2); // Default to 2 if not set
-
-	let ObjectsRegex = ["^\\b([Oo]bject)\\s+[a-zA-Z0-9_]", "^\\b([Oo]bject[Rr]eskin)\\s+[a-zA-Z0-9_]", "^\\b([Aa]dd[Mm]odule)$", "^\\b([Rr]eplace[Mm]odule)", "^\\b([Dd]efault[Cc]ondition[Ss]tate)$", "^\\b([Uu]nit[Ss]pecific[Ss]ounds)$", "^\\b([Pp]rerequisites)$", "^\\b([Aa]rmor[Ss]et)$", "^\\b([Ww]eapon[Ss]et)$", "^\\b([Dd]raw)\\s*=", "^\\b([Cc]ondition[Ss]tate)\\s*=", "^\\b([Tt]ransition[Ss]tate)\\s*=", "^\\b([Bb]ody)\\s*=", "^\\b([Bb]ehavior)\\s*=", "^\\b([Cc]lient[Uu]pdate)\\s*=", "^\\b(Turret)$"];
-	let SimpleClassesRegex = ["^\\b([Mm]apped[Ii]mage)\\s+[a-zA-Z0-9_]", "^\\b([Pp]article[Ss]ystem)\\s+[a-zA-Z0-9_]", "^\\b([Ll]ocomotor)\\s+[a-zA-Z0-9_]", "^\\b([Aa]udio[Ee]vent)\\s+[a-zA-Z0-9_]", "^\\b([Dd]ialog[Ee]vent)\\s+[a-zA-Z0-9_]", "^\\b([Aa]rmor)\\s+[a-zA-Z0-9_]", "^\\b([Cc]ommand[Ss]et)\\s+[a-zA-Z0-9_]", "^\\b([Cc]ommand[Bb]utton)\\s+[a-zA-Z0-9_]", "^\\b([Ww]eapon)\\s+[a-zA-Z0-9_]", "^\\b([Dd]amage[Ff][Xx])\\s+[A-Za-z0-9_]", "^\\b([Uu]pgrade)\\s+[a-zA-Z0-9_]", "^\\b([Pp]layer[Tt]emplate)\\s+[a-zA-Z0-9_]", "^\\b(Rank)\\s+[1-8]$", "^\\b([Ii]n[Gg]ame[Uu][Ii])$", "^\\b(A10StrikeRadiusCursor)$", "^\\b(AmbushRadiusCursor)$", "^\\b(ClusterMinesRadiusCursor)$", "^\\b(AnthraxBombRadiusCursor)$"];
-	let OCLRegex = ["^\\b([Oo]bject[Cc]reation[Ll]ist)\\s+[a-zA-Z0-9_]", "^\\b([Cc]reate[Oo]bject)$", "^\\b([Cc]reate[Dd]ebris)$", "^\\b([Aa]pply[Rr]andom[Ff]orce)$", "^\\b([Dd]eliver[Pp]ayload)$", "^\\b([Dd]elivery[Dd]ecal)$", "^\\b([Ff]ire[ww]eapon)$", "^\\b([Aa]ttack)$"];
-	let FXlistRegex = ["^\\b([Ff][Xx][Ll]ist)\\s+[a-zA-Z0-9_]", "^\\b([Pp]article[Ss]ystem)$", "^\\b([Ss]ound)$", "^\\b([Tt]errain[Ss]corch)$", "^\\b([Tt]racer)$", "^\\b([Ll]ight[Pp]ulse)$", "^\\b([Vv]iew[Ss]hake)$", "^\\b([Ff][Xx][Ll]ist[Aa]t[Bb]one[Pp]os)$"];
-
-	let EndRegex = ["^\\b([Ee]nd)$", "^\\b(END)$"]
-
-	for(let i = 0; i < document.lineCount; i++) {
-		const lineText = document.lineAt(i).text;
-		const trimmedLine = lineText.trim();
-
-		for(let block of EndRegex) {
-			if(checkLineWithRegex(trimmedLine, block)) {	
-				indentlevel = Math.max(0, indentlevel - 1);
-			}
-		}
-
-		const indentedLine = " ".repeat(indentSize * indentlevel) + trimmedLine;
-		const range = new vscode.Range(i, 0, i, lineText.length);
-		edits.push(vscode.TextEdit.replace(range, indentedLine));
-		
-		
-		for(let block of ObjectsRegex) {
-			if(checkLineWithRegex(trimmedLine, block)) {	
-				indentlevel++;
-			}
-		}
-		for(let block of SimpleClassesRegex) {
-			if(checkLineWithRegex(trimmedLine, block)) {	
-				indentlevel++;
-			}
-		}
-		for(let block of FXlistRegex) {
-			if(checkLineWithRegex(trimmedLine, block)) {	
-				indentlevel++;
-			}
-		}
-		for(let block of OCLRegex) {
-			if(checkLineWithRegex(trimmedLine, block)) {	
-				indentlevel++;
-			}
-		}
-	}
-
-	return edits;
-}
-
-function checkLineWithRegex(line: string, regex: string) {
-	let Regex = new RegExp(regex, "g");
-	return Regex.test(line);
-}
-
 vscode.workspace.onDidChangeConfiguration((e) => {
 	if(e.affectsConfiguration('ZeroSyntax.serverStartupSetting')) {
 		languageServerRunning = ZSconfig.get<boolean>('serverStartupSetting', false);

client/testFixture/completion.txt

@@ -76,21 +76,21 @@
 					"default": false,
 					"description": "Controls whether the server is started automatically after the extension is activated."
 				},
-				"languageServerExample.maxNumberOfProblems": {
+				"ZeroSyntax.maxNumberOfProblems": {
 					"scope": "resource",
 					"type": "number",
 					"default": 100,
 					"description": "Controls the maximum number of problems produced by the server."
 				},
-				"languageServerExample.trace.server": {
+				"ZeroSyntax.trace.server": {
 					"scope": "window",
 					"type": "string",
 					"enum": [
 						"off",
 						"messages",
 						"verbose"
 					],
-					"default": "off",
+					"default": "verbose",
 					"description": "Traces the communication between VS Code and the language server."
 				}
 			}
@@ -102,8 +102,8 @@
 		"watch": "tsc -b -w",
 		"lint": "eslint ./client/src ./server/src --ext .ts,.tsx",
 		"postinstall": "cd client && npm install && cd ../server && npm install && cd ..",
-		"test": " tsc -b && npm run antlr4ts",
-		"antlr4ts": "antlr4ts -visitor ./server/src/antlr/MapIni.g4 -o ./server/src/antlr/.antlr"
+		"test": "npm run antlr4ts && tsc -b",
+		"antlr4ts": "antlr4ts -visitor ./server/src/utils/antlr/MapIni.g4 -o ./server/src/utils/antlr/"
 	},
 	"devDependencies": {
 		"@types/mocha": "^9.1.0",