diff --git a/src/browser/Linkifier2.test.ts b/src/browser/Linkifier2.test.ts index 36a6da43..fb71b6aa 100644 --- a/src/browser/Linkifier2.test.ts +++ b/src/browser/Linkifier2.test.ts @@ -10,6 +10,14 @@ import { MockBufferService } from 'common/TestUtils.test'; import { ILink } from 'browser/Types'; class TestLinkifier2 extends Linkifier2 { + protected _currentLinkState = { + decorations: { + underline: true, + pointerCursor: true + }, + isHovered: true + }; + constructor(bufferService: IBufferService) { super(bufferService); } @@ -47,7 +55,7 @@ describe('Linkifier2', () => { activate: () => { } }; - it('onLinkHover event range is correct', done => { + it('onShowLinkUnderline event range is correct', done => { linkifier.onShowLinkUnderline(e => { assert.equal(link.range.start.x - 1, e.x1); assert.equal(link.range.start.y - 1, e.y1); @@ -60,7 +68,7 @@ describe('Linkifier2', () => { linkifier.linkHover({ classList: { add: () => { } } } as any, link, {} as any); }); - it('onLinkLeave event range is correct', done => { + it('onHideLinkUnderline event range is correct', done => { linkifier.onHideLinkUnderline(e => { assert.equal(link.range.start.x - 1, e.x1); assert.equal(link.range.start.y - 1, e.y1); diff --git a/src/browser/Linkifier2.ts b/src/browser/Linkifier2.ts index f3e49500..a21f7621 100644 --- a/src/browser/Linkifier2.ts +++ b/src/browser/Linkifier2.ts @@ -20,7 +20,7 @@ export class Linkifier2 implements ILinkifier2 { private _renderService: IRenderService | undefined; private _linkProviders: ILinkProvider[] = []; private _currentLink: ILink | undefined; - private _currentLinkState: ILinkState | undefined; + protected _currentLinkState: ILinkState | undefined; private _lastMouseEvent: MouseEvent | undefined; private _linkCacheDisposables: IDisposable[] = []; private _lastBufferCell: IBufferCellPosition | undefined; @@ -200,8 +200,8 @@ export class Linkifier2 implements ILinkifier2 { this._currentLink = link; this._currentLinkState = { decorations: { - underline: link.decorations?.underline || true, - pointerCursor: link.decorations?.pointerCursor || true + underline: link.decorations === undefined ? true : link.decorations.underline, + pointerCursor: link.decorations === undefined ? true : link.decorations.pointerCursor }, isHovered: true };