Fix: add language-server-bitbake as a dependence

Decouple client and server
yoctoproject · Mar 18, 2024 · b67c76a · b67c76a
1 parent d91361c
commit b67c76a
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 10 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -762,55 +762,46 @@
           "command": "bitbake.devtool-build",
           "group": "0@devtool_build@0",
           "when": "viewItem == devtoolWorskpaceCtx"
-
         },
         {
           "command": "bitbake.devtool-clean",
           "group": "0@devtool_build@1",
           "when": "viewItem == devtoolWorskpaceCtx"
-
         },
         {
           "command": "bitbake.devtool-deploy",
           "group": "0@devtool_build@2",
           "when": "viewItem == devtoolWorskpaceCtx"
-
         },
         {
           "command": "bitbake.devtool-open-workspace",
           "group": "1@devtool_dev@0",
           "when": "viewItem == devtoolWorskpaceCtx"
-
         },
         {
           "command": "bitbake.devtool-ide-sdk",
           "group": "1@devtool_dev@1",
           "when": "viewItem == devtoolWorskpaceCtx"
-
         },
         {
           "command": "bitbake.devtool-sdk-fallback",
           "group": "1@devtool_dev@2",
           "when": "viewItem == devtoolWorskpaceCtx"
-
         },
         {
           "command": "bitbake.terminal-profile",
           "group": "1@devtool_dev@3",
           "when": "viewItem == devtoolWorskpaceCtx"
-
         },
         {
           "command": "bitbake.devtool-update",
           "group": "1@devtool_finalize@0",
           "when": "viewItem == devtoolWorskpaceCtx"
-
         },
         {
           "command": "bitbake.devtool-reset",
           "group": "1@devtool_finalize@1",
           "when": "viewItem == devtoolWorskpaceCtx"
-
         }
       ]
     },
@@ -832,6 +823,7 @@
   },
   "dependencies": {
     "find": "^0.2.7",
+    "language-server-bitbake": "^2.2.0",
     "node-pty": "^1.0.0",
     "vscode-languageclient": "^8.1.0"
   },

diff --git a/client/src/language/languageClient.ts b/client/src/language/languageClient.ts
@@ -36,7 +36,7 @@ import * as vscode from 'vscode'
 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'