Disable tool window chat editor when initially displayed

carlrobertoh · Nov 21, 2023 · ecf6ac0 · ecf6ac0
1 parent 53bdbcd
commit ecf6ac0
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 24 deletions.
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/components/ChatMessageResponseBody.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/components/ChatMessageResponseBody.java
@@ -25,7 +25,7 @@
 import ee.carlrobert.codegpt.toolwindow.chat.ResponseNodeRenderer;
 import ee.carlrobert.codegpt.toolwindow.chat.StreamParser;
 import ee.carlrobert.codegpt.toolwindow.chat.StreamResponseType;
-import ee.carlrobert.codegpt.toolwindow.chat.editor.ResponseEditor;
+import ee.carlrobert.codegpt.toolwindow.chat.editor.ResponseEditorPanel;
 import ee.carlrobert.codegpt.util.MarkdownUtil;
 import ee.carlrobert.codegpt.util.UIUtil;
 import ee.carlrobert.llm.client.you.completion.YouSerpResult;
@@ -46,7 +46,7 @@ public class ChatMessageResponseBody extends JPanel {
   private final StreamParser streamParser;
   private final boolean readOnly;
   private JPanel currentlyProcessedElement;
-  private ResponseEditor currentlyProcessedEditor;
+  private ResponseEditorPanel currentlyProcessedEditor;
   private JTextPane currentlyProcessedTextPane;
   private boolean responseReceived;
 
@@ -248,7 +248,7 @@ private void prepareProcessingTextResponse() {
   private void prepareProcessingCodeResponse(String code, String markdownLanguage) {
     hideCarets();
     currentlyProcessedTextPane = null;
-    currentlyProcessedEditor = new ResponseEditor(
+    currentlyProcessedEditor = new ResponseEditorPanel(
         project,
         code,
         markdownLanguage,

diff --git a/...oolwindow/chat/editor/ResponseEditor.java → ...ndow/chat/editor/ResponseEditorPanel.java b/...oolwindow/chat/editor/ResponseEditor.java → ...ndow/chat/editor/ResponseEditorPanel.java
@@ -35,13 +35,13 @@
 import javax.swing.Box;
 import javax.swing.JPanel;
 
-public class ResponseEditor extends JPanel implements Disposable {
+public class ResponseEditorPanel extends JPanel implements Disposable {
 
   private final Editor editor;
   private final String language;
   private final String extension;
 
-  public ResponseEditor(
+  public ResponseEditorPanel(
       Project project,
       String code,
       String markdownLanguage,
@@ -66,22 +66,7 @@ public ResponseEditor(
       }
     }
 
-    var editorEx = ((EditorEx) editor);
-    if (readOnly) {
-      editorEx.setOneLineMode(true);
-      editorEx.setHorizontalScrollbarVisible(false);
-    }
-    editorEx.installPopupHandler(new ContextMenuPopupHandler.Simple(group));
-    editorEx.setColorsScheme(EditorColorsManager.getInstance().getSchemeForCurrentUITheme());
-
-    var settings = editorEx.getSettings();
-    settings.setAdditionalColumnsCount(0);
-    settings.setAdditionalLinesCount(1);
-    settings.setAdditionalPageAtBottom(false);
-    settings.setVirtualSpace(false);
-    settings.setUseSoftWraps(false);
-    settings.setLineMarkerAreaShown(false);
-    settings.setGutterIconsShown(false);
+    configureEditor((EditorEx) editor, readOnly, new ContextMenuPopupHandler.Simple(group));
 
     add(createHeaderComponent(readOnly), BorderLayout.NORTH);
     add(editor.getComponent(), BorderLayout.CENTER);
@@ -99,6 +84,27 @@ public Editor getEditor() {
     return editor;
   }
 
+  private void configureEditor(
+      EditorEx editorEx,
+      boolean readOnly,
+      ContextMenuPopupHandler popupHandler) {
+    if (readOnly) {
+      editorEx.setOneLineMode(true);
+      editorEx.setHorizontalScrollbarVisible(false);
+    }
+    editorEx.installPopupHandler(popupHandler);
+    editorEx.setColorsScheme(EditorColorsManager.getInstance().getSchemeForCurrentUITheme());
+
+    var settings = editorEx.getSettings();
+    settings.setAdditionalColumnsCount(0);
+    settings.setAdditionalLinesCount(1);
+    settings.setAdditionalPageAtBottom(false);
+    settings.setVirtualSpace(false);
+    settings.setUseSoftWraps(false);
+    settings.setLineMarkerAreaShown(false);
+    settings.setGutterIconsShown(false);
+  }
+
   private JPanel createHeaderComponent(boolean readOnly) {
     var headerComponent = new JPanel(new BorderLayout());
     headerComponent.setBorder(JBUI.Borders.compound(
@@ -114,8 +120,8 @@ private JPanel createHeaderComponent(boolean readOnly) {
   private String getLinkText(boolean expanded) {
     return expanded
         ? format(
-            CodeGPTBundle.get("toolwindow.chat.editor.action.expand"),
-            ((EditorEx) editor).getDocument().getLineCount() - 1)
+        CodeGPTBundle.get("toolwindow.chat.editor.action.expand"),
+        ((EditorEx) editor).getDocument().getLineCount() - 1)
         : CodeGPTBundle.get("toolwindow.chat.editor.action.collapse");
   }
 

diff --git a/src/main/java/ee/carlrobert/codegpt/util/EditorUtil.java b/src/main/java/ee/carlrobert/codegpt/util/EditorUtil.java
@@ -39,7 +39,7 @@ public static Editor createEditor(@NotNull Project project, String fileExtension
         document,
         project,
         lightVirtualFile,
-        false,
+        true,
         EditorKind.MAIN_EDITOR);
   }