Skip to content
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.

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

Support ILink.dispose #3073

Merged
merged 2 commits into from
Sep 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/browser/Linkifier2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ export class Linkifier2 extends Disposable implements ILinkifier2 {

private _askForLink(position: IBufferCellPosition, useLineCache: boolean): void {
if (!this._activeProviderReplies || !useLineCache) {
this._activeProviderReplies?.forEach(reply => {
reply?.forEach(linkWithState => {
if (linkWithState.link.dispose) {
linkWithState.link.dispose();
}
});
});
this._activeProviderReplies = new Map();
this._activeLine = position.y;
}
Expand Down
1 change: 1 addition & 0 deletions src/browser/Types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ interface ILink {
activate(event: MouseEvent, text: string): void;
hover?(event: MouseEvent, text: string): void;
leave?(event: MouseEvent, text: string): void;
dispose?(): void;
}

interface ILinkDecorations {
Expand Down
51 changes: 51 additions & 0 deletions test/api/Terminal.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,57 @@ describe('API Integration Tests', function(): void {
await pollFor(page, `window.calls`, ['provide 1', 'hover 1-3', 'leave 1-3', 'hover 5-7', 'leave 5-7', 'provide 2', 'provide 1', 'hover 9-11']);
await page.evaluate(`window.disposable.dispose()`);
});

it('should dispose links when hovering away', async () => {
await openTerminal(page, { rendererType: 'dom' });
await writeSync(page, 'foo bar baz');
// Wait for renderer to catch up as links are cleared on render
await pollFor(page, `document.querySelector('.xterm-rows').textContent`, 'foo bar baz ');
await page.evaluate(`
window.calls = [];
window.disposable = window.term.registerLinkProvider({
provideLinks: (position, cb) => {
window.calls.push('provide ' + position);
if (position === 1) {
cb([{
range: { start: { x: 1, y: 1 }, end: { x: 3, y: 1 } },
text: '',
activate: () => window.calls.push('activate'),
dispose: () => window.calls.push('dispose 1-3'),
hover: () => window.calls.push('hover 1-3'),
leave: () => window.calls.push('leave 1-3')
}, {
range: { start: { x: 5, y: 1 }, end: { x: 7, y: 1 } },
text: '',
activate: () => window.calls.push('activate'),
dispose: () => window.calls.push('dispose 5-7'),
hover: () => window.calls.push('hover 5-7'),
leave: () => window.calls.push('leave 5-7')
}, {
range: { start: { x: 9, y: 1 }, end: { x: 11, y: 1 } },
text: '',
activate: () => window.calls.push('activate'),
dispose: () => window.calls.push('dispose 9-11'),
hover: () => window.calls.push('hover 9-11'),
leave: () => window.calls.push('leave 9-11')
}]);
}
}
});
`);
const dims = await getDimensions();
await moveMouseCell(page, dims, 2, 1);
await pollFor(page, `window.calls`, ['provide 1', 'hover 1-3']);
await moveMouseCell(page, dims, 6, 1);
await pollFor(page, `window.calls`, ['provide 1', 'hover 1-3', 'leave 1-3', 'hover 5-7']);
await moveMouseCell(page, dims, 6, 2);
await pollFor(page, `window.calls`, ['provide 1', 'hover 1-3', 'leave 1-3', 'hover 5-7', 'leave 5-7', 'dispose 1-3', 'dispose 5-7', 'dispose 9-11', 'provide 2']);
await moveMouseCell(page, dims, 10, 1);
await pollFor(page, `window.calls`, ['provide 1', 'hover 1-3', 'leave 1-3', 'hover 5-7', 'leave 5-7', 'dispose 1-3', 'dispose 5-7', 'dispose 9-11', 'provide 2', 'provide 1', 'hover 9-11']);
await moveMouseCell(page, dims, 10, 2);
await pollFor(page, `window.calls`, ['provide 1', 'hover 1-3', 'leave 1-3', 'hover 5-7', 'leave 5-7', 'dispose 1-3', 'dispose 5-7', 'dispose 9-11', 'provide 2', 'provide 1', 'hover 9-11', 'leave 9-11', 'dispose 1-3', 'dispose 5-7', 'dispose 9-11', 'provide 2']);
await page.evaluate(`window.disposable.dispose()`);
});
});
});

Expand Down
5 changes: 5 additions & 0 deletions typings/xterm.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,11 @@ declare module 'xterm' {
* @param text The text of the link.
*/
leave?(event: MouseEvent, text: string): void;

/**
* Called when the link is released and no longer used by xterm.js.
*/
dispose?(): void;
}

/**
Expand Down