development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize NoLinkRanges lookup (#153010)

Browse source 
This switches us to use a map to check if a position exists inside the no link ranges
This commit is contained in:
Matt Bierner 2022-06-23 11:38:13 -07:00 committed by GitHub
parent 12de0cb94b
commit 385bf5036b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 71 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
extensions/markdown-language-features/src/languageFeatures/documentLinks.ts
View file

@ -239,13 +239,24 @@ class NoLinkRanges {
const tokens = await tokenizer.tokenize(document);
const multiline = tokens.filter(t => (t.type === 'code_block' || t.type === 'fence' || t.type === 'html_block') && !!t.map).map(t => t.map) as [number, number][];
const inlineRanges = new Map</* line number */ number, vscode.Range[]>();
const text = document.getText();
const inline = [...text.matchAll(inlineCodePattern)].map(match => {
const start = match.index || 0;
return new vscode.Range(document.positionAt(start), document.positionAt(start + match[0].length));
});
for (const match of text.matchAll(inlineCodePattern)) {
const startOffset = match.index ?? 0;
const startPosition = document.positionAt(startOffset);
return new NoLinkRanges(multiline, inline);
const range = new vscode.Range(startPosition, document.positionAt(startOffset + match[0].length));
for (let line = range.start.line; line <= range.end.line; ++line) {
let entry = inlineRanges.get(line);
if (!entry) {
entry = [];
inlineRanges.set(line, entry);
}
entry.push(range);
}
}
return new NoLinkRanges(multiline, inlineRanges);
}
private constructor(
@ -257,12 +268,12 @@ class NoLinkRanges {
/**
* Inline code spans where links should not be detected
*/
public readonly inline: readonly vscode.Range[]
public readonly inline: Map</* line number */ number, readonly vscode.Range[]>
) { }
contains(range: vscode.Range): boolean {
return this.multiline.some(interval => range.start.line >= interval[0] && range.start.line < interval[1]) ||
this.inline.some(inlineRange => inlineRange.contains(range.start));
contains(position: vscode.Position): boolean {
return this.multiline.some(interval => position.line >= interval[0] && position.line < interval[1]) ||
!!this.inline.get(position.line)?.some(inlineRange => inlineRange.contains(position));
}
}
@ -293,7 +304,7 @@ export class MdLinkComputer {
const text = document.getText();
for (const match of text.matchAll(linkPattern)) {
const matchLinkData = extractDocumentLink(document, match[1], match[2], match.index);
if (matchLinkData && !noLinkRanges.contains(matchLinkData.source.hrefRange)) {
if (matchLinkData && !noLinkRanges.contains(matchLinkData.source.hrefRange.start)) {
yield matchLinkData;
// Also check link destination for links
@ -318,7 +329,7 @@ export class MdLinkComputer {
const linkStart = document.positionAt(offset);
const linkEnd = document.positionAt(offset + link.length);
const hrefRange = new vscode.Range(linkStart, linkEnd);
if (noLinkRanges.contains(hrefRange)) {
if (noLinkRanges.contains(hrefRange.start)) {
continue;
}
yield {
@ -362,7 +373,7 @@ export class MdLinkComputer {
}
const hrefRange = new vscode.Range(linkStart, linkEnd);
if (noLinkRanges.contains(hrefRange)) {
if (noLinkRanges.contains(hrefRange.start)) {
continue;
}
@ -407,7 +418,7 @@ export class MdLinkComputer {
text = link;
}
const hrefRange = new vscode.Range(linkStart, linkEnd);
if (noLinkRanges.contains(hrefRange)) {
if (noLinkRanges.contains(hrefRange.start)) {
continue;
}
const target = parseLink(document, text);

78
extensions/markdown-language-features/src/test/documentLinkProvider.test.ts
View file

@ -36,7 +36,7 @@ function assertLinksEqual(actualLinks: readonly vscode.DocumentLink[], expectedR
suite('Markdown: DocumentLinkProvider', () => {
test('Should not return anything for empty document', async () => {
const links = await getLinksForFile('');
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should not return anything for simple document without links', async () => {
@ -44,7 +44,7 @@ suite('Markdown: DocumentLinkProvider', () => {
'# a',
'fdasfdfsafsa',
));
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should detect basic http links', async () => {
@ -156,7 +156,7 @@ suite('Markdown: DocumentLinkProvider', () => {
test('Should not consider link references starting with ^ character valid (#107471)', async () => {
const links = await getLinksForFile('[^reference]: https://example.com');
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should find definitions links with spaces in angle brackets (#136073)', async () => {
@ -176,26 +176,36 @@ suite('Markdown: DocumentLinkProvider', () => {
'[Works]: https://example.com',
));
assert.strictEqual(links.length, 1);
assertLinksEqual(links, [
new vscode.Range(0, 9, 0, 28),
]);
});
test('Should find reference link shorthand (#141285)', async () => {
let links = await getLinksForFile(joinLines(
'[ref]',
'[ref]: https://example.com',
));
assert.strictEqual(links.length, 2);
links = await getLinksForFile(joinLines(
'[Does Not Work]',
'[def]: https://example.com',
));
assert.strictEqual(links.length, 1);
{
const links = await getLinksForFile(joinLines(
'[ref]',
'[ref]: https://example.com',
));
assertLinksEqual(links, [
new vscode.Range(0, 1, 0, 4),
new vscode.Range(1, 7, 1, 26),
]);
}
{
const links = await getLinksForFile(joinLines(
'[Does Not Work]',
'[def]: https://example.com',
));
assertLinksEqual(links, [
new vscode.Range(1, 7, 1, 26),
]);
}
});
test('Should not include reference link shorthand when source does not exist (#141285)', async () => {
const links = await getLinksForFile('[Works]');
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should not include reference links with escaped leading brackets', async () => {
@ -214,7 +224,7 @@ suite('Markdown: DocumentLinkProvider', () => {
'```',
'[b](https://example.com)',
'```'));
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should not consider links in code fenced with tilde', async () => {
@ -222,22 +232,22 @@ suite('Markdown: DocumentLinkProvider', () => {
'~~~',
'[b](https://example.com)',
'~~~'));
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should not consider links in indented code', async () => {
const links = await getLinksForFile(' [b](https://example.com)');
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should not consider links in inline code span', async () => {
const links = await getLinksForFile('`[b](https://example.com)`');
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should not consider links with code span inside', async () => {
const links = await getLinksForFile('[li`nk](https://example.com`)');
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should not consider links in multiline inline code span', async () => {
@ -245,7 +255,7 @@ suite('Markdown: DocumentLinkProvider', () => {
'`` ',
'[b](https://example.com)',
'``'));
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should not consider link references in code fenced with backticks (#146714)', async () => {
@ -253,7 +263,7 @@ suite('Markdown: DocumentLinkProvider', () => {
'```',
'[a] [bb]',
'```'));
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should not consider reference sources in code fenced with backticks (#146714)', async () => {
@ -263,21 +273,25 @@ suite('Markdown: DocumentLinkProvider', () => {
'[b]: <http://example.com>;',
'[c]: (http://example.com);',
'```'));
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should not consider links in multiline inline code span between between text', async () => {
const links = await getLinksForFile(joinLines(
'[b](https://1.com) `[b](https://2.com)',
'` [b](https://3.com)'));
assert.deepStrictEqual(links.map(l => l.target?.authority), ['1.com', '3.com']);
'[b](https://3.com) ` [b](https://4.com)'));
assertLinksEqual(links, [
new vscode.Range(0, 4, 0, 17),
new vscode.Range(1, 25, 1, 38),
]);
});
test('Should not consider links in multiline inline code span with new line after the first backtick', async () => {
const links = await getLinksForFile(joinLines(
'`',
'[b](https://example.com)`'));
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should not miss links in invalid multiline inline code span', async () => {
@ -287,7 +301,9 @@ suite('Markdown: DocumentLinkProvider', () => {
'[b](https://example.com)',
'',
'``'));
assert.strictEqual(links.length, 1);
assertLinksEqual(links, [
new vscode.Range(2, 4, 2, 23)
]);
});
test('Should find autolinks', async () => {
@ -315,7 +331,7 @@ suite('Markdown: DocumentLinkProvider', () => {
`[text]: ./foo.md`,
`-->`,
));
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test.skip('Should not detect links inside inline html comments', async () => {
@ -337,7 +353,7 @@ suite('Markdown: DocumentLinkProvider', () => {
`[text]: ./foo.md`,
`--> text`,
));
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should not mark checkboxes as links', async () => {
@ -415,7 +431,7 @@ suite('Markdown: DocumentLinkProvider', () => {
`[link](<> path>)`,
`[link](> path)`,
));
assert.strictEqual(links.length, 0);
assertLinksEqual(links, []);
});
test('Should find link within angle brackets even with space inside link.', async () => {