Skip to content

Fix Link Provider end positions #2710

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

Merged
Tyriar merged 3 commits into from
Feb 13, 2020
Merged

Fix Link Provider end positions #2710

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
901adb3
Fix linkProvider end positions
jmbockhorst Feb 10, 2020
e817a7b
Add Linkifier2 tests
jmbockhorst Feb 13, 2020
7b40aa8
Merge branch 'master' into linkFix
Tyriar Feb 13, 2020
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
2 changes: 1 addition & 1 deletion addons/xterm-addon-web-links/src/WebLinkProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class LinkComputer {
break;
}

let endX = stringIndex + text.length + 1;
let endX = stringIndex + text.length;
let endY = startLineIndex + 1;

while (endX > terminal.cols) {
Expand Down
4 changes: 2 additions & 2 deletions src/browser/Linkifier2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export class Linkifier2 implements ILinkifier2 {
const range = link.range;
const scrollOffset = this._bufferService.buffer.ydisp;

this._onLinkHover.fire(this._createLinkHoverEvent(range.start.x - 1, range.start.y - scrollOffset - 1, range.end.x - 1, range.end.y - scrollOffset - 1, undefined));
this._onLinkHover.fire(this._createLinkHoverEvent(range.start.x - 1, range.start.y - scrollOffset - 1, range.end.x, range.end.y - scrollOffset - 1, undefined));
element.classList.add('xterm-cursor-pointer');

if (link.hover) {
Expand All @@ -196,7 +196,7 @@ export class Linkifier2 implements ILinkifier2 {
const range = link.range;
const scrollOffset = this._bufferService.buffer.ydisp;

this._onLinkLeave.fire(this._createLinkHoverEvent(range.start.x - 1, range.start.y - scrollOffset - 1, range.end.x - 1, range.end.y - scrollOffset - 1, undefined));
this._onLinkLeave.fire(this._createLinkHoverEvent(range.start.x - 1, range.start.y - scrollOffset - 1, range.end.x, range.end.y - scrollOffset - 1, undefined));
element.classList.remove('xterm-cursor-pointer');

if (link.leave) {
Expand Down