Merge remote-tracking branch 'origin/topic/editorgateway_v1'

Author: kbilsted

.gitignore

@@ -108,3 +108,4 @@ UpgradeLog*.XML
 
 *.pyc
 
+Visual Studio Project Template C#/$projectname$.sln

Demo Plugin/NppManagedPluginDemo/Demo.cs

@@ -1,3 +1,4 @@
+// NPP plugin platform for .Net v0.90 by Kasper B. Graversen etc.
 using System;
 using System.IO;
 using System.Text;
@@ -8,37 +9,41 @@
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using Kbg.NppPluginNET;
+using Kbg.NppPluginNET.PluginInfrastructure;
 
 namespace Kbg.NppPluginNET
 {
-	/// <summary>
-	/// Integration layer as the demo app uses the pluginfiles as soft-links files.
-	/// This is different to normal plugins that would use the project template and get the files directly.
-	/// </summary>
-	class Main
-	{
-		static internal void CommandMenuInit()
-		{
-			Kbg.Demo.Namespace.Main.CommandMenuInit();
-		}
-
-		static internal void PluginCleanUp()
-		{
-			Kbg.Demo.Namespace.Main.PluginCleanUp();
-		}
-
-		static internal void SetToolBarIcon()
-		{
-			Kbg.Demo.Namespace.Main.SetToolBarIcon();
-		}
-
-        static internal void OnCharAdded(char newChar)
+    /// <summary>
+    /// Integration layer as the demo app uses the pluginfiles as soft-links files.
+    /// This is different to normal plugins that would use the project template and get the files directly.
+    /// </summary>
+    class Main
+    {
+        static internal void CommandMenuInit()
+        {
+            Kbg.Demo.Namespace.Main.CommandMenuInit();
+        }
+
+        static internal void PluginCleanUp()
+        {
+            Kbg.Demo.Namespace.Main.PluginCleanUp();
+        }
+
+        static internal void SetToolBarIcon()
         {
-            Kbg.Demo.Namespace.Main.doInsertHtmlCloseTag(newChar);
+            Kbg.Demo.Namespace.Main.SetToolBarIcon();
         }
 
-		internal static string PluginName { get { return Kbg.Demo.Namespace.Main.PluginName; }}
-	}
+        public static void OnNotification(ScNotification notification)
+        {
+            if (notification.Header.code == (uint)SciMsg.SCN_CHARADDED)
+            {
+                Kbg.Demo.Namespace.Main.doInsertHtmlCloseTag((char)notification.Character);
+            }
+        }
+
+        internal static string PluginName { get { return Kbg.Demo.Namespace.Main.PluginName; }}
+    }
 }
 
 namespace Kbg.Demo.Namespace
@@ -57,9 +62,12 @@ class Main
         static Bitmap tbBmp = Properties.Resources.star;
         static Bitmap tbBmp_tbTab = Properties.Resources.star_bmp;
         static Icon tbIcon = null;
+        static IScintillaGateway editor = new ScintillaGateway(PluginBase.GetCurrentScintilla());
+        static INotepadPPGateway notepad = new NotepadPPGateway();
         #endregion
 
         #region " Startup/CleanUp "
+
         static internal void CommandMenuInit()
         {
             // Initialization of your plugin commands
@@ -140,43 +148,44 @@ static internal void PluginCleanUp()
         #region " Menu functions "
         static void hello()
         {
-            // Open a new document
-            Win32.SendMessage(PluginBase.nppData._nppHandle, NppMsg.NPPM_MENUCOMMAND, 0, NppMenuCmd.IDM_FILE_NEW);
-            // Say hello now :
-            // Scintilla control has no Unicode mode, so we use ANSI here (marshalled as ANSI by default)
-            Win32.SendMessage(PluginBase.GetCurrentScintilla(), SciMsg.SCI_SETTEXT, 0, "Hello, Notepad++... from .NET!");
+            notepad.FileNew();
+            editor.SetText("Hello, Notepad++...from.NET!");
+            var rest = editor.GetLine(0);
+            editor.SetText(rest+rest+rest);
         }
+
         static void helloFX()
         {
             hello();
             new Thread(callbackHelloFX).Start();
         }
+
         static void callbackHelloFX()
         {
-            IntPtr curScintilla = PluginBase.GetCurrentScintilla();
-            int currentZoomLevel = (int)Win32.SendMessage(curScintilla, SciMsg.SCI_GETZOOM, 0, 0);
+            int currentZoomLevel = editor.GetZoom();
             int i = currentZoomLevel;
             for (int j = 0 ; j < 4 ; j++)
             {    
                 for ( ; i >= -10; i--)
                 {
-                    Win32.SendMessage(curScintilla, SciMsg.SCI_SETZOOM, i, 0);
+                    editor.SetZoomLevel(i);
                     Thread.Sleep(30);
                 }
                 Thread.Sleep(100);
                 for ( ; i <= 20 ; i++)
                 {
                     Thread.Sleep(30);
-                    Win32.SendMessage(curScintilla, SciMsg.SCI_SETZOOM, i, 0);
+                    editor.SetZoomLevel(i);
                 }
                 Thread.Sleep(100);
             }
             for ( ; i >= currentZoomLevel ; i--)
             {
                 Thread.Sleep(30);
-                Win32.SendMessage(curScintilla, SciMsg.SCI_SETZOOM, i, 0);
+                editor.SetZoomLevel(i);
             }
         }
+
         static void WhatIsNpp()
         {
             string text2display = "Notepad++ is a free (as in \"free speech\" and also as in \"free beer\") " +
@@ -189,27 +198,19 @@ static void WhatIsNpp()
                 "and reduce power consumption, resulting in a greener environment.";
             new Thread(new ParameterizedThreadStart(callbackWhatIsNpp)).Start(text2display);
         }
+
         static void callbackWhatIsNpp(object data)
         {
             string text2display = (string)data;
-            // Open a new document
-            Win32.SendMessage(PluginBase.nppData._nppHandle, NppMsg.NPPM_MENUCOMMAND, 0, NppMenuCmd.IDM_FILE_NEW);
-
-            // Get the current scintilla
-            IntPtr curScintilla = PluginBase.GetCurrentScintilla();
+            notepad.FileNew();
 
             Random srand = new Random(DateTime.Now.Millisecond);
             int rangeMin = 0;
             int rangeMax = 250;
             for (int i = 0; i < text2display.Length; i++)
             {
-                StringBuilder charToShow = new StringBuilder(text2display[i].ToString());
-
-                int ranNum = srand.Next(rangeMin, rangeMax);
-                Thread.Sleep(ranNum + 30);
-
-                Win32.SendMessage(curScintilla, SciMsg.SCI_APPENDTEXT, 1, charToShow);
-                Win32.SendMessage(curScintilla, SciMsg.SCI_GOTOPOS, (int)Win32.SendMessage(curScintilla, SciMsg.SCI_GETLENGTH, 0, 0), 0);
+                Thread.Sleep(srand.Next(rangeMin, rangeMax) + 30);
+                editor.AppendTextAndMoveCursor(text2display[i].ToString());
             }
         }
 
@@ -236,7 +237,7 @@ static void insertCurrentPath(NppMsg which)
             StringBuilder path = new StringBuilder(Win32.MAX_PATH);
             Win32.SendMessage(PluginBase.nppData._nppHandle, msg, 0, path);
 
-            Win32.SendMessage(PluginBase.GetCurrentScintilla(), SciMsg.SCI_REPLACESEL, 0, path);
+            editor.ReplaceSel(path.ToString());
         }
 
         static void insertShortDateTime()
@@ -249,10 +250,8 @@ static void insertLongDateTime()
         }
         static void insertDateTime(bool longFormat)
         {
-            string dateTime = string.Format("{0} {1}", 
-                DateTime.Now.ToShortTimeString(),
-                longFormat ? DateTime.Now.ToLongDateString() : DateTime.Now.ToShortDateString());
-            Win32.SendMessage(PluginBase.GetCurrentScintilla(), SciMsg.SCI_REPLACESEL, 0, dateTime);
+            string dateTime = string.Format("{0} {1}", DateTime.Now.ToShortTimeString(), longFormat ? DateTime.Now.ToLongDateString() : DateTime.Now.ToShortDateString());
+            editor.ReplaceSel(dateTime);
         }
 
         static void checkInsertHtmlCloseTag()
@@ -262,59 +261,62 @@ static void checkInsertHtmlCloseTag()
             int i = Win32.CheckMenuItem(Win32.GetMenu(PluginBase.nppData._nppHandle), PluginBase._funcItems.Items[9]._cmdID,
                 Win32.MF_BYCOMMAND | (doCloseTag ? Win32.MF_CHECKED : Win32.MF_UNCHECKED));
         }
+
+        static Regex regex = new Regex(@"[\._\-:\w]", RegexOptions.Compiled);
+
         static internal void doInsertHtmlCloseTag(char newChar)
         {
             LangType docType = LangType.L_TEXT;
             Win32.SendMessage(PluginBase.nppData._nppHandle, NppMsg.NPPM_GETCURRENTLANGTYPE, 0, ref docType);
             bool isDocTypeHTML = (docType == LangType.L_HTML || docType == LangType.L_XML || docType == LangType.L_PHP);
-            if (doCloseTag && isDocTypeHTML)
+
+            if (!doCloseTag || !isDocTypeHTML)
+                return;
+
+            if (newChar != '>')
+                return;
+
+            int bufCapacity = 512;
+            var pos = editor.GetCurrentPos();
+            int currentPos = pos.Value;
+            int beginPos = currentPos - (bufCapacity - 1);
+            int startPos = (beginPos > 0) ? beginPos : 0;
+            int size = currentPos - startPos;
+
+            if (size < 3)
+                return;
+
+            using (TextRange tr = new TextRange(startPos, currentPos, bufCapacity))
             {
-                if (newChar == '>')
+                editor.GetTextRange(tr);
+                string buf = tr.lpstrText;
+
+                if (buf[size - 2] == '/')
+                    return;
+
+                int pCur = size - 2;
+                while ((pCur > 0) && (buf[pCur] != '<') && (buf[pCur] != '>'))
+                    pCur--;
+
+                if (buf[pCur] == '<')
                 {
-                    int bufCapacity = 512;
-                    IntPtr hCurrentEditView = PluginBase.GetCurrentScintilla();
-                    int currentPos = (int)Win32.SendMessage(hCurrentEditView, SciMsg.SCI_GETCURRENTPOS, 0, 0);
-                    int beginPos = currentPos - (bufCapacity - 1);
-                    int startPos = (beginPos > 0) ? beginPos : 0;
-                    int size = currentPos - startPos;
-
-                    if (size >= 3)
+                    pCur++;
+
+                    var insertString = new StringBuilder("</");
+
+                    while (regex.IsMatch(buf[pCur].ToString()))
+                    {
+                        insertString.Append(buf[pCur]);
+                        pCur++;
+                    }
+                    insertString.Append('>');
+
+                    if (insertString.Length > 3)
                     {
-                        using (Sci_TextRange tr = new Sci_TextRange(startPos, currentPos, bufCapacity))
-                        {
-                            Win32.SendMessage(hCurrentEditView, SciMsg.SCI_GETTEXTRANGE, 0, tr.NativePointer);
-                            string buf = tr.lpstrText;
-
-                            if (buf[size - 2] != '/')
-                            {
-                                StringBuilder insertString = new StringBuilder("</");
-
-                                int pCur = size - 2;
-                                for (; (pCur > 0) && (buf[pCur] != '<') && (buf[pCur] != '>'); )
-                                    pCur--;
-
-                                if (buf[pCur] == '<')
-                                {
-                                    pCur++;
-
-                                    Regex regex = new Regex(@"[\._\-:\w]");
-                                    while (regex.IsMatch(buf[pCur].ToString()))
-                                    {
-                                        insertString.Append(buf[pCur]);
-                                        pCur++;
-                                    }
-                                    insertString.Append('>');
-
-                                    if (insertString.Length > 3)
-                                    {
-                                        Win32.SendMessage(hCurrentEditView, SciMsg.SCI_BEGINUNDOACTION, 0, 0);
-                                        Win32.SendMessage(hCurrentEditView, SciMsg.SCI_REPLACESEL, 0, insertString);
-                                        Win32.SendMessage(hCurrentEditView, SciMsg.SCI_SETSEL, currentPos, currentPos);
-                                        Win32.SendMessage(hCurrentEditView, SciMsg.SCI_ENDUNDOACTION, 0, 0);
-                                    }
-                                }
-                            }
-                        }
+                        editor.BeginUndoAction();
+                        editor.ReplaceSel(insertString.ToString());
+                        editor.SetSel(pos, pos);
+                        editor.EndUndoAction();
                     }
                 }
             }
@@ -363,7 +365,7 @@ static void DockableDlgDemo()
             // You can create your own non dockable dialog - in this case you don't nedd this demonstration.
             if (frmGoToLine == null)
             {
-                frmGoToLine = new frmGoToLine();
+                frmGoToLine = new frmGoToLine(editor);
 
                 using (Bitmap newBmp = new Bitmap(16, 16))
                 {

Demo Plugin/NppManagedPluginDemo/Forms/frmGoToLine.cs

@@ -1,24 +1,28 @@
 using System;
 using System.Windows.Forms;
 using Kbg.NppPluginNET;
+using Kbg.NppPluginNET.PluginInfrastructure;
 
 namespace Kbg.Demo.Namespace
 {
-	partial class frmGoToLine : Form
+    partial class frmGoToLine : Form
     {
-        public frmGoToLine()
+        private readonly IScintillaGateway editor;
+
+        public frmGoToLine(IScintillaGateway editor)
         {
+            this.editor = editor;
             InitializeComponent();
         }
 
         private void button1_Click(object sender, EventArgs e)
         {
             int line;
-            if (!int.TryParse(textBox1.Text, out line)) return;
-            IntPtr curScintilla = PluginBase.GetCurrentScintilla();
-			Win32.SendMessage(curScintilla, SciMsg.SCI_ENSUREVISIBLE, line - 1, 0);
-            Win32.SendMessage(curScintilla, SciMsg.SCI_GOTOLINE, line - 1, 0);
-            Win32.SendMessage(curScintilla, SciMsg.SCI_GRABFOCUS, 0, 0);
+            if (!int.TryParse(textBox1.Text, out line))
+                return;
+            editor.EnsureVisible(line - 1);
+            editor.GotoLine(line - 1);
+            editor.GrabFocus();
         }
 
         private void frmGoToLine_KeyDown(object sender, KeyEventArgs e)
@@ -30,7 +34,7 @@ private void frmGoToLine_KeyDown(object sender, KeyEventArgs e)
             }
             else if (e.KeyData == Keys.Escape)
             {
-                Win32.SendMessage(PluginBase.GetCurrentScintilla(), SciMsg.SCI_GRABFOCUS, 0, 0);
+                editor.GrabFocus();
             }
             else if (e.KeyCode == Keys.Tab)
             {
@@ -51,11 +55,11 @@ private void textBox1_KeyPress(object sender, KeyPressEventArgs e)
 
         void FrmGoToLineVisibleChanged(object sender, EventArgs e)
         {
-        	if (!Visible)
-        	{
+            if (!Visible)
+            {
                 Win32.SendMessage(PluginBase.nppData._nppHandle, NppMsg.NPPM_SETMENUITEMCHECK,
                                   PluginBase._funcItems.Items[Main.idFrmGotToLine]._cmdID, 0);
-        	}
+            }
         }
     }
 }