Skip to content

Commit 4df6a22

Browse files
fix(action): 在EDT捕获提交面板选中快照避免后台线程访问违规
后台任务中直接读取提交面板选中项触发 EDT 断言异常 (Fixes #35)。 在 actionPerformed 中将选中变更捕获为不可变快照,后台线程仅使用快照。
1 parent 30dae9a commit 4df6a22

4 files changed

Lines changed: 45 additions & 12 deletions

File tree

‎src/main/java/com/fulinlin/action/CommitPanelActionSupport.java‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.Collection;
3030
import java.util.Collections;
3131
import java.util.IdentityHashMap;
32+
import java.util.List;
3233
import java.util.Map;
3334
import java.util.Set;
3435
import java.util.WeakHashMap;
@@ -409,18 +410,47 @@ public CommitMessageI getCommitPanel() {
409410
return commitPanel;
410411
}
411412

413+
/**
414+
* Snapshots the panel selection into immutable collections. Must be called on the EDT
415+
* because reading the panel's inclusion model is EDT-only; the returned snapshot is
416+
* safe to read from background threads.
417+
*/
418+
@NotNull
419+
public SelectionSnapshot captureSelection() {
420+
if (checkinProjectPanel == null) {
421+
return new SelectionSnapshot(Collections.emptyList(), Collections.emptyList());
422+
}
423+
return new SelectionSnapshot(
424+
List.copyOf(checkinProjectPanel.getSelectedChanges()),
425+
List.copyOf(checkinProjectPanel.getFiles()));
426+
}
427+
}
428+
429+
/**
430+
* Immutable snapshot of the commit panel selection captured on the EDT, safe to read
431+
* from background threads.
432+
*/
433+
public static final class SelectionSnapshot {
434+
private final Collection<Change> selectedChanges;
435+
private final Collection<File> selectedFiles;
436+
437+
private SelectionSnapshot(@NotNull Collection<Change> selectedChanges, @NotNull Collection<File> selectedFiles) {
438+
this.selectedChanges = selectedChanges;
439+
this.selectedFiles = selectedFiles;
440+
}
441+
412442
@NotNull
413443
public Collection<Change> getSelectedChanges() {
414-
return checkinProjectPanel != null ? checkinProjectPanel.getSelectedChanges() : Collections.emptyList();
444+
return selectedChanges;
415445
}
416446

417447
@NotNull
418448
public Collection<File> getSelectedFiles() {
419-
return checkinProjectPanel != null ? checkinProjectPanel.getFiles() : Collections.emptyList();
449+
return selectedFiles;
420450
}
421451

422452
public boolean hasSelection() {
423-
return !getSelectedChanges().isEmpty() || !getSelectedFiles().isEmpty();
453+
return !selectedChanges.isEmpty() || !selectedFiles.isEmpty();
424454
}
425455
}
426456
}

‎src/main/java/com/fulinlin/action/CreateCommitAction.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ public void actionPerformed(@Nullable AnActionEvent actionEvent) {
7373
updateLoadingPresentation(actionEvent, true);
7474
CommitPanelActionSupport.CommitMessageLoadingState loadingState =
7575
CommitPanelActionSupport.startCommitMessageLoading(commitPanel);
76-
String editedCommitHash = commitContext.hasSelection() ? null : CommitPanelActionSupport.findEditedCommitHash(commitPanel);
76+
CommitPanelActionSupport.SelectionSnapshot selection = commitContext.captureSelection();
77+
String editedCommitHash = selection.hasSelection() ? null : CommitPanelActionSupport.findEditedCommitHash(commitPanel);
7778
ProgressManager.getInstance().run(new Task.Backgroundable(project, PluginBundle.get("action.smart.echo.progress"), true) {
7879
@Override
7980
public void run(@NotNull ProgressIndicator indicator) {
@@ -94,8 +95,8 @@ public void run(@NotNull ProgressIndicator indicator) {
9495
initialCommitTemplate = llmCommitService.parseCommitMessageToTemplate(
9596
project,
9697
settings,
97-
commitContext.getSelectedChanges(),
98-
commitContext.getSelectedFiles(),
98+
selection.getSelectedChanges(),
99+
selection.getSelectedFiles(),
99100
currentMessage
100101
);
101102
}

‎src/main/java/com/fulinlin/action/FormatCommitByLlmAction.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public void actionPerformed(@Nullable AnActionEvent actionEvent) {
5454
return;
5555
}
5656

57-
String editedCommitHash = commitContext.hasSelection() ? null : CommitPanelActionSupport.findEditedCommitHash(commitPanel);
57+
CommitPanelActionSupport.SelectionSnapshot selection = commitContext.captureSelection();
58+
String editedCommitHash = selection.hasSelection() ? null : CommitPanelActionSupport.findEditedCommitHash(commitPanel);
5859
loading = true;
5960
updateLoadingPresentation(actionEvent, true);
6061
CommitPanelActionSupport.CommitMessageLoadingState loadingState =
@@ -84,8 +85,8 @@ public void run(@NotNull ProgressIndicator indicator) {
8485
llmCommitService.formatCommitMessage(
8586
project,
8687
settings,
87-
commitContext.getSelectedChanges(),
88-
commitContext.getSelectedFiles(),
88+
selection.getSelectedChanges(),
89+
selection.getSelectedFiles(),
8990
currentMessage,
9091
delta -> {
9192
indicator.checkCanceled();

‎src/main/java/com/fulinlin/action/GenerateCommitByLlmAction.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public void actionPerformed(@Nullable AnActionEvent actionEvent) {
3939
if (commitPanel == null || project == null) {
4040
return;
4141
}
42-
boolean hasSelection = commitContext.hasSelection();
42+
CommitPanelActionSupport.SelectionSnapshot selection = commitContext.captureSelection();
43+
boolean hasSelection = selection.hasSelection();
4344
String editedCommitHash = hasSelection ? null : CommitPanelActionSupport.findEditedCommitHash(commitPanel);
4445
if (!hasSelection && editedCommitHash == null) {
4546
Messages.showWarningDialog(project, PluginBundle.get("action.generate.empty.selection"), PluginBundle.get("action.llm.error.title"));
@@ -92,8 +93,8 @@ public void run(@NotNull ProgressIndicator indicator) {
9293
llmCommitService.generateCommitMessage(
9394
project,
9495
settings,
95-
commitContext.getSelectedChanges(),
96-
commitContext.getSelectedFiles(),
96+
selection.getSelectedChanges(),
97+
selection.getSelectedFiles(),
9798
additionalContext,
9899
delta -> {
99100
indicator.checkCanceled();

0 commit comments

Comments
 (0)