fix rag return bug (#84)

* fix rag return bug * fix rag return bug
openpilot-hub · Aug 30, 2024 · 5ca10ff · 5ca10ff
1 parent cbf96e5
commit 5ca10ff
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/main/java/com/zhongan/devpilot/gui/toolwindows/chat/DevPilotChatToolWindow.java b/src/main/java/com/zhongan/devpilot/gui/toolwindows/chat/DevPilotChatToolWindow.java
@@ -117,11 +117,9 @@ private void registerJsCallJavaHandler(JBCefBrowser browser) {
                     var username = DevPilotLlmSettingsState.getInstance().getFullName();
                     var uuid = UUID.randomUUID().toString();
 
-                    ApplicationManager.getApplication().invokeLater(() -> {
-                        var message = service.getUserContentCode(messageModel);
-                        var userMessageModel = MessageModel.buildCodeMessage(uuid, time, message.getContent(), username, message.getCodeRef());
-                        service.sendMessage(SessionTypeEnum.MULTI_TURN.getCode(), "PURE_CHAT", null, message.getContent(), null, userMessageModel);
-                    });
+                    var message = service.getUserContentCode(messageModel);
+                    var userMessageModel = MessageModel.buildCodeMessage(uuid, time, message.getContent(), username, message.getCodeRef());
+                    service.sendMessage(SessionTypeEnum.MULTI_TURN.getCode(), "PURE_CHAT", null, message.getContent(), null, userMessageModel);
 
                     return new JBCefJSQuery.Response("success");
                 }

diff --git a/src/main/java/com/zhongan/devpilot/gui/toolwindows/chat/DevPilotChatToolWindowService.java b/src/main/java/com/zhongan/devpilot/gui/toolwindows/chat/DevPilotChatToolWindowService.java
@@ -255,17 +255,24 @@ public MessageModel getUserContentCode(MessageModel messageModel) {
             return messageModel;
         }
 
-        Editor editor = FileEditorManager.getInstance(project).getSelectedTextEditor();
-        if (editor == null || !editor.getSelectionModel().hasSelection()) {
-            return messageModel;
-        }
+        final Editor[] editor = new Editor[1];
+        final EditorInfo[] editorInfo = new EditorInfo[1];
+
+        ApplicationManager.getApplication().invokeAndWait(() -> {
+            editor[0] = FileEditorManager.getInstance(project).getSelectedTextEditor();
+            if (editor[0] == null || !editor[0].getSelectionModel().hasSelection()) {
+                editorInfo[0] = null;
+                return;
+            }
+            editorInfo[0] = new EditorInfo(editor[0]);
+        });
 
-        var editorInfo = new EditorInfo(editor);
-        if (editorInfo.getSourceCode() == null) {
+        if (editorInfo[0] == null || editorInfo[0].getSourceCode() == null) {
             return messageModel;
         }
 
-        var codeReference = CodeReferenceModel.getCodeRefFromEditor(editorInfo, null);
+        var codeReference = CodeReferenceModel.getCodeRefFromEditor(editorInfo[0], null);
+        codeReference.setVisible(false);
         var codeFormat = String.format("```%s\n%s\n```\n", codeReference.getLanguageId(), codeReference.getSourceCode());
 
         messageModel.setContent(message + "\n" + codeFormat);