@@ -13,7 +13,7 @@ import (
1313 "github.com/microsoft/typescript-go/internal/collections"
1414 "github.com/microsoft/typescript-go/internal/core"
1515 "github.com/microsoft/typescript-go/internal/debug"
16- "github.com/microsoft/typescript-go/internal/ls"
16+ "github.com/microsoft/typescript-go/internal/ls/lsconv "
1717 "github.com/microsoft/typescript-go/internal/lsp/lsproto"
1818 "github.com/microsoft/typescript-go/internal/stringutil"
1919 "github.com/microsoft/typescript-go/internal/testutil/baseline"
@@ -163,7 +163,7 @@ func (f *FourslashTest) getBaselineForGroupedLocationsWithFileContents(groupedRa
163163 return nil
164164 }
165165
166- fileName := ls .FileNameToDocumentURI (path )
166+ fileName := lsconv .FileNameToDocumentURI (path )
167167 ranges := groupedRanges .Get (fileName )
168168 if len (ranges ) == 0 {
169169 return nil
@@ -219,7 +219,7 @@ func (f *FourslashTest) getBaselineContentForFile(
219219 detailPrefixes := map [* baselineDetail ]string {}
220220 detailSuffixes := map [* baselineDetail ]string {}
221221 canDetermineContextIdInline := true
222- uri := ls .FileNameToDocumentURI (fileName )
222+ uri := lsconv .FileNameToDocumentURI (fileName )
223223
224224 if options .marker != nil && options .marker .FileName () == fileName {
225225 details = append (details , & baselineDetail {pos : options .marker .LSPos (), positionMarker : options .markerName })
@@ -258,7 +258,7 @@ func (f *FourslashTest) getBaselineContentForFile(
258258 }
259259
260260 slices .SortStableFunc (details , func (d1 , d2 * baselineDetail ) int {
261- return ls .ComparePositions (d1 .pos , d2 .pos )
261+ return lsproto .ComparePositions (d1 .pos , d2 .pos )
262262 })
263263 // !!! if canDetermineContextIdInline
264264
@@ -362,20 +362,20 @@ type textWithContext struct {
362362 isLibFile bool
363363 fileName string
364364 content string // content of the original file
365- lineStarts * ls .LSPLineMap
366- converters * ls .Converters
365+ lineStarts * lsconv .LSPLineMap
366+ converters * lsconv .Converters
367367
368368 // posLineInfo
369369 posInfo * lsproto.Position
370370 lineInfo int
371371}
372372
373- // implements ls .Script
373+ // implements lsconv .Script
374374func (t * textWithContext ) FileName () string {
375375 return t .fileName
376376}
377377
378- // implements ls .Script
378+ // implements lsconv .Script
379379func (t * textWithContext ) Text () string {
380380 return t .content
381381}
@@ -391,10 +391,10 @@ func newTextWithContext(fileName string, content string) *textWithContext {
391391 pos : lsproto.Position {Line : 0 , Character : 0 },
392392 fileName : fileName ,
393393 content : content ,
394- lineStarts : ls .ComputeLSPLineStarts (content ),
394+ lineStarts : lsconv .ComputeLSPLineStarts (content ),
395395 }
396396
397- t .converters = ls .NewConverters (lsproto .PositionEncodingKindUTF8 , func (_ string ) * ls .LSPLineMap {
397+ t .converters = lsconv .NewConverters (lsproto .PositionEncodingKindUTF8 , func (_ string ) * lsconv .LSPLineMap {
398398 return t .lineStarts
399399 })
400400 t .readableContents .WriteString ("// === " + fileName + " ===" )
0 commit comments