From 28308267bb8760edd4f50bd095fe590deded474b Mon Sep 17 00:00:00 2001 From: xiangtianyu Date: Sat, 12 Oct 2024 11:19:23 +0800 Subject: [PATCH 1/2] fix focus problem --- .../devpilot/actions/toolbar/ToolbarFeedbackAction.java | 5 ++++- src/main/java/com/zhongan/devpilot/util/EditorUtils.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zhongan/devpilot/actions/toolbar/ToolbarFeedbackAction.java b/src/main/java/com/zhongan/devpilot/actions/toolbar/ToolbarFeedbackAction.java index ea220653..a502e0da 100644 --- a/src/main/java/com/zhongan/devpilot/actions/toolbar/ToolbarFeedbackAction.java +++ b/src/main/java/com/zhongan/devpilot/actions/toolbar/ToolbarFeedbackAction.java @@ -4,6 +4,7 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.zhongan.devpilot.DevPilotIcons; +import com.zhongan.devpilot.gui.toolwindows.chat.DevPilotChatToolWindowService; import com.zhongan.devpilot.util.DevPilotMessageBundle; import com.zhongan.devpilot.util.LoginUtils; @@ -20,6 +21,8 @@ public ToolbarFeedbackAction() { @Override public void actionPerformed(@NotNull AnActionEvent e) { - BrowserUtil.browse(LoginUtils.buildAuthUrl(FEEDBACK_URL)); +// BrowserUtil.browse(LoginUtils.buildAuthUrl(FEEDBACK_URL)); + var service = e.getProject().getService(DevPilotChatToolWindowService.class); + service.getDevPilotChatToolWindow().jbCefBrowser().openDevtools(); } } \ No newline at end of file diff --git a/src/main/java/com/zhongan/devpilot/util/EditorUtils.java b/src/main/java/com/zhongan/devpilot/util/EditorUtils.java index b10f5373..25a3bfca 100644 --- a/src/main/java/com/zhongan/devpilot/util/EditorUtils.java +++ b/src/main/java/com/zhongan/devpilot/util/EditorUtils.java @@ -35,7 +35,7 @@ public static void openFileAndSelectLines(@NotNull Project project, String fileU return; } - Editor editor = FileEditorManager.getInstance(project).openTextEditor(new OpenFileDescriptor(project, codeFile), true); + Editor editor = FileEditorManager.getInstance(project).openTextEditor(new OpenFileDescriptor(project, codeFile), false); if (editor != null) { if (startColumn == null) { startColumn = 0; From 74c703e4639ad13d48a5ee5dff9399d636af3c00 Mon Sep 17 00:00:00 2001 From: xiangtianyu Date: Sat, 12 Oct 2024 11:27:54 +0800 Subject: [PATCH 2/2] fix focus problem --- .../devpilot/actions/toolbar/ToolbarFeedbackAction.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/zhongan/devpilot/actions/toolbar/ToolbarFeedbackAction.java b/src/main/java/com/zhongan/devpilot/actions/toolbar/ToolbarFeedbackAction.java index a502e0da..ea220653 100644 --- a/src/main/java/com/zhongan/devpilot/actions/toolbar/ToolbarFeedbackAction.java +++ b/src/main/java/com/zhongan/devpilot/actions/toolbar/ToolbarFeedbackAction.java @@ -4,7 +4,6 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.zhongan.devpilot.DevPilotIcons; -import com.zhongan.devpilot.gui.toolwindows.chat.DevPilotChatToolWindowService; import com.zhongan.devpilot.util.DevPilotMessageBundle; import com.zhongan.devpilot.util.LoginUtils; @@ -21,8 +20,6 @@ public ToolbarFeedbackAction() { @Override public void actionPerformed(@NotNull AnActionEvent e) { -// BrowserUtil.browse(LoginUtils.buildAuthUrl(FEEDBACK_URL)); - var service = e.getProject().getService(DevPilotChatToolWindowService.class); - service.getDevPilotChatToolWindow().jbCefBrowser().openDevtools(); + BrowserUtil.browse(LoginUtils.buildAuthUrl(FEEDBACK_URL)); } } \ No newline at end of file