Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-17 23:35:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

markdown-language-features: enhance document link handling with improved URI parsing and selection

Browse Source
This commit is contained in:
Takashi Tamura
2026-02-22 19:44:20 +09:00
parent 718b93c010
commit d00bde0b39
1 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
extensions/markdown-language-features/src/util/openDocumentLink.ts
View File

@@ -28,7 +28,20 @@ export class MdLinkOpener {
return;
}
const uri = vscode.Uri.from(resolved.uri);
let uri = vscode.Uri.from(resolved.uri);
let rangeSelection: vscode.Range | undefined;
if (resolved.kind === 'file' && !resolved.position) {
if (uri.fragment) {
rangeSelection = getSelectionFromLocationFragment(uri.fragment);
} else {
const locationFragment = getLocationFragmentFromLinkText(linkText);
if (locationFragment) {
uri = uri.with({ fragment: locationFragment });
rangeSelection = getSelectionFromLocationFragment(locationFragment);
}
}
}
switch (resolved.kind) {
case 'external':
return vscode.commands.executeCommand('vscode.open', uri);
@@ -50,7 +63,9 @@ export class MdLinkOpener {
}
return vscode.commands.executeCommand('vscode.open', uri, {
selection: resolved.position ? new vscode.Range(resolved.position.line, resolved.position.character, resolved.position.line, resolved.position.character) : undefined,
selection: resolved.position
? new vscode.Range(resolved.position.line, resolved.position.character, resolved.position.line, resolved.position.character)
: rangeSelection,
viewColumn: viewColumn ?? getViewColumn(fromResource),
} satisfies vscode.TextDocumentShowOptions);
}
@@ -58,6 +73,47 @@ export class MdLinkOpener {
}
}
function getSelectionFromLocationFragment(fragment: string): vscode.Range | undefined {
const match = /^L?(\d+)(?:,(\d+))?(?:-L?(\d+)(?:,(\d+))?)?$/i.exec(fragment);
if (!match) {
return undefined;
}
const startLineNumber = parseInt(match[1], 10);
if (isNaN(startLineNumber)) {
return undefined;
}
const startColumn = match[2] ? parseInt(match[2], 10) : 1;
const endLineNumber = match[3] ? parseInt(match[3], 10) : undefined;
const endColumn = match[3] ? (match[4] ? parseInt(match[4], 10) : 1) : undefined;
const start = new vscode.Position(startLineNumber - 1, Math.max(0, startColumn - 1));
const end = endLineNumber
? new vscode.Position(endLineNumber - 1, Math.max(0, (endColumn ?? 1) - 1))
: start;
return new vscode.Range(start, end);
}
function getLocationFragmentFromLinkText(linkText: string): string | undefined {
const fragmentStart = linkText.indexOf('#');
if (fragmentStart < 0) {
return undefined;
}
const fragment = decodeURIComponent(linkText.slice(fragmentStart + 1));
if (!fragment) {
return undefined;
}
if (/^L?\d+(?:,\d+)?(?:-L?\d+(?:,\d+)?)?$/i.test(fragment)) {
return fragment;
}
return undefined;
}
function getViewColumn(resource: vscode.Uri): vscode.ViewColumn {
const config = vscode.workspace.getConfiguration('markdown', resource);
const openLinks = config.get<OpenMarkdownLinks>('links.openLocation', OpenMarkdownLinks.currentGroup);