Adjust Godot version detection regex (#526)

* Adjust Godot version detection regex Signed-off-by: mlsvrts <[email protected]>
godotengine · Nov 12, 2023 · f65033c · f65033c
1 parent a4c1181
commit f65033c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/debugger/godot3/server_controller.ts b/src/debugger/godot3/server_controller.ts
@@ -109,7 +109,7 @@ export class ServerController {
 		try {
 			log.info(`Verifying version of '${godotPath}'`);
 			const output = execSync(`${godotPath} --version`).toString().trim();
-			const pattern = /([34])\.([0-9]+)\.(?:[0-9]+\.)?\w+.\w+.[0-9a-f]{9}/;
+			const pattern = /([34])\.([0-9]+)\.(?:[0-9]+\.)?(?:\w+\.)+[0-9a-f]{9}/;
 			const match = output.match(pattern);
 			if (!match) {
 				const message = `Cannot launch debug session: '${settingName}' of '${godotPath}' is not a valid Godot executable`;

diff --git a/src/debugger/godot4/server_controller.ts b/src/debugger/godot4/server_controller.ts
@@ -110,7 +110,7 @@ export class ServerController {
 		try {
 			log.info(`Verifying version of '${godotPath}'`);
 			const output = execSync(`${godotPath} --version`).toString().trim();
-			const pattern = /([34])\.([0-9]+)\.(?:[0-9]+\.)?\w+.\w+.[0-9a-f]{9}/;
+			const pattern = /([34])\.([0-9]+)\.(?:[0-9]+\.)?(?:\w+\.)+[0-9a-f]{9}/;
 			const match = output.match(pattern);
 			if (!match) {
 				const message = `Cannot launch debug session: '${settingName}' of '${godotPath}' is not a valid Godot executable`;

diff --git a/src/extension.ts b/src/extension.ts
@@ -93,7 +93,7 @@ function open_workspace_with_editor() {
 
 	try {
 		const output = execSync(`${godotPath} --version`).toString().trim();
-		const pattern = /([34])\.([0-9]+)\.(?:[0-9]+\.)?\w+.\w+.[0-9a-f]{9}/;
+		const pattern = /([34])\.([0-9]+)\.(?:[0-9]+\.)?(?:\w+\.)+[0-9a-f]{9}/;
 		const match = output.match(pattern);
 		if (!match) {
 			const message = `Cannot launch Godot editor: '${settingName}' of '${godotPath}' is not a valid Godot executable`;

diff --git a/src/lsp/ClientConnectionManager.ts b/src/lsp/ClientConnectionManager.ts
@@ -110,7 +110,7 @@ export class ClientConnectionManager {
 
 		try {
 			const output = execSync(`${godotPath} --version`).toString().trim();
-			const pattern = /([34])\.([0-9]+)\.(?:[0-9]+\.)?\w+.\w+.[0-9a-f]{9}/;
+			const pattern = /([34])\.([0-9]+)\.(?:[0-9]+\.)?(?:\w+\.)+[0-9a-f]{9}/;
 			const match = output.match(pattern);
 			if (!match) {
 				const message = `Cannot launch headless LSP: '${settingName}' of '${godotPath}' is not a valid Godot executable`;