Skip to content

Commit 80d0b97

Browse files
committed
2 parents d10834d + b638781 commit 80d0b97

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/main/java/com/shuzijun/leetcode/plugin/listener/ErrorReportHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.intellij.diagnostic.AbstractMessage;
44
import com.intellij.openapi.diagnostic.ErrorReportSubmitter;
55
import com.intellij.openapi.diagnostic.IdeaLoggingEvent;
6-
import com.intellij.openapi.diagnostic.SubmittedReportInfo;
76
import com.intellij.util.Consumer;
87
import com.shuzijun.leetcode.plugin.utils.PropertiesUtils;
98
import com.shuzijun.leetcode.plugin.utils.SentryUtils;
@@ -23,7 +22,7 @@ public String getReportActionText() {
2322
}
2423

2524
@Override
26-
public boolean submit(@NotNull IdeaLoggingEvent[] events, @Nullable String additionalInfo, @NotNull Component parentComponent, @NotNull Consumer<SubmittedReportInfo> consumer) {
25+
public boolean submit(@NotNull IdeaLoggingEvent[] events, @Nullable String additionalInfo, @NotNull Component parentComponent, @NotNull Consumer consumer) {
2726
for (IdeaLoggingEvent event : events) {
2827
Throwable throwable = event.getThrowable();
2928
if (event.getData() instanceof AbstractMessage) {

src/main/java/com/shuzijun/leetcode/plugin/window/WindowFactory.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.intellij.ide.DataManager;
44
import com.intellij.openapi.actionSystem.DataContext;
5+
import com.intellij.openapi.application.ApplicationManager;
56
import com.intellij.openapi.project.Project;
67
import com.intellij.openapi.wm.ToolWindow;
78
import com.intellij.openapi.wm.ToolWindowFactory;
@@ -13,6 +14,7 @@
1314
import org.jetbrains.annotations.NotNull;
1415

1516
import javax.swing.*;
17+
import java.util.concurrent.atomic.AtomicReference;
1618

1719
/**
1820
* @author shuzijun
@@ -33,9 +35,13 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
3335
}
3436

3537
public static DataContext getDataContext(@NotNull Project project) {
36-
ToolWindow leetcodeToolWindows = ToolWindowManager.getInstance(project).getToolWindow(ID);
37-
DataContext dataContext = DataManager.getInstance().getDataContext(leetcodeToolWindows.getContentManager().getContent(0).getComponent());
38-
return dataContext;
38+
AtomicReference<DataContext> dataContext = new AtomicReference<>();
39+
ApplicationManager.getApplication().invokeAndWait(() -> {
40+
41+
ToolWindow leetcodeToolWindows = ToolWindowManager.getInstance(project).getToolWindow(ID);
42+
dataContext.set(DataManager.getInstance().getDataContext(leetcodeToolWindows.getContentManager().getContent(0).getComponent()));
43+
});
44+
return dataContext.get();
3945
}
4046

4147
public static void updateTitle(@NotNull Project project, String userName) {

0 commit comments

Comments
 (0)