noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #114791 from HolonProduction/lsp/reuse-stale-parsers-in-request

Browse Source 
LSP: Reuse stale parsers in request
This commit is contained in:
Rémi Verschelde
2026-01-09 22:57:15 +01:00
parent 2a67a76f92 9d90a6794c
commit dc19eb6ed8
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/gdscript/language_server/gdscript_language_protocol.cpp
View File

@@ -107,6 +107,7 @@ Error GDScriptLanguageProtocol::LSPeer::handle_data() {
// Response
String output = GDScriptLanguageProtocol::get_singleton()->process_message(msg);
clear_stale_parsers();
if (!output.is_empty()) {
res_queue.push_back(output.utf8());
}
@@ -397,13 +398,18 @@ ExtendGDScriptParser *GDScriptLanguageProtocol::LSPeer::parse_script(const Strin
GDScriptLanguageProtocol::get_singleton()->get_workspace()->publish_diagnostics(p_path);
} else {
// Don't keep cached for further requests since we can't invalidate the cache properly.
parse_results.erase(p_path);
stale_parsers[p_path] = parser;
stale_parsers.insert(p_path);
}
return parser;
}
void GDScriptLanguageProtocol::LSPeer::clear_stale_parsers() {
while (!stale_parsers.is_empty()) {
remove_cached_parser(*stale_parsers.begin());
}
}
void GDScriptLanguageProtocol::LSPeer::remove_cached_parser(const String &p_path) {
HashMap<String, ExtendGDScriptParser *>::Iterator cached = parse_results.find(p_path);
if (cached) {
@@ -411,11 +417,7 @@ void GDScriptLanguageProtocol::LSPeer::remove_cached_parser(const String &p_path
parse_results.remove(cached);
}
HashMap<String, ExtendGDScriptParser *>::Iterator stale = stale_parsers.find(p_path);
if (stale) {
memdelete(stale->value);
stale_parsers.remove(stale);
}
stale_parsers.erase(p_path);
}
ExtendGDScriptParser *GDScriptLanguageProtocol::get_parse_result(const String &p_path) {
@@ -531,11 +533,10 @@ void GDScriptLanguageProtocol::resolve_related_symbols(const LSP::TextDocumentPo
GDScriptLanguageProtocol::LSPeer::~LSPeer() {
while (!parse_results.is_empty()) {
remove_cached_parser(parse_results.begin()->key);
}
while (!stale_parsers.is_empty()) {
remove_cached_parser(stale_parsers.begin()->key);
String path = parse_results.begin()->key;
remove_cached_parser(path);
}
stale_parsers.clear();
}
// clang-format off

8
modules/gdscript/language_server/gdscript_language_protocol.h
View File

@@ -78,10 +78,10 @@ private:
~LSPeer();
private:
// We can't cache parsers for scripts not managed by the editor since we have
// no way to invalidate the cache. We still need to keep track of those parsers
// to clean them up properly.
HashMap<String, ExtendGDScriptParser *> stale_parsers;
void clear_stale_parsers();
// Paths of parsers which we can't cache longterm.
// Can be cleared up using `clear_stale_parsers()`.
HashSet<String> stale_parsers;
};
enum LSPErrorCode {