Updated SciLexer to v3.7.1 and added new features.

Scintilla.TabDrawMode to change the appearance of visible tabs.
Scintilla.UsePopup overload for changing behavior of right-click.
Scintilla.FoldDisplayTextStyle, Line.ToggleFoldShowText and
Style.FoldDisplayText, for displaying fold text tags.
IndicatorStyle.Point and IndicatorStyle.PointCharacter.

Author: jacobslusser

README.md

@@ -14,7 +14,7 @@ ScintillaNET is in active development. If you find any issues or just have a que
 
 Compiled versions which are production ready can be downloaded from [NuGet](https://www.nuget.org/packages/jacobslusser.ScintillaNET) or the [Releases](https://github.com/jacobslusser/ScintillaNET/releases) page.
 
-For the latest and greatest you can build the [Master](https://github.com/jacobslusser/ScintillaNET/archive/master.zip) branch from source using Visual Studio 2013.
+For the latest and greatest you can build the [Master](https://github.com/jacobslusser/ScintillaNET/archive/master.zip) branch from source using Visual Studio 2015.
 
 ## Background
 

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.6.0</version>
+    <version>3.6.1</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.6.0</version>
+    <version>3.6.1</version>
     <title>ScintillaNET Source Editing Component</title>
     <authors>Jacob Slusser</authors>
     <owners>Jacob Slusser</owners>

src/ScintillaNET/FoldDisplayText.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ScintillaNET
+{
+    /// <summary>
+    /// Display options for fold text tags.
+    /// </summary>
+    public enum FoldDisplayText
+    {
+        /// <summary>
+        /// Do not display the text tags. This is the default.
+        /// </summary>
+        Hidden = NativeMethods.SC_FOLDDISPLAYTEXT_HIDDEN,
+
+        /// <summary>
+        /// Display the text tags.
+        /// </summary>
+        Standard = NativeMethods.SC_FOLDDISPLAYTEXT_STANDARD,
+
+        /// <summary>
+        /// Display the text tags with a box drawn around them.
+        /// </summary>
+        Boxed = NativeMethods.SC_FOLDDISPLAYTEXT_BOXED
+    }
+}

src/ScintillaNET/IndicatorStyle.cs

@@ -99,6 +99,16 @@ public enum IndicatorStyle
         /// <summary>
         /// An indicator that will change the foreground color of text to the foreground color of the indicator.
         /// </summary>
-        TextFore = NativeMethods.INDIC_TEXTFORE
+        TextFore = NativeMethods.INDIC_TEXTFORE,
+
+        /// <summary>
+        /// A triangle below the start of the indicator range.
+        /// </summary>
+        Point = NativeMethods.INDIC_POINT,
+
+        /// <summary>
+        /// A triangle below the center of the first character of the indicator range.
+        /// </summary>
+        PointCharacter = NativeMethods.INDIC_POINTCHARACTER
     }
 }

src/ScintillaNET/Line.cs

@@ -144,11 +144,32 @@ public int MarkerPrevious(uint markerMask)
         /// Toggles the folding state of the line; expanding or contracting all child lines.
         /// </summary>
         /// <remarks>The line must be set as a <see cref="ScintillaNET.FoldLevelFlags.Header" />.</remarks>
+        /// <seealso cref="ToggleFoldShowText"/>
         public void ToggleFold()
         {
             scintilla.DirectMessage(NativeMethods.SCI_TOGGLEFOLD, new IntPtr(Index));
         }
 
+        /// <summary>
+        /// Toggles the folding state of the line; expanding or contracting all child lines, and specifies the text tag to display to the right of the fold.
+        /// </summary>
+        /// <param name="text">The text tag to show to the right of the folded text.</param>
+        /// <remarks>The display of fold text tags are determined by the <see cref="Scintilla.FoldDisplayTextSetStyle" /> method.</remarks>
+        /// <seealso cref="Scintilla.FoldDisplayTextSetStyle" />
+        public unsafe void ToggleFoldShowText(string text)
+        {
+            if (string.IsNullOrEmpty(text))
+            {
+                scintilla.DirectMessage(NativeMethods.SCI_TOGGLEFOLDSHOWTEXT, new IntPtr(Index), IntPtr.Zero);
+            }
+            else
+            {
+                var bytes = Helpers.GetBytes(text, scintilla.Encoding, zeroTerminated: true);
+                fixed (byte* bp = bytes)
+                    scintilla.DirectMessage(NativeMethods.SCI_TOGGLEFOLDSHOWTEXT, new IntPtr(Index), new IntPtr(bp));
+            }
+        }
+
         #endregion Methods
 
         #region Properties

src/ScintillaNET/LineCollection.cs

@@ -8,6 +8,8 @@
 
 namespace ScintillaNET
 {
+    // TODO Revisit this following Scintilla v3.7.0 because is said to be better about character handling
+
     /// <summary>
     /// An immutable collection of lines of text in a <see cref="Scintilla" /> control.
     /// </summary>

src/ScintillaNET/NativeMethods.cs

@@ -93,6 +93,8 @@ internal static class NativeMethods
         public const int INDIC_COMPOSITIONTHIN = 15;
         public const int INDIC_FULLBOX = 16;
         public const int INDIC_TEXTFORE = 17;
+        public const int INDIC_POINT = 18;
+        public const int INDIC_POINTCHARACTER = 19;
         public const int INDIC_MAX = 31;
         public const int INDIC_CONTAINER = 8;
 
@@ -167,6 +169,11 @@ internal static class NativeMethods
         public const int SC_FOLDFLAG_LEVELNUMBERS = 0x0040;
         public const int SC_FOLDFLAG_LINESTATE = 0x0080;
 
+        // Fold display text
+        public const int SC_FOLDDISPLAYTEXT_HIDDEN = 0;
+        public const int SC_FOLDDISPLAYTEXT_STANDARD = 1;
+        public const int SC_FOLDDISPLAYTEXT_BOXED = 2;
+
         // Line end type
         public const int SC_LINE_END_TYPE_DEFAULT = 0;
         public const int SC_LINE_END_TYPE_UNICODE = 1;
@@ -859,6 +866,8 @@ internal static class NativeMethods
         public const int SCI_GETADDITIONALCARETSBLINK = 2568;
         public const int SCI_SETADDITIONALCARETSVISIBLE = 2608;
         public const int SCI_GETADDITIONALCARETSVISIBLE = 2609;
+        public const int SCI_GETTABDRAWMODE = 2698;
+        public const int SCI_SETTABDRAWMODE = 2699;
         public const int SCI_GETSELECTIONS = 2570;
         public const int SCI_GETSELECTIONEMPTY = 2650;
         public const int SCI_CLEARSELECTIONS = 2571;
@@ -939,6 +948,8 @@ internal static class NativeMethods
         public const int SCI_MULTIEDGECLEARALL = 2695;
         public const int SCI_SETMOUSEWHEELCAPTURES = 2696;
         public const int SCI_GETMOUSEWHEELCAPTURES = 2697;
+        public const int SCI_TOGGLEFOLDSHOWTEXT = 2700;
+        public const int SCI_FOLDDISPLAYTEXTSETSTYLE = 2701;
         public const int SCI_STARTRECORD = 3001;
         public const int SCI_STOPRECORD = 3002;
         public const int SCI_SETLEXER = 4001;
@@ -1024,6 +1035,12 @@ internal static class NativeMethods
         public const int SCN_FOCUSIN = 2028;
         public const int SCN_FOCUSOUT = 2029;
         public const int SCN_AUTOCCOMPLETED = 2030;
+        public const int SCN_MARGINRIGHTCLICK = 2031;
+
+        // Popup
+        public const int SC_POPUP_NEVER = 0;
+        public const int SC_POPUP_ALL = 1;
+        public const int SC_POPUP_TEXT = 2;
 
         // Line wrapping
         public const int SC_WRAP_NONE = 0;
@@ -1058,6 +1075,7 @@ internal static class NativeMethods
         public const int STYLE_CONTROLCHAR = 36;
         public const int STYLE_INDENTGUIDE = 37;
         public const int STYLE_CALLTIP = 38;
+        public const int STYLE_FOLDDISPLAYTEXT = 39;
         public const int STYLE_LASTPREDEFINED = 39;
         public const int STYLE_MAX = 255;
 
@@ -1073,6 +1091,10 @@ internal static class NativeMethods
         public const int SC_TECHNOLOGY_DIRECTWRITERETAIN = 2;
         public const int SC_TECHNOLOGY_DIRECTWRITEDC = 3;
 
+        // Tab draw
+        public const int SCTD_LONGARROW = 0;
+        public const int SCTD_STRIKEOUT = 1;
+
         // Undo
         public const int UNDO_MAY_COALESCE = 1;
 

src/ScintillaNET/PopupMode.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ScintillaNET
+{
+    /// <summary>
+    /// Behavior of the standard edit control context menu.
+    /// </summary>
+    /// <seealso cref="Scintilla.UsePopup(PopupMode)" />
+    public enum PopupMode
+    {
+        /// <summary>
+        /// Never show the default editing menu.
+        /// </summary>
+        Never = NativeMethods.SC_POPUP_NEVER,
+
+        /// <summary>
+        /// Show default editing menu if clicking on the control.
+        /// </summary>
+        All = NativeMethods.SC_POPUP_ALL,
+
+        /// <summary>
+        /// Show default editing menu only if clicking on text area.
+        /// </summary>
+        /// <remarks>To receive the <see cref="Scintilla.MarginRightClick" /> event, this value must be used.</remarks>
+        /// <seealso cref="Scintilla.MarginRightClick" />
+        Text = NativeMethods.SC_POPUP_TEXT
+    }
+}

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.6.0.0")]
-[assembly: AssemblyFileVersion("3.6.0.0")]
-[assembly: AssemblyInformationalVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1.0")]
+[assembly: AssemblyFileVersion("3.6.1.0")]
+[assembly: AssemblyInformationalVersion("3.6.1")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
 
 #if (DEBUG)

src/ScintillaNET/Scintilla.cs

@@ -48,6 +48,7 @@ public class Scintilla : Control
         private static readonly object savePointLeftEventKey = new object();
         private static readonly object changeAnnotationEventKey = new object();
         private static readonly object marginClickEventKey = new object();
+        private static readonly object marginRightClickEventKey = new object();
         private static readonly object charAddedEventKey = new object();
         private static readonly object autoCSelectionEventKey = new object();
         private static readonly object autoCCompletedEventKey = new object();
@@ -879,6 +880,17 @@ public void FoldAll(FoldAction action)
             DirectMessage(NativeMethods.SCI_FOLDALL, new IntPtr((int)action));
         }
 
+        /// <summary>
+        /// Changes the appearance of fold text tags.
+        /// </summary>
+        /// <param name="style">One of the <see cref="FoldDisplayText" /> enumeration values.</param>
+        /// <remarks>The text tag to display on a folded line can be set using <see cref="Line.ToggleFoldShowText" />.</remarks>
+        /// <seealso cref="Line.ToggleFoldShowText" />.
+        public void FoldDisplayTextSetStyle(FoldDisplayText style)
+        {
+            DirectMessage(NativeMethods.SCI_FOLDDISPLAYTEXTSETSTYLE, new IntPtr((int)style));
+        }
+
         /// <summary>
         /// Returns the character as the specified document position.
         /// </summary>
@@ -1719,6 +1731,17 @@ protected virtual void OnMarginClick(MarginClickEventArgs e)
                 handler(this, e);
         }
 
+        /// <summary>
+        /// Raises the <see cref="MarginRightClick" /> event.
+        /// </summary>
+        /// <param name="e">A <see cref="MarginClickEventArgs" /> that contains the event data.</param>
+        protected virtual void OnMarginRightClick(MarginClickEventArgs e)
+        {
+            var handler = Events[marginRightClickEventKey] as EventHandler<MarginClickEventArgs>;
+            if (handler != null)
+                handler(this, e);
+        }
+
         /// <summary>
         /// Raises the <see cref="ModifyAttempt" /> event.
         /// </summary>
@@ -2056,7 +2079,11 @@ private void ScnMarginClick(ref NativeMethods.SCNotification scn)
         {
             var keys = Keys.Modifiers & (Keys)(scn.modifiers << 16);
             var eventArgs = new MarginClickEventArgs(this, keys, scn.position, scn.margin);
-            OnMarginClick(eventArgs);
+
+            if (scn.nmhdr.code == NativeMethods.SCN_MARGINCLICK)
+                OnMarginClick(eventArgs);
+            else
+                OnMarginRightClick(eventArgs);
         }
 
         private void ScnModified(ref NativeMethods.SCNotification scn)
@@ -2631,12 +2658,23 @@ public void Undo()
         /// Determines whether to show the right-click context menu.
         /// </summary>
         /// <param name="enablePopup">true to enable the popup window; otherwise, false.</param>
+        /// <seealso cref="UsePopup(PopupMode)" />
         public void UsePopup(bool enablePopup)
         {
+            // NOTE: The behavior of UsePopup has changed in v3.7.1, however, this approach is still valid
             var bEnablePopup = (enablePopup ? new IntPtr(1) : IntPtr.Zero);
             DirectMessage(NativeMethods.SCI_USEPOPUP, bEnablePopup);
         }
 
+        /// <summary>
+        /// Determines the conditions for displaying the standard right-click context menu.
+        /// </summary>
+        /// <param name="popupMode">One of the <seealso cref="PopupMode" /> enumeration values.</param>
+        public void UsePopup(PopupMode popupMode)
+        {
+            DirectMessage(NativeMethods.SCI_USEPOPUP, new IntPtr((int)popupMode));
+        }
+
         private void WmDestroy(ref Message m)
         {
             // WM_DESTROY workaround
@@ -2698,6 +2736,7 @@ private void WmReflectNotify(ref Message m)
                         break;
 
                     case NativeMethods.SCN_MARGINCLICK:
+                    case NativeMethods.SCN_MARGINRIGHTCLICK:
                         ScnMarginClick(ref scn);
                         break;
 
@@ -4920,6 +4959,30 @@ public Status Status
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public StyleCollection Styles { get; private set; }
 
+        /// <summary>
+        /// Gets or sets how tab characters are represented when whitespace is visible.
+        /// </summary>
+        /// <returns>
+        /// One of the <see cref="ScintillaNET.TabDrawMode" /> enumeration values.
+        /// The default is <see cref="TabDrawMode.LongArrow" />.
+        /// </returns>
+        /// <seealso cref="ViewWhitespace" />
+        [DefaultValue(TabDrawMode.LongArrow)]
+        [Category("Whitespace")]
+        [Description("Style of visible tab characters.")]
+        public TabDrawMode TabDrawMode
+        {
+            get
+            {
+                return (TabDrawMode)DirectMessage(NativeMethods.SCI_GETTABDRAWMODE);
+            }
+            set
+            {
+                var tabDrawMode = (int)value;
+                DirectMessage(NativeMethods.SCI_SETTABDRAWMODE, new IntPtr(tabDrawMode));
+            }
+        }
+
         /// <summary>
         /// Gets or sets the width of a tab as a multiple of a space character.
         /// </summary>
@@ -5887,6 +5950,27 @@ public event EventHandler<MarginClickEventArgs> MarginClick
             }
         }
 
+
+        // TODO This isn't working in my tests. Could be Windows Forms interfering.
+        /// <summary>
+        /// Occurs when the mouse was right-clicked inside a margin that was marked as sensitive.
+        /// </summary>
+        /// <remarks>The <see cref="Margin.Sensitive" /> property and <see cref="PopupMode.Text" /> must be set for a margin to raise this event.</remarks>
+        /// <seealso cref="UsePopup(PopupMode)" />
+        [Category("Notifications")]
+        [Description("Occurs when the mouse is right-clicked in a sensitive margin.")]
+        public event EventHandler<MarginClickEventArgs> MarginRightClick
+        {
+            add
+            {
+                Events.AddHandler(marginRightClickEventKey, value);
+            }
+            remove
+            {
+                Events.RemoveHandler(marginRightClickEventKey, value);
+            }
+        }
+
         /// <summary>
         /// Occurs when a user attempts to change text while the document is in read-only mode.
         /// </summary>