fix: add arch to the folder name

use process.cwd

Author: aminya

README.md

@@ -85,9 +85,7 @@ Note that you will also need to add various entries to the `providedServices` an
 
 ### Minimal example (General LSP exe)
 
-If the LSP is a general executable (not a JavaScript file), you should use `spawn` inside `startServerProcess`.
-
-`getExePath` is a cross-platform utility function to get the exe path for the given exe name (under the `bin` folder by default).
+If the LSP is a general executable (not a JavaScript file), you should use `spawn` inside `startServerProcess`. `getExePath` is a cross-platform utility function to get the exe path for the given exe name (under the `bin/platform-arch/exeName` by default).
 
 ```javascript
 const {AutoLanguageClient, getExePath} = require('atom-languageclient')

lib/utils.ts

@@ -114,8 +114,8 @@ export function promiseWithTimeout<T>(ms: number, promise: Promise<T>): Promise<
 }
 
 
-/** Finds an exe file in the package assuming it is placed under `rootPath/platform/exe`
- * For example on Windows, if the `exeName` is `serve-d`, it returns the absolute path to `bin/win32/exeName.exe`
+/** Finds an exe file in the package assuming it is placed under `rootPath/platform-arch/exe`
+ * For example on Windows x64, if the `exeName` is `serve-d`, it returns the absolute path to `./bin/win32-x64/exeName.exe`
  * @param exeName name of the exe file
  * @param rootPath the path of the folder of the exe file. Defaults to 'bin'
  * @param exeExtention the extention of the exe file. Defaults to `process.platform === "win32" ? ".exe" : ""`
@@ -125,5 +125,5 @@ export function getExePath(
  rootPath = "bin",
  exeExtention = process.platform === "win32" ? ".exe" : ""
 ): string {
- return resolve(join(rootPath, process.platform, `${exeName}${exeExtention}`));
+ return resolve(join(rootPath, `${process.platform}-${process.arch}`, `${exeName}${exeExtention}`));
 }

test/utils.test.ts

@@ -2,7 +2,7 @@ import * as Utils from '../lib/utils';
 import { createFakeEditor } from './helpers';
 import { expect } from 'chai';
 import { Point } from 'atom';
-import { join, dirname } from 'path'
+import { join } from 'path'
 
 describe('Utils', () => {
   describe('getWordAtPosition', () => {
@@ -35,15 +35,15 @@ describe('Utils', () => {
   describe('getExePath', () => {
     it('returns the exe path under bin folder by default', () => {
       const exePath = Utils.getExePath('serve-d');
-      let expectedExe = join(dirname(dirname(__dirname)), 'bin', process.platform, 'serve-d');
+      let expectedExe = join(process.cwd(), 'bin', `${process.platform}-${process.arch}`, 'serve-d');
       if (process.platform === 'win32') {
         expectedExe = expectedExe + '.exe';
       }
       expect(exePath).eq(expectedExe);
     })
     it('returns the exe path for the given root', () => {
       const exePath = Utils.getExePath('serve-d', __dirname);
-      let expectedExe = join(__dirname, process.platform, 'serve-d');
+      let expectedExe = join(__dirname, `${process.platform}-${process.arch}`, 'serve-d');
       if (process.platform === 'win32') {
         expectedExe = expectedExe + '.exe';
       }