From 9715cc6e22ec9b08aede595cf8ad237b4a7de954 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Tue, 5 Jun 2018 14:55:49 +0000
Subject: [PATCH] IDE: completion: fixed range check error

git-svn-id: trunk@58139 -
---
 ide/sourceeditor.pp     |  2 +-
 ide/sourceeditprocs.pas | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index f68dfead53..91c0cf9f7a 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -2415,7 +2415,7 @@ begin
   Colors.BackgroundSelectedColor := FActiveEditBackgroundSelectedColor;
   Colors.TextColor := FActiveEditTextColor;
   Colors.TextSelectedColor := FActiveEditTextSelectedColor;
-  Colors.TextHighLightColor := FActiveEditTextHighLightColor;
+  Colors.TextHilightColor := FActiveEditTextHighLightColor;
   MaxX:=TheForm.ClientWidth;
   t:=CurrentCompletionType;
   if Manager.ActiveCompletionPlugin<>nil then
diff --git a/ide/sourceeditprocs.pas b/ide/sourceeditprocs.pas
index 78ae313055..8f544b0508 100644
--- a/ide/sourceeditprocs.pas
+++ b/ide/sourceeditprocs.pas
@@ -102,7 +102,7 @@ type
     BackgroundSelectedColor: TColor;
     TextColor: TColor;
     TextSelectedColor: TColor;
-    TextHighLightColor: TColor;
+    TextHilightColor: TColor;
   end;
   PPaintCompletionItemColors = ^TPaintCompletionItemColors;
 
@@ -163,6 +163,7 @@ var
   TokenStart: Integer;
   BackgroundColor: TColorRef;
   ForegroundColor: TColorRef;
+  TextHilightColor: TColorRef;
   AllowFontColor: Boolean;
 
   procedure SetFontColor(NewColor: TColor; Force: boolean = false);
@@ -292,22 +293,24 @@ begin
   begin
     if ItemSelected then
     begin
-      ForegroundColor := Colors^.TextSelectedColor;
+      ForegroundColor := ColorToRGB(Colors^.TextSelectedColor);
       AllowFontColor := ForegroundColor=clNone;
       if ForegroundColor=clNone then
         ForegroundColor := Colors^.TextColor;
       BackgroundColor:=ColorToRGB(Colors^.BackgroundSelectedColor);
     end else
     begin
-      ForegroundColor := Colors^.TextColor;
+      ForegroundColor := ColorToRGB(Colors^.TextColor);
       AllowFontColor := True;
       BackgroundColor:=ColorToRGB(Colors^.BackgroundColor);
     end;
+    TextHilightColor:=ColorToRGB(Colors^.TextHilightColor);
   end else
   begin
     ForegroundColor := clBlack;
     AllowFontColor := True;
     BackgroundColor:=ColorToRGB(ACanvas.Brush.Color);
+    TextHilightColor := clWhite;
   end;
 
   BGRed:=(BackgroundColor shr 16) and $ff;
@@ -538,7 +541,7 @@ begin
     else begin
       //DebugLn(['PaintCompletionItem ',x,',',y,' ',s]);
       // highlighting the prefix
-      if (Colors<>nil) and (Colors^.TextHighLightColor<>clNone)
+      if (Colors<>nil) and (TextHilightColor<>clNone)
       and (aCompletion.CurrentString<>'') then
       begin
         PrefixPosition := Pos(LowerCase(aCompletion.CurrentString), LowerCase(s));
@@ -548,7 +551,7 @@ begin
           Token := Copy(s, 1, PrefixPosition-1);
           ACanvas.TextOut(x+1,y,Token);
           // paint highlight prefix
-          SetFontColor(ColorToRGB(Colors^.TextHighLightColor));
+          SetFontColor(TextHilightColor);
           Token := Copy(s, PrefixPosition, Length(aCompletion.CurrentString));
           ACanvas.TextOut(x+1+ACanvas.TextWidth(Copy(s, 1, PrefixPosition-1)),y,Token);
           // paint after prefix