From fe39b1c6ded28cee57ecdadb25691dd0b3bfe4bd Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 14 Jul 2020 14:41:44 -0700 Subject: [PATCH] Revert "Convert TerminalLink.length to endIndex" This reverts commit 48ce8ecce7dddd1f8ee1fcac179982de8afdc974. Fixes #101455 --- src/vs/vscode.proposed.d.ts | 6 +++--- src/vs/workbench/api/common/extHostTerminalService.ts | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 3962df3cdea..fe2a8e2e565 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -1127,14 +1127,14 @@ declare module 'vscode' { export interface TerminalLink { /** - * The 0-based start index of the link on [TerminalLinkContext.line](#TerminalLinkContext.line]. + * The start index of the link on [TerminalLinkContext.line](#TerminalLinkContext.line]. */ startIndex: number; /** - * The 0-based end index of the link on [TerminalLinkContext.line](#TerminalLinkContext.line]. + * The length of the link on [TerminalLinkContext.line](#TerminalLinkContext.line] */ - endIndex: number; + length: number; /** * The tooltip text when you hover over this link. diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts index fa0153a25a6..e01ab6a1513 100644 --- a/src/vs/workbench/api/common/extHostTerminalService.ts +++ b/src/vs/workbench/api/common/extHostTerminalService.ts @@ -626,11 +626,10 @@ export abstract class BaseExtHostTerminalService implements IExtHostTerminalServ for (const provideResult of provideResults) { if (provideResult && provideResult.links.length > 0) { result.push(...provideResult.links.map(providerLink => { - const endIndex = Math.max(providerLink.endIndex, providerLink.startIndex + 1); const link = { id: nextLinkId++, startIndex: providerLink.startIndex, - length: endIndex - providerLink.startIndex, + length: providerLink.length, label: providerLink.tooltip }; cacheLinkMap.set(link.id, {