Updated SciLexer to v3.7.0 and added new features.

MarginCollection.Capacity will now allow an arbitrary number of margins.
MarginType.Color and Margin.BackColor can be used to specify custom
margin background colors. EdgeMode.MultiLine and
Scintilla.MultiEdgeAddLine can be used to add multiple long line
indicators. Couldn't get the new MouseWheelCaptures property to work so
that is curently commented out.

Author: jacobslusser

src/ScintillaNET.Signed.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>jacobslusser.ScintillaNET.Signed</id>
-    <version>3.5.11</version>
+    <version>3.6.0</version>
     <title>ScintillaNET Source Editing Component - Signed</title>
     <authors>Jacob Slusser</authors>
     <owners>Jacob Slusser</owners>

src/ScintillaNET.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>jacobslusser.ScintillaNET</id>
-    <version>3.5.11</version>
+    <version>3.6.0</version>
     <title>ScintillaNET Source Editing Component</title>
     <authors>Jacob Slusser</authors>
     <owners>Jacob Slusser</owners>

src/ScintillaNET/EdgeMode.cs

@@ -23,6 +23,12 @@ public enum EdgeMode
         /// <summary>
         /// Long lines are indicated with a background color.
         /// </summary>
-        Background = NativeMethods.EDGE_BACKGROUND
+        Background = NativeMethods.EDGE_BACKGROUND,
+
+        /// <summary>
+        /// Similar to <see cref="Line" /> except allows for multiple vertical lines to be visible using the <see cref="Scintilla.MultiEdgeAddLine" /> method.
+        /// </summary>
+        /// <remarks><see cref="Line" /> and <see cref="Scintilla.EdgeColumn" /> are completely independant of this mode.</remarks>
+        MultiLine = NativeMethods.EDGE_MULTILINE
     }
 }

src/ScintillaNET/Margin.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 
@@ -10,8 +11,36 @@ namespace ScintillaNET
     /// </summary>
     public class Margin
     {
+        #region Fields
+
         private readonly Scintilla scintilla;
 
+        #endregion Fields
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the background color of the margin when the <see cref="Type" /> property is set to <see cref="MarginType.Color" />.
+        /// </summary>
+        /// <returns>A Color object representing the margin background color. The default is Black.</returns>
+        /// <remarks>Alpha color values are ignored.</remarks>
+        public Color BackColor
+        {
+            get
+            {
+                var color = scintilla.DirectMessage(NativeMethods.SCI_GETMARGINBACKN, new IntPtr(Index)).ToInt32();
+                return ColorTranslator.FromWin32(color);
+            }
+            set
+            {
+                if (value.IsEmpty)
+                    value = Color.Black;
+
+                var color = ColorTranslator.ToWin32(value);
+                scintilla.DirectMessage(NativeMethods.SCI_SETMARGINBACKN, new IntPtr(Index), new IntPtr(color));
+            }
+        }
+
         /// <summary>
         /// Gets or sets the mouse cursor style when over the margin.
         /// </summary>
@@ -112,6 +141,10 @@ public uint Mask
             }
         }
 
+        #endregion Properties
+
+        #region Constructors
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Margin" /> class.
         /// </summary>
@@ -122,5 +155,7 @@ public Margin(Scintilla scintilla, int index)
             this.scintilla = scintilla;
             Index = index;
         }
+
+        #endregion Constructors
     }
 }

src/ScintillaNET/MarginCollection.cs

@@ -40,17 +40,38 @@ IEnumerator IEnumerable.GetEnumerator()
             return this.GetEnumerator();
         }
 
+        /// <summary>
+        /// Gets or sets the number of margins in the <see cref="MarginCollection" />.
+        /// </summary>
+        /// <returns>The number of margins in the collection. The default is 5.</returns>
+        [DefaultValue(NativeMethods.SC_MAX_MARGIN + 1)]
+        [Description("The maximum number of margins.")]
+        public int Capacity
+        {
+            get
+            {
+                return scintilla.DirectMessage(NativeMethods.SCI_GETMARGINS).ToInt32();
+            }
+            set
+            {
+                value = Helpers.ClampMin(value, 0);
+                scintilla.DirectMessage(NativeMethods.SCI_SETMARGINS, new IntPtr(value));
+            }
+        }
+
         /// <summary>
         /// Gets the number of margins in the <see cref="MarginCollection" />.
         /// </summary>
-        /// <returns>This property always returns 5.</returns>
+        /// <returns>The number of margins in the collection.</returns>
+        /// <remarks>This property is kept for convenience. The return value will always be equal to <see cref="Capacity" />.</remarks>
+        /// <seealso cref="Capacity" />
         [Browsable(false)]
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public int Count
         {
             get
             {
-                return (NativeMethods.SC_MAX_MARGIN + 1);
+                return Capacity;
             }
         }
 
@@ -73,6 +94,7 @@ public int Left
             }
         }
 
+        // TODO Why is this commented out?
         /*
         /// <summary>
         /// Gets or sets the margin options.

src/ScintillaNET/MarginType.cs

@@ -21,12 +21,12 @@ public enum MarginType
         Number = NativeMethods.SC_MARGIN_NUMBER,
 
         /// <summary>
-        /// Margin can display symbols and has a background color equivalent to the default style background color.
+        /// Margin can display symbols and has a background color equivalent to <see cref="Style.Default" /> background color.
         /// </summary>
         BackColor = NativeMethods.SC_MARGIN_BACK,
 
         /// <summary>
-        /// Margin can display symbols and has a background color equivalent to the default style foreground color.
+        /// Margin can display symbols and has a background color equivalent to <see cref="Style.Default"/> foreground color.
         /// </summary>
         ForeColor = NativeMethods.SC_MARGIN_FORE,
 
@@ -38,6 +38,11 @@ public enum MarginType
         /// <summary>
         /// Margin can display application defined text right-justified.
         /// </summary>
-        RightText = NativeMethods.SC_MARGIN_RTEXT
+        RightText = NativeMethods.SC_MARGIN_RTEXT,
+
+        /// <summary>
+        /// Margin can display symbols and has a background color specified using the <see cref="Margin.BackColor" /> property.
+        /// </summary>
+        Color = NativeMethods.SC_MARGIN_COLOUR
     }
 }

src/ScintillaNET/NativeMethods.cs

@@ -69,6 +69,7 @@ internal static class NativeMethods
         public const int EDGE_NONE = 0;
         public const int EDGE_LINE = 1;
         public const int EDGE_BACKGROUND = 2;
+        public const int EDGE_MULTILINE = 3;
 
         // Message-only window
         public const int HWND_MESSAGE = (-3);
@@ -179,6 +180,7 @@ internal static class NativeMethods
         public const int SC_MARGIN_FORE = 3;
         public const int SC_MARGIN_TEXT = 4;
         public const int SC_MARGIN_RTEXT = 5;
+        public const int SC_MARGIN_COLOUR = 6;
 
         public const int SC_MARGINOPTION_NONE = 0;
         public const int SC_MARGINOPTION_SUBLINESELECT = 1;
@@ -347,6 +349,10 @@ internal static class NativeMethods
         public const int SCI_GETMARGINSENSITIVEN = 2247;
         public const int SCI_SETMARGINCURSORN = 2248;
         public const int SCI_GETMARGINCURSORN = 2249;
+        public const int SCI_SETMARGINBACKN = 2250;
+        public const int SCI_GETMARGINBACKN = 2251;
+        public const int SCI_SETMARGINS = 2252;
+        public const int SCI_GETMARGINS = 2253;
         public const int SCI_STYLECLEARALL = 2050;
         public const int SCI_STYLESETFORE = 2051;
         public const int SCI_STYLESETBACK = 2052;
@@ -929,6 +935,10 @@ internal static class NativeMethods
         public const int SCI_GETTARGETTEXT = 2687;
         public const int SCI_SETIDLESTYLING = 2692;
         public const int SCI_GETIDLESTYLING = 2693;
+        public const int SCI_MULTIEDGEADDLINE = 2694;
+        public const int SCI_MULTIEDGECLEARALL = 2695;
+        public const int SCI_SETMOUSEWHEELCAPTURES = 2696;
+        public const int SCI_GETMOUSEWHEELCAPTURES = 2697;
         public const int SCI_STARTRECORD = 3001;
         public const int SCI_STOPRECORD = 3002;
         public const int SCI_SETLEXER = 4001;

src/ScintillaNET/Properties/AssemblyInfo.cs

@@ -35,9 +35,9 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.5.11.0")]
-[assembly: AssemblyFileVersion("3.5.11.0")]
-[assembly: AssemblyInformationalVersion("3.5.11")]
+[assembly: AssemblyVersion("3.6.0.0")]
+[assembly: AssemblyFileVersion("3.6.0.0")]
+[assembly: AssemblyInformationalVersion("3.6.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
 
 #if (DEBUG)

src/ScintillaNET/Scintilla.cs

@@ -1406,6 +1406,30 @@ public int MarkerLineFromHandle(MarkerHandle markerHandle)
             return DirectMessage(NativeMethods.SCI_MARKERLINEFROMHANDLE, markerHandle.Value).ToInt32();
         }
 
+        /// <summary>
+        /// Specifies the long line indicator column number and color when <see cref="EdgeMode" /> is <see cref="EdgeMode.MultiLine" />.
+        /// </summary>
+        /// <param name="column">The zero-based column number to indicate.</param>
+        /// <param name="edgeColor">The color of the vertical long line indicator.</param>
+        /// <remarks>A column is defined as the width of a space character in the <see cref="Style.Default" /> style.</remarks>
+        /// <seealso cref="MultiEdgeClearAll" />
+        public void MultiEdgeAddLine(int column, Color edgeColor)
+        {
+            column = Helpers.ClampMin(column, 0);
+            var colour = ColorTranslator.ToWin32(edgeColor);
+
+            DirectMessage(NativeMethods.SCI_MULTIEDGEADDLINE, new IntPtr(column), new IntPtr(colour));
+        }
+
+        /// <summary>
+        /// Removes all the long line column indicators specified using <seealso cref="MultiEdgeAddLine" />.
+        /// </summary>
+        /// <seealso cref="MultiEdgeAddLine" />
+        public void MultiEdgeClearAll()
+        {
+            DirectMessage(NativeMethods.SCI_MULTIEDGECLEARALL);
+        }
+
         /// <summary>
         /// Searches for all instances of the main selection within the <see cref="TargetStart" /> and <see cref="TargetEnd" />
         /// range and adds any matches to the selection.
@@ -4418,6 +4442,35 @@ public bool MouseSelectionRectangularSwitch
             }
         }
 
+        // The MouseWheelCaptures property doesn't seem to work correctly in Windows Forms so hiding for now...
+        // P.S. I'm avoiding the MouseDownCaptures property (SCI_SETMOUSEDOWNCAPTURES & SCI_GETMOUSEDOWNCAPTURES) for the same reason... I don't expect it to work in Windows Forms.
+
+        /* 
+        /// <summary>
+        /// Gets or sets whether to respond to mouse wheel messages if the control has focus but the mouse is not currently over the control.
+        /// </summary>
+        /// <returns>
+        /// true to respond to mouse wheel messages even when the mouse is not currently over the control; otherwise, false.
+        /// The default is true.
+        /// </returns>
+        /// <remarks>Scintilla will still react to the mouse wheel if the mouse pointer is over the editor window.</remarks>
+        [DefaultValue(true)]
+        [Category("Mouse")]
+        [Description("Enable or disable mouse wheel support when the mouse is outside the control bounds, but the control still has focus.")]
+        public bool MouseWheelCaptures
+        {
+            get
+            {
+                return DirectMessage(NativeMethods.SCI_GETMOUSEWHEELCAPTURES) != IntPtr.Zero;
+            }
+            set
+            {
+                var mouseWheelCaptures = (value ? new IntPtr(1) : IntPtr.Zero);
+                DirectMessage(NativeMethods.SCI_SETMOUSEWHEELCAPTURES, mouseWheelCaptures);
+            }
+        }
+        */
+
         /// <summary>
         /// Gets or sets whether multiple selection is enabled.
         /// </summary>

src/ScintillaNET/x64/SciLexer.dll

@@ -1 +1 @@
-367
+370

src/ScintillaNET/x64/SciLexer.dll.gz

@@ -1 +1 @@
-367
+370