Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-09-26 22:00:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Optimize editor initialization and multi-file diff loading

Browse Source 
- Share immutable built-in document commands, editor command tables, default keybindings, and syntax color scheme storage across editor instances. Preserve mutations through copy-on-write storage and explicit command-removal tracking.
  - Use ShortcutMap consistently with unordered lookup while retaining deterministic ordering where serialization or conflict resolution depends on it. Cache ambiguous syntax-extension checks and invalidate the cache when language definitions change.
  - Prepare Git commit-detail diffs and sub-line changes on worker threads with cancellation and stale-request protection. Release raw patch memory before UI construction and add regression coverage for prepared and cancelled diffs.
  - Add Diff Changed support and enable collapsible file headers for Diff HEAD, Diff Staged, and Diff Changes.
  - Update translations, compatibility call sites, tests, and the efsw dependency.
This commit is contained in:
Martín Lucas Golini
2026-08-30 17:35:50 -03:00
parent 3afcb3f2d2
commit 8e5d180a4d
45 changed files with 937 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/tools/ecode/plugins/git/gitplugin.cpp
View File

@@ -212,6 +212,8 @@ GitPlugin::~GitPlugin() {
mLifetime.invalidate();
waitUntilLoaded();
mShuttingDown = true;
mCommitDetails.cancelDiffPreparation();
mDetachedHistory.details.cancelDiffPreparation();
mConflictViewCloseConnection.disconnect();
mConflictView = nullptr;
mConflictSessions.clear();
@@ -2152,10 +2154,13 @@ void GitPlugin::diff( const Git::DiffMode mode, const std::string& repoPath ) {
case Git::DiffStaged:
modeName = "staged";
break;
case Git::DiffChanged:
modeName = "changed";
break;
}
plugin->getPluginContext()->loadDiffFromMemory(
res.result, UIDiffView::isMultiFileDiff( res.result ) ? modeName : "", "",
repoPath );
res.result, UIDiffView::isMultiFileDiff( res.result ) ? modeName : "", "", repoPath,
true );
} );
} );
}
@@ -2992,6 +2997,8 @@ void GitPlugin::CommitDetailsState::openCommitDetails( GitPlugin& plugin, const
if ( commit.hash.empty() && !isWorkingTree )
return;
const std::string selectedRepo = plugin.repoSelected();
cancelDiffPreparation();
diffPreparationCancelled = std::make_shared<std::atomic_bool>( false );
const Uint64 requestGeneration = ++generation;
this->commit = commit;
workingTree = isWorkingTree;
@@ -3163,14 +3170,31 @@ void GitPlugin::CommitDetailsState::loadCommitFiles( GitPlugin& plugin, bool det
const std::string repo = this->repo;
const Git::Commit commit = this->commit;
const bool workingTree = this->workingTree;
const auto diffPreparationCancelled = this->diffPreparationCancelled;
auto git = plugin.mGit;
const auto lifetime = plugin.mLifetime.weakHandle();
plugin.runAsyncTask( [git = std::move( git ), lifetime, generation, repo, commit, detached,
workingTree] {
workingTree, diffPreparationCancelled] {
if ( diffPreparationCancelled &&
diffPreparationCancelled->load( std::memory_order_relaxed ) )
return;
auto result =
workingTree ? git->workingTreeFiles( repo ) : git->commitFiles( commit, repo );
if ( diffPreparationCancelled &&
diffPreparationCancelled->load( std::memory_order_relaxed ) )
return;
std::shared_ptr<UIDiffView::PreparedMultiFileDiff> preparedDiff;
if ( result.success() && !result.patch.empty() ) {
preparedDiff =
UIDiffView::prepareMultiFileDiff( result.patch, diffPreparationCancelled );
if ( diffPreparationCancelled &&
diffPreparationCancelled->load( std::memory_order_relaxed ) )
return;
std::string{}.swap( result.patch );
}
lifetime.run( [generation, repo, commit, detached, workingTree,
result = std::move( result )]( GitPlugin* plugin ) mutable {
result = std::move( result ),
preparedDiff = std::move( preparedDiff )]( GitPlugin* plugin ) mutable {
auto& details = detached ? plugin->mDetachedHistory.details : plugin->mCommitDetails;
if ( plugin->mShuttingDown || generation != details.generation ||
repo != details.repo || repo != plugin->repoSelected() ||
@@ -3230,9 +3254,9 @@ void GitPlugin::CommitDetailsState::loadCommitFiles( GitPlugin& plugin, bool det
details.gitHub->setVisible( !details.url.empty() );
details.diffContainer->closeAllChildren();
details.diff = nullptr;
if ( !result.patch.empty() ) {
details.diff =
UIDiffView::NewMultiFileDiffViewer( result.patch, repo, details.viewMode );
if ( preparedDiff ) {
details.diff = UIDiffView::NewMultiFileDiffViewer( std::move( preparedDiff ), repo,
details.viewMode );
details.diff->setLayoutSizePolicy( SizePolicy::MatchParent,
SizePolicy::MatchParent );
details.diff->setParent( details.diffContainer );
@@ -3750,6 +3774,8 @@ void GitPlugin::buildSidePanelTab() {
"diff-added" );
if ( type == Git::GitStatusType::Changed ) {
menuAdd( menu, "git-diff-changed",
i18n( "git_diff_changed", "Diff Changed" ), "diff-multiple" );
menu->addSeparator();
menuAdd( menu, "git-discard-all",
i18n( "git_discard_all", "Discard All" ) );
@@ -3775,6 +3801,8 @@ void GitPlugin::buildSidePanelTab() {
(Uint32)Git::GitStatusType::Changed ) );
} else if ( id == "git-diff-staged" ) {
diff( Git::DiffMode::DiffStaged, repoPath );
} else if ( id == "git-diff-changed" ) {
diff( Git::DiffMode::DiffChanged, repoPath );
}
} );