From 1e396084292e614322b0342ae8d24805e991022b Mon Sep 17 00:00:00 2001
From: Stephan Janssen <sja@devoxx.com>
Date: Mon, 9 Dec 2024 19:01:57 +0100
Subject: [PATCH] The horizontal scrolling is again turned off because of
 unwanted side effects

---
 .DS_Store                                        | Bin 6148 -> 0 bytes
 build.gradle.kts                                 |   4 ++--
 .../devoxx/genie/ui/panel/PromptOutputPanel.java |   5 ++---
 .../devoxx/genie/ui/util/CodeSnippetAction.java  |   5 ++++-
 src/main/resources/META-INF/plugin.xml           |   4 ++++
 src/main/resources/application.properties        |  11 +++--------
 6 files changed, 15 insertions(+), 14 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 9a874b5768f336915163bb88cd434575b859f936..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425ml0g0s}V-^m;4I%_5-~tF3k&vj^b9A16778<}(6eNJu~Vz<8=6`~
zboab&MFtUB!i}=AFfm2m$tVxGT*u4pe81nU<hDp!0Y1oNKeq`gKn17(6`%rCU`7h$
zLB3qg=$ZH^RDcT1Ljn6f6u7Y_ThKop2tERUJ<4ua`z!$#D}XiGf~deWTES>lA49C}
z?O@64YO)2RT{MRe%{!}2F))pG(Sih~)xkgosK7*lF7m<7{{#Hn{6A@7N(HFEpDCdI
z{<z=arSfe3cs;A1vTExF2mNw{x1Rtcb`-DSZrCrj0Bf=ZQGxMCz-3^d0zXyY1+O9z
AbpQYW

diff --git a/build.gradle.kts b/build.gradle.kts
index b3e32d2a..7268c962 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.devoxx.genie"
-version = "0.4.0"
+version = "0.4.1"
 
 repositories {
     mavenCentral()
@@ -37,7 +37,7 @@ tasks.named("buildPlugin") {
 }
 
 dependencies {
-    val lg4j_version = "0.36.0"
+    val lg4j_version = "0.36.2"
 
     // Add the dependencies for the core module
     implementation(project(":core"))
diff --git a/src/main/java/com/devoxx/genie/ui/panel/PromptOutputPanel.java b/src/main/java/com/devoxx/genie/ui/panel/PromptOutputPanel.java
index 8a2b6845..7edd4dba 100644
--- a/src/main/java/com/devoxx/genie/ui/panel/PromptOutputPanel.java
+++ b/src/main/java/com/devoxx/genie/ui/panel/PromptOutputPanel.java
@@ -22,8 +22,7 @@
 import java.util.UUID;
 
 import static com.devoxx.genie.model.Constant.FIND_COMMAND;
-import static javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED;
-import static javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED;
+import static javax.swing.ScrollPaneConstants.*;
 
 /**
  * This class represents the output panel for displaying chat prompts and responses.
@@ -59,7 +58,7 @@ public PromptOutputPanel(Project project, ResourceBundle resourceBundle) {
 
         scrollPane = new JBScrollPane(container);
         scrollPane.setVerticalScrollBarPolicy(VERTICAL_SCROLLBAR_AS_NEEDED);
-        scrollPane.setHorizontalScrollBarPolicy(HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        scrollPane.setHorizontalScrollBarPolicy(HORIZONTAL_SCROLLBAR_NEVER);
 
         setLayout(new BorderLayout());
         add(scrollPane, BorderLayout.CENTER);
diff --git a/src/main/java/com/devoxx/genie/ui/util/CodeSnippetAction.java b/src/main/java/com/devoxx/genie/ui/util/CodeSnippetAction.java
index d4aed087..583ac333 100644
--- a/src/main/java/com/devoxx/genie/ui/util/CodeSnippetAction.java
+++ b/src/main/java/com/devoxx/genie/ui/util/CodeSnippetAction.java
@@ -10,6 +10,7 @@
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import org.commonmark.node.FencedCodeBlock;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -26,7 +27,9 @@ public CodeSnippetAction(ChatMessageContext chatMessageContext) {
         this.chatMessageContext = chatMessageContext;
     }
 
-    public JPanel createClipBoardButtonPanel(ChatMessageContext chatMessageContext, FencedCodeBlock fencedCodeBlock) {
+    public JPanel createClipBoardButtonPanel(@NotNull ChatMessageContext chatMessageContext,
+                                             FencedCodeBlock fencedCodeBlock) {
+
         JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 4, 2));
         buttonPanel.setOpaque(true);
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 855defe1..ae581b6d 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -35,6 +35,10 @@
     ]]></description>
 
     <change-notes><![CDATA[
+        <h2>v0.4.1</h2>
+        <UL>
+            <LI>Fix #352 : Restore horizontal scrolling in chat response panel</LI>
+        </UL>
         <h2>v0.4.0</h2>
         <UL>
             <LI>RAG feature : Uses Chroma DB to index and search code using RAG</LI>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 9d3b8655..da56668b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-#Mon Dec 09 12:48:54 CET 2024
+#Mon Dec 09 18:57:18 CET 2024
 =\=\=\=\=\=\=
 <<<<<<<=HEAD
->>>>>>>=origin/master
-version=0.4.0
-=======
-#Sat Dec 07 16:43:15 CET 2024
-version=0.3.1
->>>>>>> master
+>>>>>>>=master
+version=0.4.1