Removed file detection from WebLinkProvider
This commit is contained in:
@@ -13,11 +13,7 @@ export default class WebLinkProvider implements ILinkProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
provideLink(position: IBufferCellPosition, callback: (link: ILink | undefined) => void): void {
|
provideLink(position: IBufferCellPosition, callback: (link: ILink | undefined) => void): void {
|
||||||
const link = LinkComputer.computeLink(position, this._terminal.buffer);
|
const link = LinkComputer.computeLink(position, this._terminal.buffer, this._handler);
|
||||||
|
|
||||||
if (link) {
|
|
||||||
link.handle = this._handler;
|
|
||||||
}
|
|
||||||
|
|
||||||
callback(link);
|
callback(link);
|
||||||
}
|
}
|
||||||
@@ -30,9 +26,6 @@ export const enum State {
|
|||||||
HT = 3,
|
HT = 3,
|
||||||
HTT = 4,
|
HTT = 4,
|
||||||
HTTP = 5,
|
HTTP = 5,
|
||||||
F = 6,
|
|
||||||
FI = 7,
|
|
||||||
FIL = 8,
|
|
||||||
BEFORE_COLON = 9,
|
BEFORE_COLON = 9,
|
||||||
AFTER_COLON = 10,
|
AFTER_COLON = 10,
|
||||||
ALMOST_THERE = 11,
|
ALMOST_THERE = 11,
|
||||||
@@ -119,8 +112,6 @@ function getStateMachine(): StateMachine {
|
|||||||
stateMachine = new StateMachine([
|
stateMachine = new StateMachine([
|
||||||
[State.START, CharCode.h, State.H],
|
[State.START, CharCode.h, State.H],
|
||||||
[State.START, CharCode.H, State.H],
|
[State.START, CharCode.H, State.H],
|
||||||
[State.START, CharCode.f, State.F],
|
|
||||||
[State.START, CharCode.F, State.F],
|
|
||||||
|
|
||||||
[State.H, CharCode.t, State.HT],
|
[State.H, CharCode.t, State.HT],
|
||||||
[State.H, CharCode.T, State.HT],
|
[State.H, CharCode.T, State.HT],
|
||||||
@@ -135,15 +126,6 @@ function getStateMachine(): StateMachine {
|
|||||||
[State.HTTP, CharCode.S, State.BEFORE_COLON],
|
[State.HTTP, CharCode.S, State.BEFORE_COLON],
|
||||||
[State.HTTP, CharCode.Colon, State.AFTER_COLON],
|
[State.HTTP, CharCode.Colon, State.AFTER_COLON],
|
||||||
|
|
||||||
[State.F, CharCode.i, State.FI],
|
|
||||||
[State.F, CharCode.I, State.FI],
|
|
||||||
|
|
||||||
[State.FI, CharCode.l, State.FIL],
|
|
||||||
[State.FI, CharCode.L, State.FIL],
|
|
||||||
|
|
||||||
[State.FIL, CharCode.e, State.BEFORE_COLON],
|
|
||||||
[State.FIL, CharCode.E, State.BEFORE_COLON],
|
|
||||||
|
|
||||||
[State.BEFORE_COLON, CharCode.Colon, State.AFTER_COLON],
|
[State.BEFORE_COLON, CharCode.Colon, State.AFTER_COLON],
|
||||||
|
|
||||||
[State.AFTER_COLON, CharCode.Slash, State.ALMOST_THERE],
|
[State.AFTER_COLON, CharCode.Slash, State.ALMOST_THERE],
|
||||||
@@ -181,7 +163,7 @@ function getClassifier(): CharacterClassifier<CharacterClass> {
|
|||||||
|
|
||||||
export class LinkComputer {
|
export class LinkComputer {
|
||||||
|
|
||||||
private static _createLink(classifier: CharacterClassifier<CharacterClass>, line: string, lineNumber: number, linkBeginIndex: number, linkEndIndex: number): ILink {
|
private static _createLink(classifier: CharacterClassifier<CharacterClass>, line: string, lineNumber: number, linkBeginIndex: number, linkEndIndex: number, handler: (event: MouseEvent, link: string) => void): ILink {
|
||||||
// Do not allow to end link in certain characters...
|
// Do not allow to end link in certain characters...
|
||||||
let lastIncludedCharIndex = linkEndIndex - 1;
|
let lastIncludedCharIndex = linkEndIndex - 1;
|
||||||
do {
|
do {
|
||||||
@@ -222,13 +204,11 @@ export class LinkComputer {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
url: line.substring(linkBeginIndex, lastIncludedCharIndex + 1),
|
url: line.substring(linkBeginIndex, lastIncludedCharIndex + 1),
|
||||||
showTooltip: (event: MouseEvent, link: string) => console.log('Show toolip for ' + link),
|
handle: handler
|
||||||
hideTooltip: (event: MouseEvent, link: string) => console.log('Hide tooltip for ' + link),
|
|
||||||
handle: (event: MouseEvent, link: string) => { }
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public static computeLink(position: IBufferCellPosition, buffer: IBuffer): ILink | undefined {
|
public static computeLink(position: IBufferCellPosition, buffer: IBuffer, handler: (event: MouseEvent, link: string) => void): ILink | undefined {
|
||||||
const stateMachine: StateMachine = getStateMachine();
|
const stateMachine: StateMachine = getStateMachine();
|
||||||
const classifier = getClassifier();
|
const classifier = getClassifier();
|
||||||
|
|
||||||
@@ -299,7 +279,7 @@ export class LinkComputer {
|
|||||||
|
|
||||||
// Check if character terminates link
|
// Check if character terminates link
|
||||||
if (chClass === CharacterClass.FORCE_TERMINATION) {
|
if (chClass === CharacterClass.FORCE_TERMINATION) {
|
||||||
return LinkComputer._createLink(classifier, line, i, linkBeginIndex, j);
|
return LinkComputer._createLink(classifier, line, i, linkBeginIndex, j, handler);
|
||||||
}
|
}
|
||||||
} else if (state === State.END) {
|
} else if (state === State.END) {
|
||||||
|
|
||||||
@@ -342,7 +322,7 @@ export class LinkComputer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (state === State.ACCEPT) {
|
if (state === State.ACCEPT) {
|
||||||
return LinkComputer._createLink(classifier, line, i, linkBeginIndex, len);
|
return LinkComputer._createLink(classifier, line, i, linkBeginIndex, len, handler);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,10 @@ export class Linkifier2 implements ILinkifier2 {
|
|||||||
// Show the tooltip
|
// Show the tooltip
|
||||||
this._onShowTooltip.fire(this._createLinkHoverEvent(range.start.x - 1, range.start.y - 1, range.end.x - 1, range.end.y - 1, undefined));
|
this._onShowTooltip.fire(this._createLinkHoverEvent(range.start.x - 1, range.start.y - 1, range.end.x - 1, range.end.y - 1, undefined));
|
||||||
this._element!.classList.add('xterm-cursor-pointer');
|
this._element!.classList.add('xterm-cursor-pointer');
|
||||||
cachedLink.link.showTooltip(event, cachedLink.link.url);
|
|
||||||
|
if (cachedLink.link.showTooltip) {
|
||||||
|
cachedLink.link.showTooltip(event, cachedLink.link.url);
|
||||||
|
}
|
||||||
|
|
||||||
this._linkCache[i].mouseOver = true;
|
this._linkCache[i].mouseOver = true;
|
||||||
foundLink = true;
|
foundLink = true;
|
||||||
@@ -66,7 +69,10 @@ export class Linkifier2 implements ILinkifier2 {
|
|||||||
// Hide the tooltip
|
// Hide the tooltip
|
||||||
this._onHideTooltip.fire(this._createLinkHoverEvent(range.start.x - 1, range.start.y - 1, range.end.x - 1, range.end.y - 1, undefined));
|
this._onHideTooltip.fire(this._createLinkHoverEvent(range.start.x - 1, range.start.y - 1, range.end.x - 1, range.end.y - 1, undefined));
|
||||||
this._element!.classList.remove('xterm-cursor-pointer');
|
this._element!.classList.remove('xterm-cursor-pointer');
|
||||||
cachedLink.link.hideTooltip(event, cachedLink.link.url);
|
|
||||||
|
if (cachedLink.link.hideTooltip) {
|
||||||
|
cachedLink.link.hideTooltip(event, cachedLink.link.url);
|
||||||
|
}
|
||||||
|
|
||||||
this._linkCache[i].mouseOver = false;
|
this._linkCache[i].mouseOver = false;
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+2
-2
@@ -160,8 +160,8 @@ interface ILinkProvider {
|
|||||||
interface ILink {
|
interface ILink {
|
||||||
range: IBufferRange;
|
range: IBufferRange;
|
||||||
url: string;
|
url: string;
|
||||||
showTooltip(event: MouseEvent, link: string): void;
|
showTooltip?(event: MouseEvent, link: string): void;
|
||||||
hideTooltip(event: MouseEvent, link: string): void;
|
hideTooltip?(event: MouseEvent, link: string): void;
|
||||||
handle(event: MouseEvent, link: string): void;
|
handle(event: MouseEvent, link: string): void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Vendored
+2
-2
@@ -925,14 +925,14 @@ declare module 'xterm' {
|
|||||||
* @param event
|
* @param event
|
||||||
* @param link
|
* @param link
|
||||||
*/
|
*/
|
||||||
showTooltip(event: MouseEvent, link: string): void;
|
showTooltip?(event: MouseEvent, link: string): void;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The hide tooltip callback
|
* The hide tooltip callback
|
||||||
* @param event
|
* @param event
|
||||||
* @param link
|
* @param link
|
||||||
*/
|
*/
|
||||||
hideTooltip(event: MouseEvent, link: string): void;
|
hideTooltip?(event: MouseEvent, link: string): void;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles when the link is opened
|
* Handles when the link is opened
|
||||||
|
|||||||
Reference in New Issue
Block a user