Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-16 14:05:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of bugs related with use-after-free. Try to make some of the text document and syntax highlighter functionality more thread-safe.

Browse Source
This commit is contained in:
Martín Lucas Golini
2025-08-10 01:25:10 -03:00
parent 61c3e72289
commit cec73de2eb
26 changed files with 469 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tools/ecode/plugins/lsp/lspdocumentclient.cpp
View File

@@ -5,6 +5,7 @@
#include <eepp/system/filesystem.hpp>
#include <eepp/system/iostreamstring.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/scopedop.hpp>
#include <eepp/ui/doc/syntaxhighlighter.hpp>
#include <eepp/window/engine.hpp>
@@ -44,7 +45,7 @@ LSPDocumentClient::~LSPDocumentClient() {
if ( nullptr != sceneNode && 0 != mTagSemanticTokens )
sceneNode->removeActionsByTag( mTagSemanticTokens );
mShutdown = true;
while ( mRunningSemanticTokens )
while ( mRunningSemanticTokens || mProcessingSemanticTokensResponse )
Sys::sleep( Milliseconds( 0.1f ) );
}
@@ -174,8 +175,9 @@ void LSPDocumentClient::requestSemanticHighlighting( bool reqFull ) {
Uint64 docModId = mDoc->getModificationId();
mServer->documentSemanticTokensFull(
mDoc->getURI(), delta, reqId, range,
[docClient, uri, server, docModId]( const auto&, LSPSemanticTokensDelta&& deltas ) {
if ( server->hasDocument( uri ) ) {
[docClient, uri, server, docModId, this]( const auto&, LSPSemanticTokensDelta&& deltas ) {
BoolScopedOp op( mProcessingSemanticTokensResponse, true );
if ( server->hasDocumentClient( docClient ) && server->hasDocument( uri ) ) {
docClient->mWaitingSemanticTokensResponse = false;
docClient->processTokens( std::move( deltas ), docModId );
}
@@ -285,7 +287,7 @@ void LSPDocumentClient::processTokens( LSPSemanticTokensDelta&& tokens,
if ( docModificationId != mDoc->getModificationId() )
return requestSemanticHighlightingDelayed();
mRunningSemanticTokens = true;
BoolScopedOp op( mRunningSemanticTokens, true );
if ( !tokens.resultId.empty() )
mSemanticeResultId = tokens.resultId;
@@ -297,6 +299,9 @@ void LSPDocumentClient::processTokens( LSPSemanticTokensDelta&& tokens,
curTokens.begin() + edit.start + edit.deleteCount );
}
curTokens.insert( curTokens.begin() + edit.start, edit.data.begin(), edit.data.end() );
if ( mShutdown )
return;
}
if ( !tokens.data.empty() ) {
@@ -304,8 +309,6 @@ void LSPDocumentClient::processTokens( LSPSemanticTokensDelta&& tokens,
}
highlight();
mRunningSemanticTokens = false;
}
void LSPDocumentClient::highlight() {
@@ -351,7 +354,7 @@ void LSPDocumentClient::highlight() {
} else {
line->tokens.push_back( { SyntaxStyleTypes::Normal, start, len } );
}
line->hash = mDoc->line( currentLine ).getHash();
line->hash = mDoc->getLineHash( currentLine );
line->updateSignature();
auto curSignature = mDoc->getHighlighter()->getTokenizedLineSignature( lastLine );