From 82e965f5ef306a386c611cde01f826de00a3f332 Mon Sep 17 00:00:00 2001
From: martin <laz.git@mfriebe.de>
Date: Thu, 16 May 2013 00:01:52 +0000
Subject: [PATCH] SynEdit: Ifdef Markup: EditorOptions (still in ifdef)

git-svn-id: trunk@41219 -
---
 ide/editoroptions.pp        | 32 +++++++++++++++++++++++++++-----
 ide/lazarusidestrconsts.pas |  1 +
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ide/editoroptions.pp b/ide/editoroptions.pp
index 8a21afcfbf..6bad8911a5 100644
--- a/ide/editoroptions.pp
+++ b/ide/editoroptions.pp
@@ -59,7 +59,7 @@ uses
   SynHighlighterPas, SynHighlighterPerl, SynHighlighterPHP, SynHighlighterSQL,
   SynHighlighterPython, SynHighlighterUNIXShellScript, SynHighlighterXML,
   SynHighlighterJScript, SynHighlighterDiff, SynHighlighterBat, SynHighlighterIni,
-  SynHighlighterPo,
+  SynHighlighterPo, SynEditMarkupIfDef,
   // codetools
   LinkScanner, CodeToolManager,
   // IDEIntf
@@ -99,7 +99,11 @@ type
      ahaTemplateEditOther, ahaSyncroEditCur,      ahaSyncroEditSync,
      ahaSyncroEditOther,   ahaSyncroEditArea,     ahaGutterSeparator,
      ahaGutter,            ahaRightMargin,        ahaSpecialVisibleChars,
-     ahaTopInfoHint);
+     ahaTopInfoHint
+{$IFDEF WithSynMarkupIfDef}
+     ,       ahaIfDefBlockInactive
+{$ENDIF}
+     );
 
   TAhaGroupName = (agnDefault, agnLanguage, agnText, agnLine, agnGutter, agnTemplateMode, agnSyncronMode);
 
@@ -135,7 +139,10 @@ const
     '', // ahaGutter
     '',  // ahaRightMargin
     '',  // ahaSpecialVisibleChars
-    ''   // ahaTopInfoHint
+    ''  // ahaTopInfoHint
+{$IFDEF WithSynMarkupIfDef}
+,    ''
+{$ENDIF}
   );
 
   ahaGroupMap: array[TAdditionalHilightAttribute] of TAhaGroupName = (
@@ -169,7 +176,11 @@ const
     { ahaGutter }              agnGutter,
     { ahaRightMargin}          agnGutter,
     { ahaSpecialVisibleChars } agnText,
-    { ahaTopInfoHint }    agnLine
+    { ahaTopInfoHint }         agnLine
+{$IFDEF WithSynMarkupIfDef}
+    ,
+    { ahaIfDefBlockInactive }  agnText
+{$ENDIF}
   );
   ahaSupportedFeatures: array[TAdditionalHilightAttribute] of TColorSchemeAttributeFeatures =
   (
@@ -203,7 +214,11 @@ const
     { ahaGutter }             [hafBackColor],
     { ahaRightMargin}         [hafForeColor],
     { ahaSpecialVisibleChars }[hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask],
-    { ahaTopInfoHint }   [hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask]
+    { ahaTopInfoHint }        [hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask]
+{$IFDEF WithSynMarkupIfDef}
+    ,
+    { ahaIfDefBlockInactive } [hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask]
+{$ENDIF}
   );
 
 
@@ -2471,6 +2486,9 @@ begin
   AdditionalHighlightAttributes[ahaRightMargin]         := dlgRightMargin;
   AdditionalHighlightAttributes[ahaSpecialVisibleChars] := dlgAddHiSpecialVisibleChars;
   AdditionalHighlightAttributes[ahaTopInfoHint]         := dlgTopInfoHint;
+{$IFDEF WithSynMarkupIfDef}
+  AdditionalHighlightAttributes[ahaIfDefBlockInactive]  := dlgIfDefBlockInactive;
+{$ENDIF}
 
   AdditionalHighlightGroupNames[agnDefault]      := dlgAddHiAttrGroupDefault;
   AdditionalHighlightGroupNames[agnText]         := dlgAddHiAttrGroupText;
@@ -6139,11 +6157,15 @@ begin
     SetMarkupColorByClass(ahaHighlightWord, TSynEditMarkupHighlightAllCaret);
     SetMarkupColorByClass(ahaWordGroup,     TSynEditMarkupWordGroup);
     SetMarkupColorByClass(ahaSpecialVisibleChars, TSynEditMarkupSpecialChar);
+{$IFDEF WithSynMarkupIfDef}
+    SetMarkupColorByClass(ahaIfDefBlockInactive, TSynEditMarkupIfDef);
+{$ENDIF}
     SetGutterColorByClass(ahaLineNumber,      TSynGutterLineNumber);
     SetGutterColorByClass(ahaModifiedLine,    TSynGutterChanges);
     SetGutterColorByClass(ahaCodeFoldingTree, TSynGutterCodeFolding);
     SetGutterColorByClass(ahaGutterSeparator, TSynGutterSeparator);
 
+
     i := aSynEdit.PluginCount - 1;
     while (i >= 0) and not(aSynEdit.Plugin[i] is TSynPluginTemplateEdit) do
       dec(i);
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 761c9d8e68..360c68c0c0 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -1831,6 +1831,7 @@ resourcestring
   dlgAddHiAttrGutterSeparator     = 'Gutter Separator';
   dlgAddHiSpecialVisibleChars     = 'Visualized Special Chars';
   dlgTopInfoHint                  = 'Current Class/Proc Hint';
+  dlgIfDefBlockInactive           = 'Inactive $IFDEF code';
 
   dlgAddHiAttrGroupDefault  = 'Global';
   dlgAddHiAttrGroupText     = 'Text';