Merge branch 'basic-improvements-after-dogfooding_1'

Author: kbilsted

Demo Plugin/NppManagedPluginDemo/Demo.cs

@@ -1,4 +1,4 @@
-// NPP plugin platform for .Net v0.90 by Kasper B. Graversen etc.
+// NPP plugin platform for .Net v0.91.52 by Kasper B. Graversen etc.
 using System;
 using System.IO;
 using System.Text;
@@ -36,7 +36,7 @@ static internal void SetToolBarIcon()
 
         public static void OnNotification(ScNotification notification)
         {
-            if (notification.Header.code == (uint)SciMsg.SCN_CHARADDED)
+            if (notification.Header.Code == (uint)SciMsg.SCN_CHARADDED)
             {
                 Kbg.Demo.Namespace.Main.doInsertHtmlCloseTag((char)notification.Character);
             }
@@ -168,21 +168,21 @@ static void callbackHelloFX()
             {    
                 for ( ; i >= -10; i--)
                 {
-                    editor.SetZoomLevel(i);
+                    editor.SetZoom(i);
                     Thread.Sleep(30);
                 }
                 Thread.Sleep(100);
                 for ( ; i <= 20 ; i++)
                 {
                     Thread.Sleep(30);
-                    editor.SetZoomLevel(i);
+                    editor.SetZoom(i);
                 }
                 Thread.Sleep(100);
             }
             for ( ; i >= currentZoomLevel ; i--)
             {
                 Thread.Sleep(30);
-                editor.SetZoomLevel(i);
+                editor.SetZoom(i);
             }
         }
 

Demo Plugin/NppManagedPluginDemo/NppManagedPluginDemo.VS2015.csproj

@@ -12,7 +12,7 @@
     <AssemblyName>Demo</AssemblyName>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>

README.md

@@ -2,6 +2,12 @@
 
 This is a fork of UFO's plugin package updated for VS2015
 
+[![Build status](https://ci.appveyor.com/api/projects/status/5f0ui9y2ujugh6wt/branch/master?svg=true)](https://ci.appveyor.com/project/kbilsted/notepadpluspluspluginpack-net/branch/master)
+[![License](http://img.shields.io/badge/License-Apache_2-red.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
+[![Stats](https://img.shields.io/badge/Code_lines-5,0_K-ff69b4.svg)]()
+[![Stats](https://img.shields.io/badge/Doc_lines-3,1_K-ff69b4.svg)]()
+
+
 ## Getting started
   1. Download a [release](https://github.com/kbilsted/NotepadPlusPlusPluginPack.Net/releases/) and unzip it
   2. Place the visual studio project template (the `Visual Studio Project Template C#\NppPlugin.zip`) in the visual studio path (typically `"My Documents\Visual Studio 2015\Templates\ProjectTemplates\Visual C#\"` but see [instructions](https://github.com/kbilsted/NotepadPlusPlusPluginPack.Net/blob/master/Visual%20Studio%20Project%20Template%20C%23/HOW-TO-INSTALL-ME.txt) inside the release)
@@ -65,6 +71,11 @@ From v1.0 and onwards we will turn over to semantic versioning
     * Robert Giesecke: http://sites.google.com/site/robertgiesecke/Home/uploads/csharpprojecttemplateforunmanagedexports https://www.nuget.org/packages/UnmanagedExports
 
 
+## Requirements:
+  * works with .NET Runtime 3.5 and above (can easily be reduced to .Net runtime 2.0 if needed)
+  * UNICODE plugins only.
+
+
 ## About me
 
-I blog at http://firstclassthoughts.co.uk/ on code readability and quality
+I blog at http://firstclassthoughts.co.uk/ on code readability and quality

Visual Studio Project Template C#/Main.cs

@@ -22,6 +22,14 @@ class Main
 
         public static void OnNotification(ScNotification notification)
         {  
+            // This method is invoked whenever something is happening in notepad++
+            // use eg. as
+            // if (notification.Header.Code == (uint)NppMsg.NPPN_xxx)
+            // { ... }
+            // or
+            //
+            // if (notification.Header.Code == (uint)SciMsg.SCNxxx)
+            // { ... }
         }
 
         internal static void CommandMenuInit()

Visual Studio Project Template C#/PluginInfrastructure/ClikeStringArray.cs

@@ -1,4 +1,4 @@
-// NPP plugin platform for .Net v0.90 by Kasper B. Graversen etc.
+// NPP plugin platform for .Net v0.91.52 by Kasper B. Graversen etc.
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;

Visual Studio Project Template C#/PluginInfrastructure/DllExport/DllExportAttribute.cs

@@ -1,4 +1,4 @@
-// NPP plugin platform for .Net v0.90 by Kasper B. Graversen etc.
+// NPP plugin platform for .Net v0.91.52 by Kasper B. Graversen etc.
 using System;
 using System.Runtime.InteropServices;
 

Visual Studio Project Template C#/PluginInfrastructure/Docking_h.cs

@@ -1,4 +1,4 @@
-// NPP plugin platform for .Net v0.90 by Kasper B. Graversen etc.
+// NPP plugin platform for .Net v0.91.52 by Kasper B. Graversen etc.
 //
 // This file should stay in sync with the CPP project file
 // "notepad-plus-plus/PowerEditor/src/WinControls/DockingWnd/Docking.h"

Visual Studio Project Template C#/PluginInfrastructure/GatewayDomain.cs

@@ -1,4 +1,4 @@
-// NPP plugin platform for .Net v0.90 by Kasper B. Graversen etc.
+// NPP plugin platform for .Net v0.91.52 by Kasper B. Graversen etc.
 using System;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -88,15 +88,39 @@ public int Value
 
         public static bool operator ==(Position a, Position b)
         {
-            return a.pos == b.pos;
+            return ReferenceEquals(a, b) || a.pos == b.pos;
         }
 
         public static bool operator !=(Position a, Position b)
         {
             return !(a == b);
         }
 
-        public override string ToString()
+        public static bool operator >(Position a, Position b)
+        {
+            return a.Value > b.Value;
+        }
+
+        public static bool operator <(Position a, Position b)
+        {
+            return a.Value < b.Value;
+        }
+
+        public static Position Min(Position a, Position b)
+        {
+            if (a < b)
+                return a;
+            return b;
+        }
+
+		public static Position Max(Position a, Position b)
+		{
+			if (a > b)
+				return a;
+			return b;
+		}
+
+		public override string ToString()
         {
             return "Postion: " + pos;
         }
@@ -238,7 +262,7 @@ public void Dispose()
     }
 
 
-	/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
-	/* --Autogenerated -- end of section automatically generated from Scintilla.iface */
+    /* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
+    /* --Autogenerated -- end of section automatically generated from Scintilla.iface */
 
 }

Visual Studio Project Template C#/PluginInfrastructure/IScintillaGateway.cs

@@ -1,4 +1,4 @@
-// NPP plugin platform for .Net v0.90 by Kasper B. Graversen etc.
+// NPP plugin platform for .Net v0.91.52 by Kasper B. Graversen etc.
 using System;
 using Kbg.NppPluginNET.PluginInfrastructure;
 
@@ -9,20 +9,17 @@ public interface INotepadPPGateway
         void FileNew();
     }
 
-	/// <summary>
-	/// This it the plugin-writers primary interface to Notepad++/Scintilla.
-	/// It takes away all the complexity with command numbers and Int-pointer casting.
-	///
-	/// See http://www.scintilla.org/ScintillaDoc.html for further details.
-	/// </summary>
-	public interface IScintillaGateway
+    /// <summary>
+    /// This it the plugin-writers primary interface to Notepad++/Scintilla.
+    /// It takes away all the complexity with command numbers and Int-pointer casting.
+    ///
+    /// See http://www.scintilla.org/ScintillaDoc.html for further details.
+    /// </summary>
+    public interface IScintillaGateway
     {
         int GetSelectionLength();
-        void SetZoomLevel(int zoomLevel);
-        unsafe string GetSelectedText();
-        unsafe void ReplaceSelectedText(string newText);
-        unsafe void AppendTextAndMoveCursor(string text);
-
+        void AppendTextAndMoveCursor(string text);
+        void InsertTextAndMoveCursor(string text);
 
 
         /* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
@@ -2305,7 +2302,7 @@ public interface IScintillaGateway
         /// <summary>Move the selected lines down one line, shifting the line below before the selection (Scintilla feature 2621)</summary>
         void MoveSelectedLinesDown();
 
-        /// <summary>Set the identifier reported as idFrom in notification messages. (Scintilla feature 2622)</summary>
+        /// <summary>Set the identifier reported as IdFrom in notification messages. (Scintilla feature 2622)</summary>
         void SetIdentifier(int identifier);
 
         /// <summary>Get the identifier. (Scintilla feature 2623)</summary>

Visual Studio Project Template C#/PluginInfrastructure/MenuCmdID_h.cs

@@ -1,4 +1,4 @@
-// NPP plugin platform for .Net v0.90 by Kasper B. Graversen etc.
+// NPP plugin platform for .Net v0.91.52 by Kasper B. Graversen etc.
 //
 // This file should stay in sync with the CPP project file
 // "notepad-plus-plus/PowerEditor/src/menuCmdID.h"