Fix: add language-server-bitbake as a dependence

Decouple client and server
Freed-Wu · Mar 18, 2024 · e26567a · e26567a
1 parent 81416cd
commit e26567a
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 68 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -827,7 +827,8 @@
     "package": "npm run vscode:prepublish && vsce package"
   },
   "dependencies": {
-    "find": "^0.2.7"
+    "find": "^0.2.7",
+    "language-server-bitbake": "^2.2.0"
   },
   "devDependencies": {
     "@types/find": "^0.2.2",

diff --git a/client/src/language/languageClient.ts b/client/src/language/languageClient.ts
@@ -36,7 +36,7 @@ import * as vscode from 'coc.nvim'
 // import { middlewareProvideReferences } from './middlewareReferences'
 
 export async function activateLanguageServer (context: ExtensionContext, bitBakeProjectScanner: BitBakeProjectScanner): Promise<LanguageClient> {
-  const serverModule = context.asAbsolutePath(path.join('server', 'server.js'))
+  const serverModule = path.join(__dirname, 'server.js')
   // The debug options for the server
   // Use --inspect-brk instead of --inspect if you want to debug the server startup code
   const debugOptions = { execArgv: ['--nolazy', '--inspect=localhost:6010'] }

diff --git a/client/src/language/server.ts b/client/src/language/server.ts
@@ -0,0 +1,6 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2023 Savoir-faire Linux. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import 'language-server-bitbake/out/server'