From ef933e235fb5d474d0b248685686b229710c549e Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Thu, 22 Oct 2020 15:47:25 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-41895=20=E8=AE=BE=E8=AE=A1=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF-SQL=E8=BE=93=E5=85=A5=E6=A1=86=E7=9A=84=E5=85=89?=
 =?UTF-8?q?=E6=A0=87=EF=BC=8C=E9=97=AA=E7=83=81=E6=97=B6=E4=BC=9A=E7=95=99?=
 =?UTF-8?q?=E4=B8=8B=E4=B8=80=E4=B8=AA=E5=B0=8F=E7=82=B9=20=E3=80=90?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E5=85=89=E6=A0=87?=
 =?UTF-8?q?=E7=9A=84=E9=95=BF=E5=BA=A6=E6=AF=94=E8=83=8C=E6=99=AF=E9=AB=98?=
 =?UTF-8?q?=E4=BA=AE=E8=A6=81=E9=95=BF=EF=BC=8C=E8=B6=85=E5=87=BA=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=B8=8D=E4=BC=9A=E9=97=AA=E7=83=81=EF=BC=8C=E5=9B=A0?=
 =?UTF-8?q?=E6=AD=A4=E7=95=99=E4=B8=8B=E5=B0=8F=E7=82=B9=20=E3=80=90?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E5=87=8F=E5=B0=8F?=
 =?UTF-8?q?=E5=85=89=E6=A0=87=E7=9A=84=E7=AB=96=E7=9B=B4height?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gui/syntax/ui/rtextarea/ConfigurableCaret.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/ConfigurableCaret.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/ConfigurableCaret.java
index 233fcd598..3582c4ad9 100644
--- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/ConfigurableCaret.java
+++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/ConfigurableCaret.java
@@ -2,7 +2,7 @@
  * 12/21/2004
  *
  * ConfigurableCaret.java - The caret used by RTextArea.
- * 
+ *
  * This library is distributed under a modified BSD license.  See the included
  * RSyntaxTextArea.License.txt file for details.
  */
@@ -159,7 +159,7 @@ public class ConfigurableCaret extends DefaultCaret {
 				textArea.isRequestFocusEnabled()) {
 			if (inWindow)
 				textArea.requestFocusInWindow();
-			else 
+			else
 				textArea.requestFocus();
 		}
 	}
@@ -458,7 +458,8 @@ public class ConfigurableCaret extends DefaultCaret {
 						Graphics2D g2 = (Graphics2D) g;
 						g2.setStroke(new BasicStroke(2));
 						// 向右再移动一个位置 避免光标太接近文字内容
-						g2.draw(new Line2D.Float(r.x + 1, r.y, r.x + 1, r.y + r.height));
+						// REPORT-41895 光标上方超出背景高亮的部分不会闪烁，会形成一个停留的小点，因此将光标的超出部分截去
+						g2.draw(new Line2D.Float(r.x + 1, r.y + 1, r.x + 1, r.y + r.height));
 						break;
 
 				} // End of switch (style).
@@ -676,7 +677,7 @@ public class ConfigurableCaret extends DefaultCaret {
 		            			if (line<lineCount) {
 		            				dot = textArea.getLineStartOffset(line);
 		            			}
-		            			else { // No lower lines visible 
+		            			else { // No lower lines visible
 		            				UIManager.getLookAndFeel().
 		            						provideErrorFeedback(textArea);
 		            				return;
@@ -711,4 +712,4 @@ public class ConfigurableCaret extends DefaultCaret {
 	}
 
 
-}
\ No newline at end of file
+}