mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Move subtree sizes over to TreeAndSubtrees, using the different structure to represent the additional parse work that occurs, as well as making it clear which functions require the extra information. My intent is to make it hard to use this by accident. The subtree size is still tracked during Parse::Tree construction. I think a lot of that can be cleaned up, although we use it during placeholder assignment so it may take some work. I wanted to see what people thought about this before taking action on such a change. I'm using a 1m line source file generated by #4124 for testing. Command is `time bazel-bin/toolchain/install/prefix_root/bin/carbon compile --phase=check --dump-mem-usage ~/tmp/data.carbon` At head, what I'm seeing is: ``` ... parse_tree_.node_impls_: used_bytes: 61516116 reserved_bytes: 61516116 ... Total: used_bytes: 447814230 reserved_bytes: 551663894 ... 1.43s user 0.14s system 99% cpu 1.565 total ``` With `Tree::Verify` disabled completely, it looks like: ``` parse_tree_.node_impls_: used_bytes: 41010744 reserved_bytes: 41010744 ... Total: used_bytes: 427308858 reserved_bytes: 531158522 ... 1.20s user 0.13s system 99% cpu 1.332 total ``` Re-enabling just the basic verification (what is now `Tree::Verify`), I'm seeing maybe 0.05s slower, but that's within noise for my system. I do see variability in my timing results, and overall I think this is a 0.2s +/- 0.1s improvement versus the earlier (always testing `Extract` code) implementation. That's opt; debug builds will be unaffected, because the same checking occurs as before. Note, the subtree size is a third of the node representation, which is why I'm showing the decrease in memory usage here.
167 lines
6.1 KiB
C++
167 lines
6.1 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "language_server/language_server.h"
|
|
|
|
#include "clang-tools-extra/clangd/Protocol.h"
|
|
#include "toolchain/base/value_store.h"
|
|
#include "toolchain/diagnostics/null_diagnostics.h"
|
|
#include "toolchain/lex/lex.h"
|
|
#include "toolchain/parse/node_kind.h"
|
|
#include "toolchain/parse/parse.h"
|
|
#include "toolchain/parse/tree_and_subtrees.h"
|
|
#include "toolchain/source/source_buffer.h"
|
|
|
|
namespace Carbon::LS {
|
|
|
|
void LanguageServer::OnDidOpenTextDocument(
|
|
clang::clangd::DidOpenTextDocumentParams const& params) {
|
|
files_.emplace(params.textDocument.uri.file(), params.textDocument.text);
|
|
}
|
|
|
|
void LanguageServer::OnDidChangeTextDocument(
|
|
clang::clangd::DidChangeTextDocumentParams const& params) {
|
|
// full text is sent if full sync is specified in capabilities.
|
|
assert(params.contentChanges.size() == 1);
|
|
std::string file = params.textDocument.uri.file().str();
|
|
files_[file] = params.contentChanges[0].text;
|
|
}
|
|
|
|
void LanguageServer::OnInitialize(
|
|
clang::clangd::NoParams const& /*client_capabilities*/,
|
|
clang::clangd::Callback<llvm::json::Object> cb) {
|
|
llvm::json::Object capabilities{{"documentSymbolProvider", true},
|
|
{"textDocumentSync", /*Full=*/1}};
|
|
|
|
llvm::json::Object reply{{"capabilities", std::move(capabilities)}};
|
|
cb(reply);
|
|
}
|
|
|
|
auto LanguageServer::onNotify(llvm::StringRef method, llvm::json::Value value)
|
|
-> bool {
|
|
if (method == "exit") {
|
|
return false;
|
|
}
|
|
if (auto handler = handlers_.NotificationHandlers.find(method);
|
|
handler != handlers_.NotificationHandlers.end()) {
|
|
handler->second(std::move(value));
|
|
} else {
|
|
clang::clangd::log("unhandled notification {0}", method);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
auto LanguageServer::onCall(llvm::StringRef method, llvm::json::Value params,
|
|
llvm::json::Value id) -> bool {
|
|
if (auto handler = handlers_.MethodHandlers.find(method);
|
|
handler != handlers_.MethodHandlers.end()) {
|
|
// TODO: improve this if add threads
|
|
handler->second(std::move(params),
|
|
[&](llvm::Expected<llvm::json::Value> reply) {
|
|
transport_->reply(id, std::move(reply));
|
|
});
|
|
} else {
|
|
transport_->reply(
|
|
id, llvm::make_error<clang::clangd::LSPError>(
|
|
"method not found", clang::clangd::ErrorCode::MethodNotFound));
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
auto LanguageServer::onReply(llvm::json::Value /*id*/,
|
|
llvm::Expected<llvm::json::Value> /*result*/)
|
|
-> bool {
|
|
return true;
|
|
}
|
|
|
|
// Returns the text of first child of kind Parse::NodeKind::IdentifierName.
|
|
static auto GetIdentifierName(const SharedValueStores& value_stores,
|
|
const Lex::TokenizedBuffer& tokens,
|
|
const Parse::TreeAndSubtrees& p,
|
|
Parse::NodeId node)
|
|
-> std::optional<llvm::StringRef> {
|
|
for (auto ch : p.children(node)) {
|
|
if (p.tree().node_kind(ch) == Parse::NodeKind::IdentifierName) {
|
|
auto token = p.tree().node_token(ch);
|
|
if (tokens.GetKind(token) == Lex::TokenKind::Identifier) {
|
|
return value_stores.identifiers().Get(tokens.GetIdentifier(token));
|
|
}
|
|
}
|
|
}
|
|
return std::nullopt;
|
|
}
|
|
|
|
void LanguageServer::OnDocumentSymbol(
|
|
clang::clangd::DocumentSymbolParams const& params,
|
|
clang::clangd::Callback<std::vector<clang::clangd::DocumentSymbol>> cb) {
|
|
SharedValueStores value_stores;
|
|
llvm::vfs::InMemoryFileSystem vfs;
|
|
auto file = params.textDocument.uri.file().str();
|
|
vfs.addFile(file, /*mtime=*/0,
|
|
llvm::MemoryBuffer::getMemBufferCopy(files_.at(file)));
|
|
|
|
auto buf = SourceBuffer::MakeFromFile(vfs, file, NullDiagnosticConsumer());
|
|
auto lexed = Lex::Lex(value_stores, *buf, NullDiagnosticConsumer());
|
|
auto parsed = Parse::Parse(lexed, NullDiagnosticConsumer(), nullptr);
|
|
Parse::TreeAndSubtrees tree_and_subtrees(lexed, parsed);
|
|
std::vector<clang::clangd::DocumentSymbol> result;
|
|
for (const auto& node : parsed.postorder()) {
|
|
clang::clangd::SymbolKind symbol_kind;
|
|
switch (parsed.node_kind(node)) {
|
|
case Parse::NodeKind::FunctionDecl:
|
|
case Parse::NodeKind::FunctionDefinitionStart:
|
|
symbol_kind = clang::clangd::SymbolKind::Function;
|
|
break;
|
|
case Parse::NodeKind::Namespace:
|
|
symbol_kind = clang::clangd::SymbolKind::Namespace;
|
|
break;
|
|
case Parse::NodeKind::InterfaceDefinitionStart:
|
|
case Parse::NodeKind::NamedConstraintDefinitionStart:
|
|
symbol_kind = clang::clangd::SymbolKind::Interface;
|
|
break;
|
|
case Parse::NodeKind::ClassDefinitionStart:
|
|
symbol_kind = clang::clangd::SymbolKind::Class;
|
|
break;
|
|
default:
|
|
continue;
|
|
}
|
|
|
|
if (auto name =
|
|
GetIdentifierName(value_stores, lexed, tree_and_subtrees, node)) {
|
|
auto tok = parsed.node_token(node);
|
|
clang::clangd::Position pos{lexed.GetLineNumber(tok) - 1,
|
|
lexed.GetColumnNumber(tok) - 1};
|
|
|
|
clang::clangd::DocumentSymbol symbol{
|
|
.name = std::string(*name),
|
|
.kind = symbol_kind,
|
|
.range = {.start = pos, .end = pos},
|
|
.selectionRange = {.start = pos, .end = pos},
|
|
};
|
|
|
|
result.push_back(symbol);
|
|
}
|
|
}
|
|
cb(result);
|
|
}
|
|
|
|
void LanguageServer::Start() {
|
|
auto transport =
|
|
clang::clangd::newJSONTransport(stdin, llvm::outs(), nullptr, true);
|
|
LanguageServer ls(std::move(transport));
|
|
clang::clangd::LSPBinder binder(ls.handlers_, ls);
|
|
binder.notification("textDocument/didOpen", &ls,
|
|
&LanguageServer::OnDidOpenTextDocument);
|
|
binder.notification("textDocument/didChange", &ls,
|
|
&LanguageServer::OnDidChangeTextDocument);
|
|
binder.method("initialize", &ls, &LanguageServer::OnInitialize);
|
|
binder.method("textDocument/documentSymbol", &ls,
|
|
&LanguageServer::OnDocumentSymbol);
|
|
auto error = ls.transport_->loop(ls);
|
|
llvm::errs() << "Error: " << error << "\n";
|
|
}
|
|
} // namespace Carbon::LS
|