Options/SynEdit: Timeconfig for Markup current word

git-svn-id: trunk@18073 -
2025-04-23 09:19:40 +02:00 · 2009-01-03 12:59:27 +00:00 · 2009-01-03 12:59:27 +00:00 · d5b60c9b4c
commit d5b60c9b4c
parent 99066aee96
5 changed files with 215 additions and 64 deletions
--- a/ide/editoroptions.pp
+++ b/ide/editoroptions.pp
@ -40,7 +40,7 @@ uses
  Controls, Graphics, LCLProc, FileUtil, LResources,
  // synedit
  SynEdit, SynEditAutoComplete, SynEditHighlighter, SynEditKeyCmds,
-  SynEditStrConst, SynEditMarkupBracket,
+  SynEditStrConst, SynEditMarkupBracket, SynEditMarkupHighAll,
  SynHighlighterCPP, SynHighlighterHTML, SynHighlighterJava, SynHighlighterLFM,
  SynHighlighterPas, SynHighlighterPerl, SynHighlighterPHP, SynHighlighterSQL,
  SynHighlighterPython, SynHighlighterUNIXShellScript, SynHighlighterXML,
@ -415,6 +415,8 @@ type

  TEditorOptions = class(TAbstractIDEOptions)
  private
+    FMarkupCurWordEnabled: Boolean;
+    FMarkupCurWordTime: Integer;
    xmlconfig: TXMLConfig;

    // general options
@ -570,6 +572,12 @@ type
    property HighlighterList: TEditOptLangList
      read fHighlighterList write fHighlighterList;

+    // Markup Current Word
+    property MarkupCurWordEnabled: Boolean
+      read FMarkupCurWordEnabled write FMarkupCurWordEnabled default True;
+    property MarkupCurWordTime: Integer
+      read FMarkupCurWordTime write FMarkupCurWordTime default 1500;
+
    // Code Tools options
    property AutoIdentifierCompletion: Boolean
      read fAutoIdentifierCompletion write fAutoIdentifierCompletion default True;
@ -1372,6 +1380,9 @@ begin
  // Color options
  fHighlighterList := TEditOptLangList.Create;

+  FMarkupCurWordEnabled := True;
+  FMarkupCurWordTime := 1500;
+
  // Code Tools options
  fCodeTemplateFileName := SetDirSeparators(GetPrimaryConfigPath + '/lazarus.dci');
  CopySecondaryConfigFile('lazarus.dci');
@ -1530,6 +1541,13 @@ begin
      // color attributes are stored in the highlighters
    ;

+    FMarkupCurWordEnabled :=
+      XMLConfig.GetValue(
+      'EditorOptions/Display/MarkupCurrentWordEnabled', True);
+    FMarkupCurWordTime :=
+      XMLConfig.GetValue(
+      'EditorOptions/Display/MarkupCurrentWordTime', 1500);
+
    // Code Tools options
    fAutoIdentifierCompletion :=
      XMLConfig.GetValue(
@ -1670,6 +1688,12 @@ begin
      // color attributes are stored in the highlighters
    ;

+
+    XMLConfig.SetDeleteValue('EditorOptions/Display/MarkupCurrentWordEnabled',
+      FMarkupCurWordEnabled, True);
+    XMLConfig.SetDeleteValue('EditorOptions/Display/MarkupCurrentWordTime',
+      FMarkupCurWordTime, 1500);
+
    // Code Tools options
    XMLConfig.SetDeleteValue('EditorOptions/CodeTools/AutoIdentifierCompletion'
      , fAutoIdentifierCompletion, True);
@ -2210,6 +2234,8 @@ end;

 procedure TEditorOptions.GetSynEditSettings(ASynEdit: TSynEdit);
 // read synedit settings from config file
+var
+  MarkCaret: TSynEditMarkupHighlightAllCaret;
 begin
  // general options
  ASynEdit.Options := fSynEditOptions;
@ -2252,6 +2278,12 @@ begin
  ASynEdit.MaxUndo := fUndoLimit;
  SetMarkupColors(ASynEdit.Highlighter, ASynEdit);

+  MarkCaret := TSynEditMarkupHighlightAllCaret(ASynEdit.MarkupByClass[TSynEditMarkupHighlightAllCaret]);
+  if assigned(MarkCaret) then begin
+    MarkCaret.Enabled := FMarkupCurWordEnabled;
+    MarkCaret.WaitTime := FMarkupCurWordTime;
+  end;
+
  // Code Folding
  ASynEdit.CFDividerDrawLevel := FCFDividerDrawLevel;

@ -2260,6 +2292,8 @@ end;

 procedure TEditorOptions.SetSynEditSettings(ASynEdit: TSynEdit);
 // copy settings from a synedit to the options
+var
+  MarkCaret: TSynEditMarkupHighlightAllCaret;
 begin
  // general options
  fSynEditOptions := ASynEdit.Options;
@ -2286,6 +2320,12 @@ begin
  fExtraLineSpacing := ASynEdit.ExtraLineSpacing;
  fDisableAntialiasing := (ASynEdit.Font.Quality = fqNonAntialiased);
  fUndoLimit := ASynEdit.MaxUndo;
+
+  MarkCaret := TSynEditMarkupHighlightAllCaret(ASynEdit.MarkupByClass[TSynEditMarkupHighlightAllCaret]);
+  if assigned(MarkCaret) then begin
+    FMarkupCurWordEnabled := MarkCaret.Enabled;
+    FMarkupCurWordTime := MarkCaret.WaitTime;
+  end;
 end;

 procedure TEditorOptions.AddSpecialHilightAttribsToHighlighter(
--- a/ide/frames/options_editor_codetools.lfm
+++ b/ide/frames/options_editor_codetools.lfm
@ -3,18 +3,19 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
  Width = 496
  ClientHeight = 440
  ClientWidth = 496
+  TabOrder = 0
  Visible = False
-  DesignLeft = 609
-  DesignTop = 243
+  DesignLeft = 92
+  DesignTop = 92
  object AutoDelayMaxLabel: TLabel[0]
    AnchorSideTop.Control = AutoDelayTrackBar
    AnchorSideTop.Side = asrBottom
    AnchorSideRight.Control = Owner
    AnchorSideRight.Side = asrBottom
-    Left = 400
-    Height = 14
+    Left = 390
+    Height = 16
    Top = 167
-    Width = 96
+    Width = 106
    Alignment = taRightJustify
    Anchors = [akTop, akRight]
    BorderSpacing.Top = 2
@ -26,9 +27,9 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
    AnchorSideTop.Control = AutoDelayTrackBar
    AnchorSideTop.Side = asrBottom
    Left = 0
-    Height = 14
+    Height = 16
    Top = 167
-    Width = 92
+    Width = 105
    BorderSpacing.Top = 2
    Caption = 'AutoDelayMinLabel'
    ParentColor = False
@ -38,73 +39,112 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
    AnchorSideTop.Control = AutoDelayTrackBar
    AnchorSideTop.Side = asrBottom
    Left = 0
-    Height = 14
+    Height = 16
    Top = 189
-    Width = 76
+    Width = 84
    BorderSpacing.Top = 24
    Caption = 'AutoDelayLabel'
    ParentColor = False
  end
-  object AutoIdentifierCompletionCheckBox: TCheckBox[3]
+  object MarkupWordMinLabel: TLabel[3]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = MarkupWordTimeTrackBar
+    AnchorSideTop.Side = asrBottom
+    Left = 0
+    Height = 16
+    Top = 278
+    Width = 149
+    BorderSpacing.Top = 2
+    Caption = 'MarkupWordDelayMinLabel'
+    ParentColor = False
+  end
+  object MarkupWordMaxLabel: TLabel[4]
+    AnchorSideTop.Control = MarkupWordTimeTrackBar
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 346
+    Height = 16
+    Top = 278
+    Width = 150
+    Alignment = taRightJustify
+    Anchors = [akTop, akRight]
+    BorderSpacing.Top = 2
+    Caption = 'MarkupWordDelayMaxLabel'
+    ParentColor = False
+  end
+  object MarkupWordDelayLabel: TLabel[5]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = MarkupWordTimeTrackBar
+    AnchorSideTop.Side = asrBottom
+    Left = 0
+    Height = 16
+    Top = 300
+    Width = 128
+    BorderSpacing.Top = 24
+    Caption = 'MarkupWordDelayLabel'
+    ParentColor = False
+  end
+  object AutoIdentifierCompletionCheckBox: TCheckBox[6]
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = Owner
    Left = 0
    Height = 19
    Top = 0
-    Width = 193
+    Width = 208
    Caption = 'AutoIdentifierCompletionCheckBox'
    TabOrder = 0
  end
-  object AutoRemoveEmptyMethodsOnSave: TCheckBox[4]
+  object AutoRemoveEmptyMethodsOnSave: TCheckBox[7]
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = AutoIdentifierCompletionCheckBox
    AnchorSideTop.Side = asrBottom
    Left = 0
    Height = 19
    Top = 25
-    Width = 197
+    Width = 210
    BorderSpacing.Top = 6
    Caption = 'AutoRemoveEmptyMethodsOnSave'
    TabOrder = 1
  end
-  object AutoToolTipSymbToolsCheckBox: TCheckBox[5]
+  object AutoToolTipSymbToolsCheckBox: TCheckBox[8]
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = AutoRemoveEmptyMethodsOnSave
    AnchorSideTop.Side = asrBottom
    Left = 0
    Height = 19
    Top = 50
-    Width = 181
+    Width = 198
    BorderSpacing.Top = 6
    Caption = 'AutoToolTipSymbToolsCheckBox'
    TabOrder = 2
  end
-  object AutoCodeParametersCheckBox: TCheckBox[6]
+  object AutoCodeParametersCheckBox: TCheckBox[9]
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = AutoToolTipSymbToolsCheckBox
    AnchorSideTop.Side = asrBottom
    Left = 0
    Height = 19
    Top = 75
-    Width = 176
+    Width = 185
    BorderSpacing.Top = 6
    Caption = 'AutoCodeParametersCheckBox'
    Enabled = False
    TabOrder = 3
  end
-  object AutoToolTipExprEvalCheckBox: TCheckBox[7]
+  object AutoToolTipExprEvalCheckBox: TCheckBox[10]
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = AutoCodeParametersCheckBox
    AnchorSideTop.Side = asrBottom
    Left = 0
    Height = 19
    Top = 100
-    Width = 172
+    Width = 182
    BorderSpacing.Top = 6
    Caption = 'AutoToolTipExprEvalCheckBox'
    TabOrder = 4
  end
-  object AutoDelayTrackBar: TTrackBar[8]
+  object AutoDelayTrackBar: TTrackBar[11]
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = AutoToolTipExprEvalCheckBox
    AnchorSideTop.Side = asrBottom
@ -123,4 +163,35 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
    Ctl3D = False
    TabOrder = 5
  end
+  object MarkupWordEnabledCheckBox: TCheckBox[12]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = AutoDelayLabel
+    AnchorSideTop.Side = asrBottom
+    Left = 0
+    Height = 19
+    Top = 211
+    Width = 184
+    BorderSpacing.Top = 6
+    Caption = 'MarkupWordEnabledCheckBox'
+    TabOrder = 6
+  end
+  object MarkupWordTimeTrackBar: TTrackBar[13]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = MarkupWordEnabledCheckBox
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 0
+    Height = 40
+    Top = 236
+    Width = 496
+    Frequency = 250
+    Max = 4000
+    Min = 500
+    Position = 500
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 6
+    Ctl3D = False
+    TabOrder = 7
+  end
 end
--- a/ide/frames/options_editor_codetools.lrs
+++ b/ide/frames/options_editor_codetools.lrs
@ -3,47 +3,72 @@
 LazarusResources.Add('TEditorCodetoolsOptionsFrame','FORMDATA',[
  'TPF0'#241#28'TEditorCodetoolsOptionsFrame'#27'EditorCodetoolsOptionsFrame'#6
  +'Height'#3#184#1#5'Width'#3#240#1#12'ClientHeight'#3#184#1#11'ClientWidth'#3
-  +#240#1#7'Visible'#8#10'DesignLeft'#3'a'#2#9'DesignTop'#3#243#0#0#242#2#0#6'T'
-  +'Label'#17'AutoDelayMaxLabel'#21'AnchorSideTop.Control'#7#17'AutoDelayTrackB'
-  +'ar'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'O'
-  +'wner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#144#1#6'Height'#2#14
-  +#3'Top'#3#167#0#5'Width'#2'`'#9'Alignment'#7#14'taRightJustify'#7'Anchors'#11
-  +#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#2#7'Caption'#6#17'AutoDelayMa'
-  +'xLabel'#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#17'AutoDelayMinLabel'#22'An'
-  +'chorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#17'AutoDelayTr'
-  +'ackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#14#3
-  +'Top'#3#167#0#5'Width'#2'\'#17'BorderSpacing.Top'#2#2#7'Caption'#6#17'AutoDe'
-  +'layMinLabel'#11'ParentColor'#8#0#0#242#2#2#6'TLabel'#14'AutoDelayLabel'#22
-  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#17'AutoDelay'
-  +'TrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#14#3
-  +'Top'#3#189#0#5'Width'#2'L'#17'BorderSpacing.Top'#2#24#7'Caption'#6#14'AutoD'
-  +'elayLabel'#11'ParentColor'#8#0#0#242#2#3#9'TCheckBox AutoIdentifierCompleti'
-  +'onCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
-  +#7#5'Owner'#4'Left'#2#0#6'Height'#2#19#3'Top'#2#0#5'Width'#3#193#0#7'Caption'
-  +#6' AutoIdentifierCompletionCheckBox'#8'TabOrder'#2#0#0#0#242#2#4#9'TCheckBo'
-  +'x'#28'AutoRemoveEmptyMethodsOnSave'#22'AnchorSideLeft.Control'#7#5'Owner'#21
-  +'AnchorSideTop.Control'#7' AutoIdentifierCompletionCheckBox'#18'AnchorSideTo'
-  +'p.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#19#3'Top'#2#25#5'Width'#3#197
-  +#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#28'AutoRemoveEmptyMethodsOnSave'#8
-  +'TabOrder'#2#1#0#0#242#2#5#9'TCheckBox'#28'AutoToolTipSymbToolsCheckBox'#22
-  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#28'AutoRemov'
-  +'eEmptyMethodsOnSave'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'He'
-  +'ight'#2#19#3'Top'#2'2'#5'Width'#3#181#0#17'BorderSpacing.Top'#2#6#7'Caption'
-  +#6#28'AutoToolTipSymbToolsCheckBox'#8'TabOrder'#2#2#0#0#242#2#6#9'TCheckBox'
-  +#26'AutoCodeParametersCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anc'
-  +'horSideTop.Control'#7#28'AutoToolTipSymbToolsCheckBox'#18'AnchorSideTop.Sid'
-  +'e'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#19#3'Top'#2'K'#5'Width'#3#176#0#17
-  +'BorderSpacing.Top'#2#6#7'Caption'#6#26'AutoCodeParametersCheckBox'#7'Enable'
-  +'d'#8#8'TabOrder'#2#3#0#0#242#2#7#9'TCheckBox'#27'AutoToolTipExprEvalCheckBo'
-  +'x'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#26'Aut'
-  +'oCodeParametersCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6
-  +'Height'#2#19#3'Top'#2'd'#5'Width'#3#172#0#17'BorderSpacing.Top'#2#6#7'Capti'
-  +'on'#6#27'AutoToolTipExprEvalCheckBox'#8'TabOrder'#2#4#0#0#242#2#8#9'TTrackB'
-  +'ar'#17'AutoDelayTrackBar'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSi'
-  +'deTop.Control'#7#27'AutoToolTipExprEvalCheckBox'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7
-  +#9'asrBottom'#4'Left'#2#0#6'Height'#2'('#3'Top'#2'}'#5'Width'#3#240#1#9'Freq'
-  +'uency'#3#250#0#3'Max'#3#160#15#3'Min'#3#244#1#8'Position'#3#244#1#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#5'Ctl3D'#8#8'T'
-  +'abOrder'#2#5#0#0#0
+  +#240#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#2'\'#9'DesignTop'#2'\'#0
+  +#242#2#0#6'TLabel'#17'AutoDelayMaxLabel'#21'AnchorSideTop.Control'#7#17'Auto'
+  +'DelayTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Con'
+  +'trol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#134#1#6
+  +'Height'#2#16#3'Top'#3#167#0#5'Width'#2'j'#9'Alignment'#7#14'taRightJustify'
+  +#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#2#7'Caption'#6
+  +#17'AutoDelayMaxLabel'#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#17'AutoDelayM'
+  +'inLabel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
+  +#17'AutoDelayTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'H'
+  +'eight'#2#16#3'Top'#3#167#0#5'Width'#2'i'#17'BorderSpacing.Top'#2#2#7'Captio'
+  +'n'#6#17'AutoDelayMinLabel'#11'ParentColor'#8#0#0#242#2#2#6'TLabel'#14'AutoD'
+  +'elayLabel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
+  +#17'AutoDelayTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'H'
+  +'eight'#2#16#3'Top'#3#189#0#5'Width'#2'T'#17'BorderSpacing.Top'#2#24#7'Capti'
+  +'on'#6#14'AutoDelayLabel'#11'ParentColor'#8#0#0#242#2#3#6'TLabel'#18'MarkupW'
+  +'ordMinLabel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
+  +#7#22'MarkupWordTimeTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+  +#0#6'Height'#2#16#3'Top'#3#22#1#5'Width'#3#149#0#17'BorderSpacing.Top'#2#2#7
+  +'Caption'#6#23'MarkupWordDelayMinLabel'#11'ParentColor'#8#0#0#242#2#4#6'TLab'
+  +'el'#18'MarkupWordMaxLabel'#21'AnchorSideTop.Control'#7#22'MarkupWordTimeTra'
+  +'ckBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5
+  +'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3'Z'#1#6'Height'#2#16
+  +#3'Top'#3#22#1#5'Width'#3#150#0#9'Alignment'#7#14'taRightJustify'#7'Anchors'
+  +#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#2#7'Caption'#6#23'MarkupWo'
+  +'rdDelayMaxLabel'#11'ParentColor'#8#0#0#242#2#5#6'TLabel'#20'MarkupWordDelay'
+  +'Label'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#22
+  +'MarkupWordTimeTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6
+  +'Height'#2#16#3'Top'#3','#1#5'Width'#3#128#0#17'BorderSpacing.Top'#2#24#7'Ca'
+  +'ption'#6#20'MarkupWordDelayLabel'#11'ParentColor'#8#0#0#242#2#6#9'TCheckBox'
+  +' AutoIdentifierCompletionCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+  +'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#0#6'Height'#2#19#3'Top'#2#0#5'W'
+  +'idth'#3#208#0#7'Caption'#6' AutoIdentifierCompletionCheckBox'#8'TabOrder'#2
+  +#0#0#0#242#2#7#9'TCheckBox'#28'AutoRemoveEmptyMethodsOnSave'#22'AnchorSideLe'
+  +'ft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7' AutoIdentifierCompletio'
+  +'nCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#19
+  +#3'Top'#2#25#5'Width'#3#210#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#28'Auto'
+  +'RemoveEmptyMethodsOnSave'#8'TabOrder'#2#1#0#0#242#2#8#9'TCheckBox'#28'AutoT'
+  +'oolTipSymbToolsCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSid'
+  +'eTop.Control'#7#28'AutoRemoveEmptyMethodsOnSave'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#2#0#6'Height'#2#19#3'Top'#2'2'#5'Width'#3#198#0#17'Borde'
+  +'rSpacing.Top'#2#6#7'Caption'#6#28'AutoToolTipSymbToolsCheckBox'#8'TabOrder'
+  +#2#2#0#0#242#2#9#9'TCheckBox'#26'AutoCodeParametersCheckBox'#22'AnchorSideLe'
+  +'ft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#28'AutoToolTipSymbToolsC'
+  +'heckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#19#3
+  +'Top'#2'K'#5'Width'#3#185#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#26'AutoCo'
+  +'deParametersCheckBox'#7'Enabled'#8#8'TabOrder'#2#3#0#0#242#2#10#9'TCheckBox'
+  +#27'AutoToolTipExprEvalCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'An'
+  +'chorSideTop.Control'#7#26'AutoCodeParametersCheckBox'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#19#3'Top'#2'd'#5'Width'#3#182#0#17'B'
+  +'orderSpacing.Top'#2#6#7'Caption'#6#27'AutoToolTipExprEvalCheckBox'#8'TabOrd'
+  +'er'#2#4#0#0#242#2#11#9'TTrackBar'#17'AutoDelayTrackBar'#22'AnchorSideLeft.C'
+  +'ontrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#27'AutoToolTipExprEvalCheckB'
+  +'ox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'O'
+  +'wner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2'('#3
+  +'Top'#2'}'#5'Width'#3#240#1#9'Frequency'#3#250#0#3'Max'#3#160#15#3'Min'#3#244
+  +#1#8'Position'#3#244#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'Bord'
+  +'erSpacing.Top'#2#6#5'Ctl3D'#8#8'TabOrder'#2#5#0#0#242#2#12#9'TCheckBox'#25
+  +'MarkupWordEnabledCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorS'
+  +'ideTop.Control'#7#14'AutoDelayLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#2#0#6'Height'#2#19#3'Top'#3#211#0#5'Width'#3#184#0#17'BorderSpacing.T'
+  +'op'#2#6#7'Caption'#6#25'MarkupWordEnabledCheckBox'#8'TabOrder'#2#6#0#0#242#2
+  +#13#9'TTrackBar'#22'MarkupWordTimeTrackBar'#22'AnchorSideLeft.Control'#7#5'O'
+  ,'wner'#21'AnchorSideTop.Control'#7#25'MarkupWordEnabledCheckBox'#18'AnchorSi'
+  +'deTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anchor'
+  +'SideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2'('#3'Top'#3#236#0#5
+  +'Width'#3#240#1#9'Frequency'#3#250#0#3'Max'#3#160#15#3'Min'#3#244#1#8'Positi'
+  +'on'#3#244#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.'
+  +'Top'#2#6#5'Ctl3D'#8#8'TabOrder'#2#7#0#0#0
 ]);
--- a/ide/frames/options_editor_codetools.pas
+++ b/ide/frames/options_editor_codetools.pas
@ -39,6 +39,11 @@ type
    AutoDelayTrackBar: TTrackBar;
    AutoIdentifierCompletionCheckBox: TCheckBox;
    AutoToolTipExprEvalCheckBox: TCheckBox;
+    MarkupWordDelayLabel: TLabel;
+    MarkupWordMaxLabel: TLabel;
+    MarkupWordMinLabel: TLabel;
+    MarkupWordEnabledCheckBox: TCheckBox;
+    MarkupWordTimeTrackBar: TTrackBar;
    AutoToolTipSymbToolsCheckBox: TCheckBox;
    AutoRemoveEmptyMethodsOnSave: TCheckBox;
  private
@ -71,6 +76,11 @@ begin
  AutoDelayLabel.Caption := dlgEdDelay;
  AutoDelayMinLabel.Caption := '0.5 ' + DlgTimeSecondUnit;
  AutoDelayMaxLabel.Caption := '4.0 ' + dlgTimeSecondUnit;
+
+  MarkupWordEnabledCheckBox.Caption := dlgMarkupWordEnabled;
+  MarkupWordDelayLabel.Caption := dlgEdDelay;
+  MarkupWordMinLabel.Caption := '0.5 ' + DlgTimeSecondUnit;;
+  MarkupWordMaxLabel.Caption := '4.0 ' + DlgTimeSecondUnit;;
 end;

 procedure TEditorCodetoolsOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
@ -83,6 +93,8 @@ begin
    AutoToolTipSymbToolsCheckBox.Checked := AutoToolTipSymbTools;
    AutoDelayTrackBar.Position := AutoDelayInMSec;
    AutoRemoveEmptyMethodsOnSave.Checked := AutoRemoveEmptyMethods;
+    MarkupWordEnabledCheckBox.Checked := MarkupCurWordEnabled;
+    MarkupWordTimeTrackBar.Position := MarkupCurWordTime;
  end;
 end;

@ -96,6 +108,8 @@ begin
    AutoToolTipSymbTools := AutoToolTipSymbToolsCheckBox.Checked;
    AutoDelayInMSec := AutoDelayTrackBar.Position;
    AutoRemoveEmptyMethods := AutoRemoveEmptyMethodsOnSave.Checked;
+    MarkupCurWordEnabled := MarkupWordEnabledCheckBox.Checked;
+    MarkupCurWordTime := MarkupWordTimeTrackBar.Position;
  end;
 end;

--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@ -1188,6 +1188,7 @@ resourcestring
  dlgEdCodeParams = 'Code parameters';
  dlgTooltipEval = 'Tooltip expression evaluation';
  dlgTooltipTools = 'Tooltip symbol Tools';
+  dlgMarkupWordEnabled = 'Highlight Current Word/Block';
  dlgAutoRemoveEmptyMethods = 'Auto remove empty methods';
  dlgEdDelay = 'Delay';
  dlgTimeSecondUnit = 'sec';