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

Clean up link data structure

Browse Source
This commit is contained in:
Matt Bierner
2022-03-30 16:27:17 -07:00
parent cfe0b1d480
commit 174924d73c
2 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
extensions/markdown-language-features/src/languageFeatures/documentLinkProvider.ts
View File

@@ -16,31 +16,28 @@ const localize = nls.loadMessageBundle();
export interface ExternalLinkTarget {
readonly kind: 'external';
readonly uri: vscode.Uri;
}
export interface InternalLinkTarget {
readonly kind: 'internal';
readonly fromResource: vscode.Uri;
readonly path: vscode.Uri;
readonly fragment: string;
}
export interface ReferenceLinkTarget {
readonly kind: 'reference';
readonly fromResource: vscode.Uri;
readonly ref: string;
}
export interface DefinitionLinkTarget {
readonly kind: 'definition';
readonly ref: string;
readonly target: ExternalLinkTarget | InternalLinkTarget;
}
readonly fromResource: vscode.Uri;
export interface DefinitionLinkTarget {
readonly kind: 'definition';
readonly ref: string;
readonly target: ExternalLinkTarget | InternalLinkTarget;
@@ -95,7 +92,6 @@ function parseLink(
return {
kind: 'internal',
fromResource: document.uri,
path: resourceUri,
fragment: tempUri.fragment,
};
@@ -108,6 +104,7 @@ function getWorkspaceFolder(document: SkinnyTextDocument) {
export interface LinkData {
readonly target: LinkTarget;
readonly sourceResource: vscode.Uri;
readonly sourceRange: vscode.Range;
}
@@ -127,6 +124,7 @@ function extractDocumentLink(
}
return {
target: linkTarget,
sourceResource: document.uri,
sourceRange: new vscode.Range(linkStart, linkEnd)
};
} catch {
@@ -192,29 +190,29 @@ function isLinkInsideCode(code: CodeInDocument, link: LinkData) {
code.inline.some(position => position.intersection(link.sourceRange));
}
function createDocumentLink(sourceRange: vscode.Range, target: LinkTarget, definitionSet: LinkDefinitionSet): vscode.DocumentLink | undefined {
switch (target.kind) {
function createDocumentLink(link: LinkData, definitionSet: LinkDefinitionSet): vscode.DocumentLink | undefined {
switch (link.target.kind) {
case 'external': {
return new vscode.DocumentLink(sourceRange, target.uri);
return new vscode.DocumentLink(link.sourceRange, link.target.uri);
}
case 'internal': {
const uri = OpenDocumentLinkCommand.createCommandUri(target.fromResource, target.path, target.fragment);
const documentLink = new vscode.DocumentLink(sourceRange, uri);
const uri = OpenDocumentLinkCommand.createCommandUri(link.sourceResource, link.target.path, link.target.fragment);
const documentLink = new vscode.DocumentLink(link.sourceRange, uri);
documentLink.tooltip = localize('documentLink.tooltip', 'Follow link');
return documentLink;
}
case 'reference': {
const def = definitionSet.lookup(target.ref);
const def = definitionSet.lookup(link.target.ref);
if (def) {
return new vscode.DocumentLink(
sourceRange,
link.sourceRange,
vscode.Uri.parse(`command:_markdown.moveCursorToPosition?${encodeURIComponent(JSON.stringify([def.sourceRange.start.line, def.sourceRange.start.character]))}`));
} else {
return undefined;
}
}
case 'definition':
return createDocumentLink(sourceRange, target.target, definitionSet);
return createDocumentLink({ sourceRange: link.sourceRange, sourceResource: link.sourceResource, target: link.target.target }, definitionSet);
}
}
@@ -235,7 +233,7 @@ export class MdLinkProvider implements vscode.DocumentLinkProvider {
const definitionSet = new LinkDefinitionSet(allLinks);
return coalesce(allLinks
.map(data => createDocumentLink(data.sourceRange, data.target, definitionSet)));
.map(data => createDocumentLink(data, definitionSet)));
}
public async getAllLinks(document: SkinnyTextDocument): Promise<LinkData[]> {
@@ -286,9 +284,9 @@ export class MdLinkProvider implements vscode.DocumentLinkProvider {
yield {
sourceRange: new vscode.Range(linkStart, linkEnd),
sourceResource: document.uri,
target: {
kind: 'reference',
fromResource: document.uri,
ref: reference,
}
};
@@ -309,10 +307,10 @@ export class MdLinkProvider implements vscode.DocumentLinkProvider {
const target = parseLink(document, link.substring(1, link.length - 1));
if (target) {
yield {
sourceResource: document.uri,
sourceRange: new vscode.Range(linkStart, linkEnd),
target: {
kind: 'definition',
fromResource: document.uri,
ref: reference,
target
}
@@ -324,10 +322,10 @@ export class MdLinkProvider implements vscode.DocumentLinkProvider {
const target = parseLink(document, link);
if (target) {
yield {
sourceResource: document.uri,
sourceRange: new vscode.Range(linkStart, linkEnd),
target: {
kind: 'definition',
fromResource: document.uri,
ref: reference,
target,
}