refactor(instance): retire WithInstance adapter (#27782)

This commit is contained in:
Shoubhit Dash
2026-05-16 01:30:07 +05:30
committed by GitHub
parent 48122b31cc
commit 65f96a5851
10 changed files with 186 additions and 205 deletions

View File

@@ -1,10 +1,9 @@
import { beforeEach, describe, expect, test } from "bun:test"
import path from "path"
import { pathToFileURL } from "url"
import { tmpdir } from "../fixture/fixture"
import { tmpdir, withTestInstance } from "../fixture/fixture"
import { LSPClient } from "@/lsp/client"
import * as LSPServer from "@/lsp/server"
import { WithInstance } from "../../src/project/with-instance"
import * as Log from "@opencode-ai/core/util/log"
function spawnFakeServer() {
@@ -25,7 +24,7 @@ describe("LSPClient interop", () => {
test("handles workspace/workspaceFolders request", async () => {
const handle = spawnFakeServer() as any
const client = await WithInstance.provide({
const client = await withTestInstance({
directory: process.cwd(),
fn: (ctx) =>
LSPClient.create({
@@ -49,7 +48,7 @@ describe("LSPClient interop", () => {
test("handles client/registerCapability request", async () => {
const handle = spawnFakeServer() as any
const client = await WithInstance.provide({
const client = await withTestInstance({
directory: process.cwd(),
fn: (ctx) =>
LSPClient.create({
@@ -73,7 +72,7 @@ describe("LSPClient interop", () => {
test("handles client/unregisterCapability request", async () => {
const handle = spawnFakeServer() as any
const client = await WithInstance.provide({
const client = await withTestInstance({
directory: process.cwd(),
fn: (ctx) =>
LSPClient.create({
@@ -97,7 +96,7 @@ describe("LSPClient interop", () => {
test("initialize does not overclaim unsupported diagnostics capabilities", async () => {
const handle = spawnFakeServer() as any
const client = await WithInstance.provide({
const client = await withTestInstance({
directory: process.cwd(),
fn: (ctx) =>
LSPClient.create({
@@ -125,7 +124,7 @@ describe("LSPClient interop", () => {
gamma: true,
}
const client = await WithInstance.provide({
const client = await withTestInstance({
directory: process.cwd(),
fn: (ctx) =>
LSPClient.create({
@@ -155,7 +154,7 @@ describe("LSPClient interop", () => {
const file = path.join(tmp.path, "client.ts")
await Bun.write(file, "first\n")
await WithInstance.provide({
await withTestInstance({
directory: tmp.path,
fn: async (ctx) => {
const client = await LSPClient.create({
@@ -199,7 +198,7 @@ describe("LSPClient interop", () => {
const file = path.join(tmp.path, "client.ts")
await Bun.write(file, "const x = 1\n")
await WithInstance.provide({
await withTestInstance({
directory: tmp.path,
fn: async (ctx) => {
const client = await LSPClient.create({
@@ -246,7 +245,7 @@ describe("LSPClient interop", () => {
const file = path.join(tmp.path, "client.ts")
await Bun.write(file, "const x = 1\n")
await WithInstance.provide({
await withTestInstance({
directory: tmp.path,
fn: async (ctx) => {
const client = await LSPClient.create({
@@ -294,7 +293,7 @@ describe("LSPClient interop", () => {
const file = path.join(tmp.path, "client.cs")
await Bun.write(file, "class C {}\n")
await WithInstance.provide({
await withTestInstance({
directory: tmp.path,
fn: async (ctx) => {
const client = await LSPClient.create({
@@ -343,7 +342,7 @@ describe("LSPClient interop", () => {
const file = path.join(tmp.path, "client.cs")
await Bun.write(file, "class C {}\n")
await WithInstance.provide({
await withTestInstance({
directory: tmp.path,
fn: async (ctx) => {
const client = await LSPClient.create({
@@ -397,7 +396,7 @@ describe("LSPClient interop", () => {
await Bun.write(file, "class C {}\n")
await Bun.write(related, "class D {}\n")
await WithInstance.provide({
await withTestInstance({
directory: tmp.path,
fn: async (ctx) => {
const client = await LSPClient.create({
@@ -462,7 +461,7 @@ describe("LSPClient interop", () => {
const file = path.join(tmp.path, "client.cs")
await Bun.write(file, "class C {}\n")
await WithInstance.provide({
await withTestInstance({
directory: tmp.path,
fn: async (ctx) => {
const client = await LSPClient.create({