From a4a9a50a093fe8f702b7ef50ef898168b0cf30e3 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Tue, 31 Mar 2020 13:32:33 +0200
Subject: [PATCH] fix #13 - Add a way to highlight in the messages widget

---
 docs/index.md            |  2 +-
 docs/widgets_messages.md |  1 +
 src/u_messages.pas       | 37 ++++++++++++++++++++++++++++++++++++-
 src/u_search.pas         |  5 +++--
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index c8111615..8802fc17 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -5,7 +5,7 @@ header-includes: <script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/4
 
 ![](img/coedit_kde4_thumb.png)
 
-This documentation is based on Dexed version 3.7.10.
+This documentation is based on Dexed version 3.8.2.
 Screenshots can be outdated but descriptions are up to date.
 
 ## First steps
diff --git a/docs/widgets_messages.md b/docs/widgets_messages.md
index 0398731b..a9447f80 100644
--- a/docs/widgets_messages.md
+++ b/docs/widgets_messages.md
@@ -33,6 +33,7 @@ This value and several other options can be changed in the options.
 - **alwaysFilter**: Sets if the custom filter (text filed at the top right) is maintained or if it's reset when new messages are emitted.
 - **autoDemangle**: Automatically filters the new messages with [ddemangle](https://github.com/dlang/tools#d-tools). Note that Dexed uses the tool as a daemon so it's perfectly normal that it remains in the task list when the IDE runs.
 - **autoSelect**: Defines if the widget change dynamically the message categories.
+- **backticksHighligh**: Sets if text between backticks gets painted in a particular color. Highligting is not limited to a particular tool so it is applied to the compiler messages, the results of [find all](widgets_search.html), and any process that has its output streams redirtected to the widget.
 This is a recommended setting because if a run-time error happens, it will be immediately displayed.
 - **colors**: Allows to associate a message kind to a particular color.
 - **fast display**: If set, the new messages are displayed fast but by block. When not set the same amount of message takes longer to be displayed but the operation is smoother.
diff --git a/src/u_messages.pas b/src/u_messages.pas
index 2230b0cc..497f5f97 100644
--- a/src/u_messages.pas
+++ b/src/u_messages.pas
@@ -26,6 +26,7 @@ type
 
   TMessagesOptions = class(TWritableLfmTextComponent)
   private
+    fbackTickHighlight: boolean;
     fFastDisplay: boolean;
     fMaxCount: integer;
     fAutoSelect: boolean;
@@ -35,6 +36,7 @@ type
     fMaxLineLength: integer;
     fFont: TFont;
     fMsgColors: array[TAppMessageKind] of TColor;
+    fHighlightColor: TColor;
     procedure setFont(value: TFont);
   published
     property alwaysFilter: boolean read fAlwaysFilter write fAlwaysFilter;
@@ -50,6 +52,8 @@ type
     property colorHint: TColor read fMsgColors[amkHint] write fMsgColors[amkHint];
     property colorWarning: TColor read fMsgColors[amkWarn] write fMsgColors[amkWarn];
     property colorError: TColor read fMsgColors[amkErr] write fMsgColors[amkErr];
+    property colorHighlight: TColor read fHighlightColor write fHighlightColor;
+    property backticksHighlight: boolean read fbackTickHighlight write fbackTickHighlight default true;
   public
     constructor Create(AOwner: TComponent); override;
     destructor destroy; override;
@@ -260,6 +264,7 @@ begin
   inherited;
   fFont := TFont.Create;
   fFont.Style := [fsBold];
+  fbackTickHighlight := true;
   {$IFDEF WINDOWS}
   fFont.name := 'Consolas';
   {$ENDIF}
@@ -272,6 +277,7 @@ begin
   fMsgColors[amkErr] := $BDBDFF;
   fMsgColors[amkInf] := $FFD0A8;
   fMsgColors[amkHint]:= $C2FFC2;
+  fHighlightColor    := $F7F7F7;
 end;
 
 destructor TMessagesOptions.destroy;
@@ -612,11 +618,18 @@ procedure TMessagesWidget.ListCustomDrawItem(Sender: TCustomTreeView;
 var
   x: integer;
   rc: TRect;
+  r: TStringRange = (ptr:nil; pos:0; len: 0);
+  t: TStringRange = (ptr:nil; pos:0; len: 0);
+  s: string;
+  p: boolean = false;
+  c: array [boolean] of TColor;
 begin
   rc := node.DisplayRect(false);
   x := rc.Left + 2 - TTreeHack(list).ScrolledLeft;
   // warning: the cast may become wrong if the enum is modified.
   Sender.Canvas.Brush.Color := fMsgColors[TAppMessageKind(node.ImageIndex + 1)];
+  c[false] := Sender.Canvas.font.Color;
+  c[true]  := fOptions.colorHighlight;
   if node.Selected then
   begin
     Sender.Canvas.DrawFocusRect(rc);
@@ -626,7 +639,29 @@ begin
   list.Images.Draw(sender.Canvas, x, (rc.Top + rc.Bottom - list.Images.Height) div 2,
     node.ImageIndex, Node.NodeEffect);
   x += list.Images.Width + 5;
-  Sender.Canvas.TextOut(x, rc.Top, node.Text);
+
+  if not fOptions.backticksHighlight then
+    Sender.Canvas.TextOut(x, rc.Top, Node.Text)
+  else if node.Text.isNotEmpty then
+  begin
+    r.init(node.Text);
+    while not r.empty do
+    begin
+      t := r.takeUntil('`');
+      if p then
+        t.takeMore(1);
+      s := t.yield();
+      if p then
+        s := '`' + s + '`';
+      if not r.empty() then
+        r.popFront();
+      Sender.Canvas.font.Color:= c[p];
+      Sender.Canvas.TextOut(x, rc.Top, s);
+      x += sender.Canvas.TextWidth(s);
+      p := not p;
+    end;
+  end;
+
   DefaultDraw := false;
 end;
 {$ENDREGION}
diff --git a/src/u_search.pas b/src/u_search.pas
index 2e3982ff..6a74b256 100644
--- a/src/u_search.pas
+++ b/src/u_search.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
   Menus, StdCtrls, actnList, Buttons, SynEdit, SynEditSearch, SynEditTypes,
-  u_common, u_mru, u_widget, u_synmemo, u_interfaces, u_observer,
+  u_common, u_mru, u_widget, u_synmemo, u_interfaces, u_observer, strutils,
   u_writableComponent, u_dialogs, u_sharedres, u_dsgncontrols,
   SynEditTextBuffer;
 
@@ -491,7 +491,7 @@ begin
     msgs := getMessageDisplay;
     if (not showNoResult and (result > 0)) or showNoResult then
     begin
-      msg := format('%d result(s) for the pattern <%s> in %s',
+      msg := format('%d result(s) for the pattern `%s` in %s',
         [length(res), fToFind, filename]);
       msgs.message(msg, nil, amcMisc, amkInf);
     end;
@@ -499,6 +499,7 @@ begin
     for i := 0 to high(res) do
     begin
       msg := format(fmt, [res[i].Y, res[i].X, Trim(lines[res[i].Y-1])]);
+      msg := strutils.ReplaceStr(msg, fToFind, '`' + fToFind + '`');
       msgs.message(msg, nil, amcMisc, amkInf);
     end;
   finally