From af9c7ff2714ae1cb6207a0571830509880ef3d2d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 23 Jan 2026 20:27:59 +0000 Subject: [PATCH 1/2] Initial plan From 306da4d2a7215efd17436d966707a49bec8da50c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 23 Jan 2026 20:31:23 +0000 Subject: [PATCH 2/2] Remove duplicate TokenSpan interface Co-authored-by: Sander-Toonen <5106372+Sander-Toonen@users.noreply.github.com> --- src/language-service/diagnostics.ts | 10 +--------- src/language-service/language-service.ts | 6 +++--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/language-service/diagnostics.ts b/src/language-service/diagnostics.ts index 35ce3f9..4513b62 100644 --- a/src/language-service/diagnostics.ts +++ b/src/language-service/diagnostics.ts @@ -20,6 +20,7 @@ import type { TextDocument } from 'vscode-languageserver-textdocument'; import type { GetDiagnosticsParams, ArityInfo } from './language-service.types'; import { FunctionDetails } from './language-service.models'; import { ParseError } from '../types/errors'; +import type { TokenSpan } from './ls-utils'; /** * Length of the error highlight range when position is known but token length is not. @@ -27,15 +28,6 @@ import { ParseError } from '../types/errors'; */ const ERROR_HIGHLIGHT_LENGTH = 10; -/** - * Represents a token with its position in the source text. - */ -export interface TokenSpan { - token: Token; - start: number; - end: number; -} - /** * State used while counting function arguments. */ diff --git a/src/language-service/language-service.ts b/src/language-service/language-service.ts index 59fb1d7..27d150f 100644 --- a/src/language-service/language-service.ts +++ b/src/language-service/language-service.ts @@ -34,14 +34,14 @@ import { valueTypeName, extractPathPrefix, makeTokenStream, - iterateTokens + iterateTokens, + TokenSpan } from './ls-utils'; import { pathVariableCompletions, tryVariableHoverUsingSpans } from './variable-utils'; import { getDiagnosticsForDocument, createDiagnosticFromParseError, - createDiagnosticFromError, - TokenSpan + createDiagnosticFromError } from './diagnostics'; import { ParseError } from '../types/errors';