Просмотр исходного кода

revert ts lsp to monorepo root

Dax Raad 4 месяцев назад
Родитель
Сommit
501a2539c7
3 измененных файлов с 9 добавлено и 3 удалено
  1. 1 0
      bun.lock
  2. 2 1
      package.json
  3. 6 2
      packages/opencode/src/lsp/server.ts

+ 1 - 0
bun.lock

@@ -8,6 +8,7 @@
         "@aws-sdk/client-s3": "3.933.0",
         "@opencode-ai/script": "workspace:*",
         "@opencode-ai/sdk": "workspace:*",
+        "typescript": "catalog:",
       },
       "devDependencies": {
         "@tsconfig/bun": "catalog:",

+ 2 - 1
package.json

@@ -63,7 +63,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "3.933.0",
     "@opencode-ai/script": "workspace:*",
-    "@opencode-ai/sdk": "workspace:*"
+    "@opencode-ai/sdk": "workspace:*",
+    "typescript": "catalog:"
   },
   "repository": {
     "type": "git",

+ 6 - 2
packages/opencode/src/lsp/server.ts

@@ -82,10 +82,14 @@ export namespace LSPServer {
 
   export const Typescript: Info = {
     id: "typescript",
-    root: NearestRoot(["tsconfig.json", "package.json", "jsconfig.json", ".git"], ["deno.json", "deno.jsonc"]),
+    root: NearestRoot(
+      ["package-lock.json", "bun.lockb", "bun.lock", "pnpm-lock.yaml", "yarn.lock"],
+      ["deno.json", "deno.jsonc"],
+    ),
     extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts"],
     async spawn(root) {
-      const tsserver = await Bun.resolve("typescript/lib/tsserver.js", root).catch(() => {})
+      const tsserver = await Bun.resolve("typescript/lib/tsserver.js", Instance.directory).catch(() => {})
+      log.info("typescript server", { tsserver })
       if (!tsserver) return
       const proc = spawn(BunProc.which(), ["x", "typescript-language-server", "--stdio"], {
         cwd: root,