Skip to content
Merged
Show file tree
Hide file tree
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
26 changes: 22 additions & 4 deletions packages/cxx-gen-lsp/src/gen_requests_h.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// SOFTWARE.

import * as path from "node:path";
import { MetaModel, toCppType, Request, Notification, isRequest } from "./MetaModel.js";
import { MetaModel, toCppType, Request, Notification, isRequest, Property, Structure } from "./MetaModel.js";
import { writeFileSync } from "node:fs";
import { copyrightHeader } from "./copyrightHeader.js";

Expand Down Expand Up @@ -96,9 +96,27 @@ export function gen_requests_h({ model, outputDirectory }: { model: MetaModel; o
emit();
emit(` auto id(std::variant<long, std::string> id) -> ${responseTypeName}&;`);
emit();
emit(` [[nodiscard]] auto result() const -> ${resultType};`);
emit();
emit(` auto result(${resultType} result) -> ${responseTypeName}&;`);

const structure: Structure = {
name: responseTypeName,
properties: [{ name: "result", type: request.result, optional: false }],
};

structure.properties.forEach((property) => {
const propertyName = property.name;
const returnType = toCppType(property.type);
emit();
emit(` [[nodiscard ]]auto ${propertyName}() const -> ${returnType};`);
if (property.type.kind === "or") {
emit();
emit(`template <typename T>`);
emit(`[[nodiscard]] auto ${propertyName}() -> T {`);
emit(` auto& value = (*repr_)["${propertyName}"];`);
emit(` return T(value);`);
emit(`}`);
}
});

emit(`};`);
}
});
Expand Down
6 changes: 6 additions & 0 deletions src/lsp/cxx/lsp/cxx_document.cc
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,12 @@ void CxxDocument::cancel() {

auto CxxDocument::fileName() const -> const std::string& { return d->fileName; }

void CxxDocument::requestCodeCompletion(std::uint32_t line,
std::uint32_t column) {
auto& unit = d->unit;
unit.preprocessor()->requestCodeCompletionAt(line, column);
}

void CxxDocument::parse(std::string source) {
d->configure();

Expand Down
2 changes: 2 additions & 0 deletions src/lsp/cxx/lsp/cxx_document.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ class CxxDocument {

[[nodiscard]] auto fileName() const -> const std::string&;

void requestCodeCompletion(std::uint32_t line, std::uint32_t column);

void parse(std::string source);

[[nodiscard]] auto version() const -> long;
Expand Down
36 changes: 36 additions & 0 deletions src/lsp/cxx/lsp/lsp_server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,11 @@ void Server::operator()(InitializeRequest request) {
capabilities.textDocumentSync(TextDocumentSyncKind::kIncremental);
capabilities.documentSymbolProvider(true);

auto completionOptions =
capabilities.completionProvider<CompletionOptions>();

completionOptions.triggerCharacters({":", ".", ">"});

sendToClient(response);
});
}
Expand Down Expand Up @@ -478,6 +483,37 @@ void Server::operator()(DocumentSymbolRequest request) {
});
}

void Server::operator()(CompletionRequest request) {
logTrace(std::format("Did receive CompletionRequest"));

auto textDocument = request.params().textDocument();
auto uri = textDocument.uri();
auto id = request.id();
auto line = request.params().position().line();
auto column = request.params().position().character();

const auto& text = documentContents_.at(uri);
auto value = text.value;

run([=, this, fileName = pathFromUri(uri)] {
withUnsafeJson([&](json storage) {
// the version is not relevant for code completion requests as we don't
// need to store the document in the cache.
auto cxxDocument = std::make_shared<CxxDocument>(cli, std::move(fileName),
/*version=*/0);

// cxx expects 1-based line and column numbers
cxxDocument->requestCodeCompletion(line + 1, column + 1);
cxxDocument->parse(std::move(value));

CompletionResponse response(storage);
response.id(request.id());
auto completionItems = response.result<Vector<CompletionItem>>();
sendToClient(response);
});
});
}

void Server::operator()(CancelNotification notification) {
const auto id = notification.params().id();

Expand Down
1 change: 1 addition & 0 deletions src/lsp/cxx/lsp/lsp_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class Server {
void operator()(DidChangeTextDocumentNotification notification);

void operator()(DocumentSymbolRequest request);
void operator()(CompletionRequest request);

void operator()(SetTraceNotification notification);

Expand Down
Loading