Move goOs & goArch logic into functions

src/languageServerInstaller.ts

@@ -52,8 +52,8 @@ export class LanguageServerInstaller {
 		const destination = `${installDir}/terraform-ls_v${release.version}.zip`;
 		fs.mkdirSync(installDir, { recursive: true }); // create install directory if missing
 
-		let os = this.goOs();
-		let arch = this.goArch();
+		let os = goOs();
+		let arch = goArch();
 		const build = release.getBuild(os, arch);
 		if (!build) {
 			throw new Error(`Install error: no matching terraform-ls binary for ${os}/${arch}`);
@@ -78,34 +78,6 @@ export class LanguageServerInstaller {
 		});
 	}
 
-	goOs(): string {
-		let platform = process.platform.toString();
-		if (platform === 'win32') {
-			return 'windows';
-		}
-		if (platform === 'sunos') {
-			return 'solaris';
-		}
-		return platform;
-	}
-
-	goArch(): string {
-		let arch = process.arch;
-
-		if (arch === 'ia32') {
-			return '386';
-		}
-		if (arch === 'x64') {
-			return 'amd64';
-		}
-		if (arch === 'arm64' && process.platform.toString() === 'darwin') {
-			// On Apple Silicon, install the amd64 version and rely on Rosetta2
-			// until a native build is available.
-			return 'amd64';
-		}
-		return arch;
-	}
-
 	removeOldBinary(directory: string, goOs: string): void {
 		if (goOs === "windows") {
 			fs.unlinkSync(`${directory}/terraform-ls.exe`);
@@ -118,3 +90,31 @@ export class LanguageServerInstaller {
 		return del(`${directory}/terraform-ls*.zip`, { force: true });
 	}
 }
+
+function goOs(): string {
+	let platform = process.platform.toString();
+	if (platform === 'win32') {
+		return 'windows';
+	}
+	if (platform === 'sunos') {
+		return 'solaris';
+	}
+	return platform;
+}
+
+function goArch(): string {
+	let arch = process.arch;
+
+	if (arch === 'ia32') {
+		return '386';
+	}
+	if (arch === 'x64') {
+		return 'amd64';
+	}
+	if (arch === 'arm64' && process.platform.toString() === 'darwin') {
+		// On Apple Silicon, install the amd64 version and rely on Rosetta2
+		// until a native build is available.
+		return 'amd64';
+	}
+	return arch;
+}