Skip to content

Commit a1bfd83

Browse files
cmagliecmaglie
committed
Fixed Highlight coordinates; continued refactoring jargon (ino/cpp -> ide/clang)
1 parent e01da53 commit a1bfd83

File tree

1 file changed

+84
-85
lines changed

1 file changed

+84
-85
lines changed

‎ls/ls.go‎

Lines changed: 84 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ func (ls *INOLanguageServer) TextDocumentCompletionReqFromIDE(ctx context.Contex
306306
defer ls.readUnlock(logger)
307307

308308
logger.Logf("--> completion(%s)\n", inoParams.TextDocument)
309-
cppTextDocPositionParams, err := ls.ide2clangTextDocumentPositionParams(logger, inoParams.TextDocumentPositionParams)
309+
cppTextDocPositionParams, err := ls.ide2ClangTextDocumentPositionParams(logger, inoParams.TextDocumentPositionParams)
310310
if err != nil {
311311
logger.Logf("Error: %s", err)
312312
return nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
@@ -354,7 +354,7 @@ func (ls *INOLanguageServer) TextDocumentHoverReqFromIDE(ctx context.Context, lo
354354
ls.readLock(logger, true)
355355
defer ls.readUnlock(logger)
356356

357-
clangTextDocPosition, err := ls.ide2clangTextDocumentPositionParams(logger, ideParams.TextDocumentPositionParams)
357+
clangTextDocPosition, err := ls.ide2ClangTextDocumentPositionParams(logger, ideParams.TextDocumentPositionParams)
358358
if err != nil {
359359
logger.Logf("Error: %s", err)
360360
return nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
@@ -404,7 +404,7 @@ func (ls *INOLanguageServer) TextDocumentSignatureHelpReqFromIDE(ctx context.Con
404404
inoTextDocumentPosition := inoParams.TextDocumentPositionParams
405405

406406
logger.Logf("%s", inoTextDocumentPosition)
407-
cppTextDocumentPosition, err := ls.ide2clangTextDocumentPositionParams(logger, inoTextDocumentPosition)
407+
cppTextDocumentPosition, err := ls.ide2ClangTextDocumentPositionParams(logger, inoTextDocumentPosition)
408408
if err != nil {
409409
logger.Logf("Error: %s", err)
410410
return nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
@@ -436,7 +436,7 @@ func (ls *INOLanguageServer) TextDocumentDefinitionReqFromIDE(ctx context.Contex
436436
inoTextDocPosition := p.TextDocumentPositionParams
437437

438438
logger.Logf("%s", inoTextDocPosition)
439-
cppTextDocPosition, err := ls.ide2clangTextDocumentPositionParams(logger, inoTextDocPosition)
439+
cppTextDocPosition, err := ls.ide2ClangTextDocumentPositionParams(logger, inoTextDocPosition)
440440
if err != nil {
441441
logger.Logf("Error: %s", err)
442442
return nil, nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
@@ -481,7 +481,7 @@ func (ls *INOLanguageServer) TextDocumentTypeDefinitionReqFromIDE(ctx context.Co
481481

482482
logger.Logf("%s", inoTextDocumentPosition)
483483
// inoURI := inoTextDocumentPosition.TextDocument.URI
484-
cppTextDocumentPosition, err := ls.ide2clangTextDocumentPositionParams(logger, inoTextDocumentPosition)
484+
cppTextDocumentPosition, err := ls.ide2ClangTextDocumentPositionParams(logger, inoTextDocumentPosition)
485485
if err != nil {
486486
logger.Logf("Error: %s", err)
487487
return nil, nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
@@ -527,7 +527,7 @@ func (ls *INOLanguageServer) TextDocumentImplementationReqFromIDE(ctx context.Co
527527
inoTextDocumentPosition := inoParams.TextDocumentPositionParams
528528
logger.Logf("%s", inoTextDocumentPosition)
529529

530-
cppTextDocumentPosition, err := ls.ide2clangTextDocumentPositionParams(logger, inoTextDocumentPosition)
530+
cppTextDocumentPosition, err := ls.ide2ClangTextDocumentPositionParams(logger, inoTextDocumentPosition)
531531
if err != nil {
532532
logger.Logf("Error: %s", err)
533533
return nil, nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
@@ -564,45 +564,45 @@ func (ls *INOLanguageServer) TextDocumentImplementationReqFromIDE(ctx context.Co
564564
return inoLocations, inoLocationLinks, nil
565565
}
566566

567-
func (ls *INOLanguageServer) TextDocumentDocumentHighlightReqFromIDE(ctx context.Context, logger jsonrpc.FunctionLogger, inoParams *lsp.DocumentHighlightParams) ([]lsp.DocumentHighlight, *jsonrpc.ResponseError) {
567+
func (ls *INOLanguageServer) TextDocumentDocumentHighlightReqFromIDE(ctx context.Context, logger jsonrpc.FunctionLogger, ideParams *lsp.DocumentHighlightParams) ([]lsp.DocumentHighlight, *jsonrpc.ResponseError) {
568568
ls.readLock(logger, true)
569569
defer ls.readUnlock(logger)
570570

571-
inoTextDocumentPosition := inoParams.TextDocumentPositionParams
572-
cppTextDocumentPosition, err := ls.ide2clangTextDocumentPositionParams(logger, inoTextDocumentPosition)
571+
clangTextDocumentPosition, err := ls.ide2ClangTextDocumentPositionParams(logger, ideParams.TextDocumentPositionParams)
573572
if err != nil {
574-
logger.Logf("Error: %s", err)
573+
logger.Logf("ERROR: %s", err)
575574
return nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
576575
}
577-
cppURI := cppTextDocumentPosition.TextDocument.URI
576+
clangURI := clangTextDocumentPosition.TextDocument.URI
578577

579-
cppParams := *inoParams
580-
cppParams.TextDocumentPositionParams = cppTextDocumentPosition
581-
cppHighlights, clangErr, err := ls.Clangd.conn.TextDocumentDocumentHighlight(ctx, &cppParams)
578+
clangParams := *ideParams
579+
clangParams.TextDocumentPositionParams = clangTextDocumentPosition
580+
clangHighlights, clangErr, err := ls.Clangd.conn.TextDocumentDocumentHighlight(ctx, &clangParams)
582581
if err != nil {
583-
logger.Logf("clangd connectiono error: %v", err)
582+
logger.Logf("clangd connectiono ERROR: %v", err)
584583
ls.Close()
585584
return nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
586585
}
587586
if clangErr != nil {
588-
logger.Logf("clangd response error: %v", clangErr.AsError())
587+
logger.Logf("clangd response ERROR: %v", clangErr.AsError())
589588
return nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: clangErr.AsError().Error()}
590589
}
591590

592-
if cppHighlights != nil {
591+
if clangHighlights == nil {
592+
logger.Logf("null response from clangd")
593593
return nil, nil
594594
}
595595

596-
inoHighlights := []lsp.DocumentHighlight{}
597-
for _, cppHighlight := range cppHighlights {
598-
inoHighlight, err := ls.cpp2inoDocumentHighlight(logger, cppHighlight, cppURI)
596+
ideHighlights := []lsp.DocumentHighlight{}
597+
for _, clangHighlight := range clangHighlights {
598+
ideHighlight, err := ls.clang2IdeDocumentHighlight(logger, clangHighlight, clangURI)
599599
if err != nil {
600-
logger.Logf("ERROR converting location %s:%s: %s", cppURI, cppHighlight.Range, err)
600+
logger.Logf("ERROR converting highlight %s:%s: %s", clangURI, clangHighlight.Range, err)
601601
return nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: clangErr.AsError().Error()}
602602
}
603-
inoHighlights = append(inoHighlights, inoHighlight)
603+
ideHighlights = append(ideHighlights, ideHighlight)
604604
}
605-
return inoHighlights, nil
605+
return ideHighlights, nil
606606
}
607607

608608
func (ls *INOLanguageServer) TextDocumentDocumentSymbolReqFromIDE(ctx context.Context, logger jsonrpc.FunctionLogger, inoParams *lsp.DocumentSymbolParams) ([]lsp.DocumentSymbol, []lsp.SymbolInformation, *jsonrpc.ResponseError) {
@@ -613,7 +613,7 @@ func (ls *INOLanguageServer) TextDocumentDocumentSymbolReqFromIDE(ctx context.Co
613613
inoURI := inoTextDocument.URI
614614
logger.Logf("--> %s")
615615

616-
cppTextDocument, err := ls.ino2cppTextDocumentIdentifier(logger, inoTextDocument)
616+
cppTextDocument, err := ls.ide2ClangTextDocumentIdentifier(logger, inoTextDocument)
617617
if err != nil {
618618
logger.Logf("Error: %s", err)
619619
return nil, nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
@@ -655,7 +655,7 @@ func (ls *INOLanguageServer) TextDocumentCodeActionReqFromIDE(ctx context.Contex
655655
logger.Logf("--> codeAction(%s:%s)", inoTextDocument, inoParams.Range.Start)
656656

657657
cppParams := *inoParams
658-
cppTextDocument, err := ls.ino2cppTextDocumentIdentifier(logger, inoTextDocument)
658+
cppTextDocument, err := ls.ide2ClangTextDocumentIdentifier(logger, inoTextDocument)
659659
if err != nil {
660660
logger.Logf("Error: %s", err)
661661
return nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
@@ -710,7 +710,7 @@ func (ls *INOLanguageServer) TextDocumentFormattingReqFromIDE(ctx context.Contex
710710
inoURI := inoTextDocument.URI
711711
logger.Logf("--> formatting(%s)", inoTextDocument)
712712

713-
cppTextDocument, err := ls.ino2cppTextDocumentIdentifier(logger, inoTextDocument)
713+
cppTextDocument, err := ls.ide2ClangTextDocumentIdentifier(logger, inoTextDocument)
714714
if err != nil {
715715
logger.Logf("Error: %s", err)
716716
return nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
@@ -884,7 +884,7 @@ func (ls *INOLanguageServer) TextDocumentDidSaveNotifFromIDE(logger jsonrpc.Func
884884
ls.triggerRebuild()
885885

886886
logger.Logf("didSave(%s) hasText=%v", inoParams.TextDocument, inoParams.Text != "")
887-
if cppTextDocument, err := ls.ino2cppTextDocumentIdentifier(logger, inoParams.TextDocument); err != nil {
887+
if cppTextDocument, err := ls.ide2ClangTextDocumentIdentifier(logger, inoParams.TextDocument); err != nil {
888888
logger.Logf("--E Error: %s", err)
889889
} else if cppTextDocument.URI.AsPath().EquivalentTo(ls.buildSketchCpp) {
890890
logger.Logf(" didSave(%s) equals %s", cppTextDocument, ls.buildSketchCpp)
@@ -1094,14 +1094,14 @@ func (ls *INOLanguageServer) didClose(logger jsonrpc.FunctionLogger, inoDidClose
10941094
}
10951095
}
10961096

1097-
cppIdentifier, err := ls.ino2cppTextDocumentIdentifier(logger, inoIdentifier)
1097+
cppIdentifier, err := ls.ide2ClangTextDocumentIdentifier(logger, inoIdentifier)
10981098
return &lsp.DidCloseTextDocumentParams{
10991099
TextDocument: cppIdentifier,
11001100
}, err
11011101
}
11021102

11031103
func (ls *INOLanguageServer) ino2cppTextDocumentItem(logger jsonrpc.FunctionLogger, inoItem lsp.TextDocumentItem) (cppItem lsp.TextDocumentItem, err error) {
1104-
cppURI, err := ls.ino2cppDocumentURI(logger, inoItem.URI)
1104+
cppURI, err := ls.ide2ClangDocumentURI(logger, inoItem.URI)
11051105
if err != nil {
11061106
return cppItem, err
11071107
}
@@ -1189,50 +1189,50 @@ func (ls *INOLanguageServer) didChange(logger jsonrpc.FunctionLogger, inoDidChan
11891189
}
11901190

11911191
func (ls *INOLanguageServer) ino2cppVersionedTextDocumentIdentifier(logger jsonrpc.FunctionLogger, doc lsp.VersionedTextDocumentIdentifier) (lsp.VersionedTextDocumentIdentifier, error) {
1192-
cppURI, err := ls.ino2cppDocumentURI(logger, doc.URI)
1192+
cppURI, err := ls.ide2ClangDocumentURI(logger, doc.URI)
11931193
res := doc
11941194
res.URI = cppURI
11951195
return res, err
11961196
}
11971197

1198-
func (ls *INOLanguageServer) ino2cppTextDocumentIdentifier(logger jsonrpc.FunctionLogger, doc lsp.TextDocumentIdentifier) (lsp.TextDocumentIdentifier, error) {
1199-
cppURI, err := ls.ino2cppDocumentURI(logger, doc.URI)
1200-
res := doc
1201-
res.URI = cppURI
1202-
return res, err
1198+
func (ls *INOLanguageServer) ide2ClangTextDocumentIdentifier(logger jsonrpc.FunctionLogger, ideTextDocIdentifier lsp.TextDocumentIdentifier) (lsp.TextDocumentIdentifier, error) {
1199+
clangURI, err := ls.ide2ClangDocumentURI(logger, ideTextDocIdentifier.URI)
1200+
return lsp.TextDocumentIdentifier{URI: clangURI}, err
12031201
}
12041202

1205-
func (ls *INOLanguageServer) ino2cppDocumentURI(logger jsonrpc.FunctionLogger, inoURI lsp.DocumentURI) (lsp.DocumentURI, error) {
1203+
func (ls *INOLanguageServer) ide2ClangDocumentURI(logger jsonrpc.FunctionLogger, ideURI lsp.DocumentURI) (lsp.DocumentURI, error) {
12061204
// Sketchbook/Sketch/Sketch.ino -> build-path/sketch/Sketch.ino.cpp
12071205
// Sketchbook/Sketch/AnotherTab.ino -> build-path/sketch/Sketch.ino.cpp (different section from above)
1208-
// Sketchbook/Sketch/AnotherFile.cpp -> build-path/sketch/AnotherFile.cpp (1:1)
1209-
// another/path/source.cpp -> unchanged
1210-
1211-
// Convert sketch path to build path
1212-
inoPath := inoURI.AsPath()
1213-
if inoPath.Ext() == ".ino" {
1214-
return lsp.NewDocumentURIFromPath(ls.buildSketchCpp), nil
1206+
idePath := ideURI.AsPath()
1207+
if idePath.Ext() == ".ino" {
1208+
clangURI := lsp.NewDocumentURIFromPath(ls.buildSketchCpp)
1209+
logger.Logf("URI: %s -> %s", ideURI, clangURI)
1210+
return clangURI, nil
12151211
}
12161212

1217-
inside, err := inoPath.IsInsideDir(ls.sketchRoot)
1213+
// another/path/source.cpp -> another/path/source.cpp (unchanged)
1214+
inside, err := idePath.IsInsideDir(ls.sketchRoot)
12181215
if err != nil {
1219-
logger.Logf(" could not determine if '%s' is inside '%s'", inoPath, ls.sketchRoot)
1220-
return lsp.NilURI, unknownURI(inoURI)
1216+
logger.Logf("ERROR: could not determine if '%s' is inside '%s'", idePath, ls.sketchRoot)
1217+
return lsp.NilURI, unknownURI(ideURI)
12211218
}
12221219
if !inside {
1223-
logger.Logf(" '%s' not inside sketchroot '%s', passing doc identifier to as-is", ls.sketchRoot, inoPath)
1224-
return inoURI, nil
1220+
clangURI := ideURI
1221+
logger.Logf("URI: %s -> %s", ideURI, clangURI)
1222+
return clangURI, nil
12251223
}
12261224

1227-
rel, err := ls.sketchRoot.RelTo(inoPath)
1228-
if err == nil {
1229-
cppPath := ls.buildSketchRoot.JoinPath(rel)
1230-
logger.Logf(" URI: '%s' -> '%s'", inoPath, cppPath)
1231-
return lsp.NewDocumentURIFromPath(cppPath), nil
1225+
// Sketchbook/Sketch/AnotherFile.cpp -> build-path/sketch/AnotherFile.cpp
1226+
rel, err := ls.sketchRoot.RelTo(idePath)
1227+
if err != nil {
1228+
logger.Logf("ERROR: could not determine rel-path of '%s' in '%s': %s", idePath, ls.sketchRoot, err)
1229+
return lsp.NilURI, err
12321230
}
12331231

1234-
logger.Logf(" could not determine rel-path of '%s' in '%s': %s", inoPath, ls.sketchRoot, err)
1235-
return lsp.NilURI, err
1232+
clangPath := ls.buildSketchRoot.JoinPath(rel)
1233+
clangURI := lsp.NewDocumentURIFromPath(clangPath)
1234+
logger.Logf("URI: %s -> %s", ideURI, clangURI)
1235+
return clangURI, nil
12361236
}
12371237

12381238
func (ls *INOLanguageServer) idePathToIdeURI(logger jsonrpc.FunctionLogger, inoPath string) (lsp.DocumentURI, error) {
@@ -1261,18 +1261,18 @@ func (ls *INOLanguageServer) clang2IdeRangeAndDocumentURI(logger jsonrpc.Functio
12611261
if err == nil {
12621262
if ls.sketchMapper.IsPreprocessedCppLine(clangRange.Start.Line) {
12631263
idePath = sourcemapper.NotIno.File
1264-
logger.Logf(" Range is in PREPROCESSED section of the sketch")
1264+
logger.Logf("Range is in PREPROCESSED section of the sketch")
12651265
}
12661266
} else if _, ok := err.(sourcemapper.AdjustedRangeErr); ok {
1267-
logger.Logf(" Range has been END LINE ADJSUTED")
1267+
logger.Logf("Range has been END LINE ADJSUTED")
12681268
err = nil
12691269
} else {
1270-
logger.Logf(" Range conversion ERROR: %s", err)
1270+
logger.Logf("Range conversion ERROR: %s", err)
12711271
ls.sketchMapper.DebugLogAll()
12721272
return lsp.NilURI, lsp.NilRange, err
12731273
}
12741274
ideURI, err := ls.idePathToIdeURI(logger, idePath)
1275-
logger.Logf(" Range: %s:%s -> %s:%s", clangURI, clangRange, ideURI, ideRange)
1275+
logger.Logf("Range: %s:%s -> %s:%s", clangURI, clangRange, ideURI, ideRange)
12761276
return ideURI, ideRange, err
12771277
}
12781278

@@ -1286,7 +1286,7 @@ func (ls *INOLanguageServer) clang2IdeRangeAndDocumentURI(logger jsonrpc.Functio
12861286
}
12871287
if !inside {
12881288
ideURI := clangURI
1289-
logger.Logf(" Range: %s:%s -> %s:%s", clangURI, clangRange, ideURI, ideRange)
1289+
logger.Logf("Range: %s:%s -> %s:%s", clangURI, clangRange, ideURI, ideRange)
12901290
return clangURI, clangRange, nil
12911291
}
12921292

@@ -1298,40 +1298,39 @@ func (ls *INOLanguageServer) clang2IdeRangeAndDocumentURI(logger jsonrpc.Functio
12981298
}
12991299
idePath := ls.sketchRoot.JoinPath(rel).String()
13001300
ideURI, err := ls.idePathToIdeURI(logger, idePath)
1301-
logger.Logf(" Range: %s:%s -> %s:%s", clangURI, clangRange, ideURI, ideRange)
1301+
logger.Logf("Range: %s:%s -> %s:%s", clangURI, clangRange, ideURI, ideRange)
13021302
return ideURI, clangRange, err
13031303
}
13041304

1305-
func (ls *INOLanguageServer) ide2clangTextDocumentPositionParams(logger jsonrpc.FunctionLogger, inoParams lsp.TextDocumentPositionParams) (lsp.TextDocumentPositionParams, error) {
1306-
inoTextDocument := inoParams.TextDocument
1307-
inoPosition := inoParams.Position
1308-
inoURI := inoTextDocument.URI
1309-
prefix := fmt.Sprintf("TextDocumentIdentifier %s", inoParams)
1305+
func (ls *INOLanguageServer) ide2ClangTextDocumentPositionParams(logger jsonrpc.FunctionLogger, ideParams lsp.TextDocumentPositionParams) (lsp.TextDocumentPositionParams, error) {
1306+
ideTextDocument := ideParams.TextDocument
1307+
idePosition := ideParams.Position
1308+
ideURI := ideTextDocument.URI
13101309

1311-
cppTextDocument, err := ls.ino2cppTextDocumentIdentifier(logger, inoTextDocument)
1310+
clangTextDocument, err := ls.ide2ClangTextDocumentIdentifier(logger, ideTextDocument)
13121311
if err != nil {
1313-
logger.Logf("%s -> invalid text document: %s", prefix, err)
1312+
logger.Logf("%s -> invalid text document: %s", ideParams, err)
13141313
return lsp.TextDocumentPositionParams{}, err
13151314
}
1316-
cppPosition := inoPosition
1317-
if inoURI.Ext() == ".ino" {
1318-
if cppLine, ok := ls.sketchMapper.InoToCppLineOk(inoURI, inoPosition.Line); ok {
1319-
cppPosition.Line = cppLine
1315+
clangPosition := idePosition
1316+
if ls.clangURIRefersToIno(clangTextDocument.URI) {
1317+
if cppLine, ok := ls.sketchMapper.InoToCppLineOk(ideURI, idePosition.Line); ok {
1318+
clangPosition.Line = cppLine
13201319
} else {
1321-
logger.Logf("%s -> invalid line requested: %s:%d", prefix, inoURI, inoPosition.Line)
1322-
return lsp.TextDocumentPositionParams{}, unknownURI(inoURI)
1320+
logger.Logf("%s -> invalid line requested: %s:%d", ideParams, ideURI, idePosition.Line)
1321+
return lsp.TextDocumentPositionParams{}, unknownURI(ideURI)
13231322
}
13241323
}
1325-
cppParams := lsp.TextDocumentPositionParams{
1326-
TextDocument: cppTextDocument,
1327-
Position: cppPosition,
1324+
clangParams := lsp.TextDocumentPositionParams{
1325+
TextDocument: clangTextDocument,
1326+
Position: clangPosition,
13281327
}
1329-
logger.Logf("%s -> %s", prefix, cppParams)
1330-
return cppParams, nil
1328+
logger.Logf("%s -> %s", ideParams, clangParams)
1329+
return clangParams, nil
13311330
}
13321331

13331332
func (ls *INOLanguageServer) ino2cppRange(logger jsonrpc.FunctionLogger, inoURI lsp.DocumentURI, inoRange lsp.Range) (lsp.DocumentURI, lsp.Range, error) {
1334-
cppURI, err := ls.ino2cppDocumentURI(logger, inoURI)
1333+
cppURI, err := ls.ide2ClangDocumentURI(logger, inoURI)
13351334
if err != nil {
13361335
return lsp.NilURI, lsp.Range{}, err
13371336
}
@@ -1356,7 +1355,7 @@ func (ls *INOLanguageServer) cpp2inoLocationArray(logger jsonrpc.FunctionLogger,
13561355
}
13571356

13581357
func (ls *INOLanguageServer) ino2cppDocumentRangeFormattingParams(logger jsonrpc.FunctionLogger, inoParams *lsp.DocumentRangeFormattingParams) (*lsp.DocumentRangeFormattingParams, error) {
1359-
cppTextDocument, err := ls.ino2cppTextDocumentIdentifier(logger, inoParams.TextDocument)
1358+
cppTextDocument, err := ls.ide2ClangTextDocumentIdentifier(logger, inoParams.TextDocument)
13601359
if err != nil {
13611360
return nil, err
13621361
}
@@ -1467,14 +1466,14 @@ func (ls *INOLanguageServer) cpp2inoLocation(logger jsonrpc.FunctionLogger, cppL
14671466
}, err
14681467
}
14691468

1470-
func (ls *INOLanguageServer) cpp2inoDocumentHighlight(logger jsonrpc.FunctionLogger, cppHighlight lsp.DocumentHighlight, cppURI lsp.DocumentURI) (lsp.DocumentHighlight, error) {
1471-
_, inoRange, err := ls.clang2IdeRangeAndDocumentURI(logger, cppURI, cppHighlight.Range)
1469+
func (ls *INOLanguageServer) clang2IdeDocumentHighlight(logger jsonrpc.FunctionLogger, clangHighlight lsp.DocumentHighlight, cppURI lsp.DocumentURI) (lsp.DocumentHighlight, error) {
1470+
_, ideRange, err := ls.clang2IdeRangeAndDocumentURI(logger, cppURI, clangHighlight.Range)
14721471
if err != nil {
14731472
return lsp.DocumentHighlight{}, err
14741473
}
14751474
return lsp.DocumentHighlight{
1476-
Kind: cppHighlight.Kind,
1477-
Range: inoRange,
1475+
Kind: clangHighlight.Kind,
1476+
Range: ideRange,
14781477
}, nil
14791478
}
14801479

0 commit comments

Comments
 (0)