feat: support file paths in generated code blocks

Author: carlrobertoh

gradle/libs.versions.toml

@@ -12,7 +12,7 @@ jsoup = "1.19.1"
 jtokkit = "1.1.0"
 junit = "5.12.1"
 kotlin = "2.1.20"
-llm-client = "0.8.40"
+llm-client = "0.8.41"
 okio = "3.10.2"
 tree-sitter = "0.24.5"
 grpc = "1.71.0"

src/main/java/ee/carlrobert/codegpt/CodeGPTKeys.java

@@ -3,6 +3,7 @@
 import com.intellij.openapi.editor.EditorCustomElementRenderer;
 import com.intellij.openapi.editor.Inlay;
 import com.intellij.openapi.util.Key;
+import com.intellij.openapi.vfs.VirtualFile;
 import ee.carlrobert.codegpt.predictions.CodeSuggestionDiffViewer;
 import ee.carlrobert.llm.client.codegpt.CodeGPTUserDetails;
 
@@ -26,4 +27,6 @@ public class CodeGPTKeys {
       Key.create("codegpt.isPromptTextFieldDocument");
   public static final Key<CodeSuggestionDiffViewer> EDITOR_PREDICTION_DIFF_VIEWER =
       Key.create("codegpt.editorPredictionDiffViewer");
+  public static final Key<VirtualFile> TOOLWINDOW_EDITOR_VIRTUAL_FILE =
+      Key.create("proxyai.toolwindowEditorVirtualFile");
 }

src/main/java/ee/carlrobert/codegpt/Icons.java

@@ -10,6 +10,10 @@ public final class Icons {
       IconLoader.getIcon("/icons/codegpt-small.svg", Icons.class);
   public static final Icon CodeGPTModel =
       IconLoader.getIcon("/icons/codegpt-model.svg", Icons.class);
+  public static final Icon CollapseAll =
+      IconLoader.getIcon("/icons/collapseAll.svg", Icons.class);
+  public static final Icon ExpandAll =
+      IconLoader.getIcon("/icons/expandAll.svg", Icons.class);
   public static final Icon Anthropic = IconLoader.getIcon("/icons/anthropic.svg", Icons.class);
   public static final Icon Azure = IconLoader.getIcon("/icons/azure.svg", Icons.class);
   public static final Icon DeepSeek = IconLoader.getIcon("/icons/deepseek.png", Icons.class);

src/main/java/ee/carlrobert/codegpt/actions/editor/AskQuestionAction.java

@@ -3,17 +3,17 @@
 import static java.lang.String.format;
 
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.impl.EditorImpl;
+import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.util.ui.FormBuilder;
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.UI;
 import ee.carlrobert.codegpt.Icons;
+import ee.carlrobert.codegpt.completions.CompletionRequestUtil;
 import ee.carlrobert.codegpt.conversations.message.Message;
 import ee.carlrobert.codegpt.toolwindow.chat.ChatToolWindowContentManager;
 import ee.carlrobert.codegpt.ui.UIUtil;
-import ee.carlrobert.codegpt.util.file.FileUtil;
 import java.awt.event.ActionEvent;
 import javax.swing.AbstractAction;
 import javax.swing.JComponent;
@@ -32,13 +32,12 @@ public class AskQuestionAction extends BaseEditorAction {
   @Override
   protected void actionPerformed(Project project, Editor editor, String selectedText) {
     if (selectedText != null && !selectedText.isEmpty()) {
-      var fileExtension = FileUtil.getFileExtension(
-          ((EditorImpl) editor).getVirtualFile().getName());
       var dialog = new CustomPromptDialog(previousUserPrompt);
       if (dialog.showAndGet()) {
         previousUserPrompt = dialog.getUserPrompt();
-        var message = new Message(
-            format("%s%n```%s%n%s%n```", previousUserPrompt, fileExtension, selectedText));
+        var formattedCode =
+            CompletionRequestUtil.formatCode(selectedText, ((EditorEx)editor).getVirtualFile().getPath());
+        var message = new Message(format("%s\n\n%s", previousUserPrompt, formattedCode));
         SwingUtilities.invokeLater(() ->
             project.getService(ChatToolWindowContentManager.class).sendMessage(message));
       }

src/main/java/ee/carlrobert/codegpt/actions/editor/EditorActionsUtil.java

@@ -1,19 +1,17 @@
 package ee.carlrobert.codegpt.actions.editor;
 
-import static java.lang.String.format;
-
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.impl.EditorImpl;
+import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.project.Project;
+import ee.carlrobert.codegpt.completions.CompletionRequestUtil;
 import ee.carlrobert.codegpt.conversations.message.Message;
 import ee.carlrobert.codegpt.settings.prompts.PromptsSettings;
 import ee.carlrobert.codegpt.toolwindow.chat.ChatToolWindowContentManager;
-import ee.carlrobert.codegpt.util.file.FileUtil;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import org.apache.commons.text.CaseUtils;
@@ -47,14 +45,13 @@ protected void actionPerformed(Project project, Editor editor, String selectedTe
                     project.getService(ChatToolWindowContentManager.class);
                 toolWindowContentManager.getToolWindow().show();
 
-                var fileExtension = FileUtil.getFileExtension(
-                    ((EditorImpl) editor).getVirtualFile().getName());
                 var prompt =
                     promptDetails.getInstructions() == null ? "" : promptDetails.getInstructions();
-                var message = new Message(prompt.replace(
-                    "{SELECTION}",
-                    format("%n```%s%n%s%n```", fileExtension, selectedText)));
-                toolWindowContentManager.sendMessage(message);
+                var formattedCode = CompletionRequestUtil.formatCode(
+                    selectedText,
+                    ((EditorEx) editor).getVirtualFile().getPath());
+                toolWindowContentManager.sendMessage(
+                    new Message(prompt.replace("{SELECTION}", formattedCode)));
               }
             };
             group.add(action);

src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowTabPanel.java

@@ -1,13 +1,12 @@
 package ee.carlrobert.codegpt.toolwindow.chat;
 
 import static ee.carlrobert.codegpt.ui.UIUtil.createScrollPaneWithSmartScroller;
-import static java.lang.String.format;
 
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.SelectionModel;
-import com.intellij.openapi.editor.impl.EditorImpl;
+import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.JBColor;
@@ -17,6 +16,7 @@
 import ee.carlrobert.codegpt.actions.ActionType;
 import ee.carlrobert.codegpt.completions.ChatCompletionParameters;
 import ee.carlrobert.codegpt.completions.CompletionRequestService;
+import ee.carlrobert.codegpt.completions.CompletionRequestUtil;
 import ee.carlrobert.codegpt.completions.ConversationType;
 import ee.carlrobert.codegpt.completions.ToolwindowChatCompletionRequestHandler;
 import ee.carlrobert.codegpt.conversations.Conversation;
@@ -48,7 +48,6 @@
 import ee.carlrobert.codegpt.ui.textarea.header.tag.TagManager;
 import ee.carlrobert.codegpt.util.EditorUtil;
 import ee.carlrobert.codegpt.util.coroutines.CoroutineDispatchers;
-import ee.carlrobert.codegpt.util.file.FileUtil;
 import git4idea.GitCommit;
 import java.awt.BorderLayout;
 import java.util.HashSet;
@@ -425,7 +424,7 @@ private JPanel createUserPromptPanel() {
 
   private JComponent getLandingView() {
     return new ChatToolWindowLandingPanel((action, locationOnScreen) -> {
-      var editor = EditorUtil.getSelectedEditor(project);
+      var editor = (EditorEx) EditorUtil.getSelectedEditor(project);
       if (editor == null || !editor.getSelectionModel().hasSelection()) {
         OverlayUtil.showWarningBalloon(
             editor == null ? "Unable to locate a selected editor"
@@ -434,11 +433,10 @@ private JComponent getLandingView() {
         return Unit.INSTANCE;
       }
 
-      var fileExtension = FileUtil.getFileExtension(
-          ((EditorImpl) editor).getVirtualFile().getName());
-      var message = new Message(action.getPrompt().replace(
-          "{SELECTION}",
-          format("%n```%s%n%s%n```", fileExtension, editor.getSelectionModel().getSelectedText())));
+      var formattedCode = CompletionRequestUtil.formatCode(
+          editor.getSelectionModel().getSelectedText(),
+          editor.getVirtualFile().getPath());
+      var message = new Message(action.getPrompt().replace("{SELECTION}", formattedCode));
       sendMessage(message, ConversationType.DEFAULT);
       return Unit.INSTANCE;
     });