Skip to content

fix(lsp): normalize Windows drive letter case for consistent URIs #10049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yimingll wants to merge 1 commit into
base: dev
Choose a base branch
from
+47 −17
Open

fix(lsp): normalize Windows drive letter case for consistent URIs #10049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 31 additions & 16 deletions packages/opencode/src/lsp/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,22 @@ import { Bus } from "@/bus"
import { Log } from "../util/log"
import { LSPClient } from "./client"
import path from "path"
import { pathToFileURL } from "url"
import { fileURLToPath, pathToFileURL } from "url"
import { LSPServer } from "./server"
import z from "zod"
import { Config } from "../config/config"
import { spawn } from "child_process"
import { Instance } from "../project/instance"
import { Flag } from "@/flag/flag"

function normalizePathForUri(filePath: string): string {
const resolved = path.resolve(filePath)
if (process.platform === "win32" && /^[a-z]:/.test(resolved)) {
return resolved[0].toUpperCase() + resolved.slice(1)
}
return resolved
}

export namespace LSP {
const log = Log.create({ service: "lsp" })

Expand Down Expand Up @@ -301,11 +309,12 @@ export namespace LSP {
}

export async function hover(input: { file: string; line: number; character: number }) {
return run(input.file, (client) => {
const file = normalizePathForUri(input.file)
return run(file, (client) => {
return client.connection
.sendRequest("textDocument/hover", {
textDocument: {
uri: pathToFileURL(input.file).href,
uri: pathToFileURL(file).href,
},
position: {
line: input.line,
Expand Down Expand Up @@ -369,7 +378,7 @@ export namespace LSP {
}

export async function documentSymbol(uri: string) {
const file = new URL(uri).pathname
const file = fileURLToPath(uri)
return run(file, (client) =>
client.connection
.sendRequest("textDocument/documentSymbol", {
Expand All @@ -384,21 +393,23 @@ export namespace LSP {
}

export async function definition(input: { file: string; line: number; character: number }) {
return run(input.file, (client) =>
const file = normalizePathForUri(input.file)
return run(file, (client) =>
client.connection
.sendRequest("textDocument/definition", {
textDocument: { uri: pathToFileURL(input.file).href },
textDocument: { uri: pathToFileURL(file).href },
position: { line: input.line, character: input.character },
})
.catch(() => null),
).then((result) => result.flat().filter(Boolean))
}

export async function references(input: { file: string; line: number; character: number }) {
return run(input.file, (client) =>
const file = normalizePathForUri(input.file)
return run(file, (client) =>
client.connection
.sendRequest("textDocument/references", {
textDocument: { uri: pathToFileURL(input.file).href },
textDocument: { uri: pathToFileURL(file).href },
position: { line: input.line, character: input.character },
context: { includeDeclaration: true },
})
Expand All @@ -407,32 +418,35 @@ export namespace LSP {
}

export async function implementation(input: { file: string; line: number; character: number }) {
return run(input.file, (client) =>
const file = normalizePathForUri(input.file)
return run(file, (client) =>
client.connection
.sendRequest("textDocument/implementation", {
textDocument: { uri: pathToFileURL(input.file).href },
textDocument: { uri: pathToFileURL(file).href },
position: { line: input.line, character: input.character },
})
.catch(() => null),
).then((result) => result.flat().filter(Boolean))
}

export async function prepareCallHierarchy(input: { file: string; line: number; character: number }) {
return run(input.file, (client) =>
const file = normalizePathForUri(input.file)
return run(file, (client) =>
client.connection
.sendRequest("textDocument/prepareCallHierarchy", {
textDocument: { uri: pathToFileURL(input.file).href },
textDocument: { uri: pathToFileURL(file).href },
position: { line: input.line, character: input.character },
})
.catch(() => []),
).then((result) => result.flat().filter(Boolean))
}

export async function incomingCalls(input: { file: string; line: number; character: number }) {
return run(input.file, async (client) => {
const file = normalizePathForUri(input.file)
return run(file, async (client) => {
const items = (await client.connection
.sendRequest("textDocument/prepareCallHierarchy", {
textDocument: { uri: pathToFileURL(input.file).href },
textDocument: { uri: pathToFileURL(file).href },
position: { line: input.line, character: input.character },
})
.catch(() => [])) as any[]
Expand All @@ -442,10 +456,11 @@ export namespace LSP {
}

export async function outgoingCalls(input: { file: string; line: number; character: number }) {
return run(input.file, async (client) => {
const file = normalizePathForUri(input.file)
return run(file, async (client) => {
const items = (await client.connection
.sendRequest("textDocument/prepareCallHierarchy", {
textDocument: { uri: pathToFileURL(input.file).href },
textDocument: { uri: pathToFileURL(file).href },
position: { line: input.line, character: input.character },
})
.catch(() => [])) as any[]
Expand Down
17 changes: 16 additions & 1 deletion packages/opencode/src/tool/lsp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@ import { Instance } from "../project/instance"
import { pathToFileURL } from "url"
import { assertExternalDirectory } from "./external-directory"

/**
* Normalize Windows path to ensure consistent drive letter casing.
* Windows paths are case-insensitive, but pathToFileURL preserves the case,
* which can cause URI mismatches when comparing URIs from different sources.
*/
function normalizePathForUri(filePath: string): string {
const resolved = path.resolve(filePath)
// Uppercase drive letter on Windows for consistent URI generation
if (process.platform === "win32" && /^[a-z]:/.test(resolved)) {
return resolved[0].toUpperCase() + resolved.slice(1)
}
return resolved
}

const operations = [
"goToDefinition",
"findReferences",
Expand All @@ -28,7 +42,8 @@ export const LspTool = Tool.define("lsp", {
character: z.number().int().min(1).describe("The character offset (1-based, as shown in editors)"),
}),
execute: async (args, ctx) => {
const file = path.isAbsolute(args.filePath) ? args.filePath : path.join(Instance.directory, args.filePath)
const rawFile = path.isAbsolute(args.filePath) ? args.filePath : path.join(Instance.directory, args.filePath)
const file = normalizePathForUri(rawFile)
await assertExternalDirectory(ctx, file)

await ctx.ask({
Expand Down