Skip to content

Fix wrong textDocument/completion references #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 15, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions handler/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,6 @@ func (handler *InoHandler) HandleMessageFromIDE(ctx context.Context, conn *jsonr

case *lsp.CompletionParams:
// method: "textDocument/completion"
inoURI = p.TextDocument.URI
log.Printf("--> completion(%s:%d:%d)\n", p.TextDocument.URI, p.Position.Line, p.Position.Character)

if res, e := handler.ino2cppTextDocumentPositionParams(&p.TextDocumentPositionParams); e == nil {
Expand All @@ -370,6 +369,7 @@ func (handler *InoHandler) HandleMessageFromIDE(ctx context.Context, conn *jsonr
} else {
err = e
}
inoURI = p.TextDocument.URI

case *lsp.CodeActionParams:
// method "textDocument/codeAction"
Expand All @@ -391,7 +391,6 @@ func (handler *InoHandler) HandleMessageFromIDE(ctx context.Context, conn *jsonr

case *lsp.HoverParams:
// method: "textDocument/hover"
inoURI = p.TextDocument.URI
doc := &p.TextDocumentPositionParams
log.Printf("--> hover(%s:%d:%d)\n", doc.TextDocument.URI, doc.Position.Line, doc.Position.Character)

Expand All @@ -401,6 +400,7 @@ func (handler *InoHandler) HandleMessageFromIDE(ctx context.Context, conn *jsonr
} else {
err = e
}
inoURI = p.TextDocument.URI

case *lsp.DocumentSymbolParams:
// method "textDocument/documentSymbol"
Expand Down Expand Up @@ -1259,7 +1259,7 @@ func (handler *InoHandler) transformClangdResult(method string, inoURI, cppURI l
}
}
r.Items = newItems
log.Printf("<-- completion(%d items)", len(r.Items))
log.Printf("<-- completion(%d items) cppToIno=%v", len(r.Items), cppToIno)
return r

case *lsp.DocumentSymbolArrayOrSymbolInformationArray:
Expand Down