From 44882f708a5f5d75f11a64a3fc5920389b1cf55e Mon Sep 17 00:00:00 2001
From: ondrej <ondrej@lazarus-ide.org>
Date: Tue, 8 May 2018 00:24:58 +0000
Subject: [PATCH] IDE: syncompletion: don't paint highlighted prefix over
 already painted text

git-svn-id: trunk@57835 -
---
 ide/sourceeditprocs.pas | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/ide/sourceeditprocs.pas b/ide/sourceeditprocs.pas
index 43897d4e85..de102a0f26 100644
--- a/ide/sourceeditprocs.pas
+++ b/ide/sourceeditprocs.pas
@@ -273,7 +273,7 @@ var
   IsReadOnly: boolean;
   UseImages: boolean;
   ImageIndex, ImageIndexCC: longint;
-  Prefix: String;
+  Token: String;
   PrefixPosition: Integer;
   HintModifiers: TPascalHintModifiers;
   HintModifier: TPascalHintModifier;
@@ -522,18 +522,28 @@ begin
       Inc(Result.X, 1+ACanvas.TextWidth(s))
     else begin
       //DebugLn(['PaintCompletionItem ',x,',',y,' ',s]);
-      ACanvas.TextOut(x+1,y,s);
       // highlighting the prefix
       if (Colors<>nil) and (Colors^.TextHighLightColor<>clNone)
       and (aCompletion.CurrentString<>'') then
       begin
         PrefixPosition := Pos(LowerCase(aCompletion.CurrentString), LowerCase(s));
-        Prefix := Copy(s, PrefixPosition, Length(aCompletion.CurrentString));
         if PrefixPosition > 0 then
-          PrefixPosition := ACanvas.TextWidth(Copy(s, 1, PrefixPosition-1));
-        SetFontColor(ColorToRGB(Colors^.TextHighLightColor));
-        ACanvas.TextOut(x+PrefixPosition+1,y,Prefix);
-      end;
+        begin
+          // paint before prefix
+          Token := Copy(s, 1, PrefixPosition-1);
+          ACanvas.TextOut(x+1,y,Token);
+          // paint highlight prefix
+          SetFontColor(ColorToRGB(Colors^.TextHighLightColor));
+          Token := Copy(s, PrefixPosition, Length(aCompletion.CurrentString));
+          ACanvas.TextOut(x+1+ACanvas.TextWidth(Copy(s, 1, PrefixPosition-1)),y,Token);
+          // paint after prefix
+          SetFontColor(ForegroundColor);
+          Token := Copy(s, PrefixPosition+Length(aCompletion.CurrentString), High(Integer));
+          ACanvas.TextOut(x+1+ACanvas.TextWidth(Copy(s, 1, PrefixPosition-1+Length(aCompletion.CurrentString))),y,Token);
+        end else
+          ACanvas.TextOut(x+1,y,s);
+      end else
+        ACanvas.TextOut(x+1,y,s);
       inc(x,ACanvas.TextWidth(s)+1);
       if x>MaxX then exit;
     end;