- Issue #64, #65: Added TextRangeLegacy to allow transparent hosting on otherwise incompatible versions of N++

oleg-shilo · oleg-shilo · commit 7ae55355fb2e · 2022-02-23T01:09:55.000+11:00
- Some code cleanup
diff --git a/bin/latest_version.txt b/bin/latest_version.txt
@@ -1,5 +1,6 @@
-1.7.20.0
-https://github.com/oleg-shilo/cs-script.npp/releases/download/v1.7.20.0
-Release v1.7.20.0
+v1.7.25.0
+https://github.com/oleg-shilo/cs-script.npp/releases/download/v1.7.25
+Release v1.7.25.0
 
-* Updated deployment algorithm to handle breaking changes in Notepad++ v7.5.9 hosting model.
+- Added integration with .NET 5 edition of CS-Script.
+The script engine needs to be enabled from settings dialog (see "Enable .NET 5/Core integration")
diff --git a/bin/package.cmd b/bin/package.cmd
@@ -4,7 +4,7 @@ echo(
 echo Patching host assemblies with the version info...
 
 rem  properly rename x86 and x64 host DLLs
-cscs -l ..\src\tools\set_host_version.cs
+cscs -l -dbg ..\src\tools\set_host_version.cs 
 
 echo(
 echo Clearing old files...
@@ -27,14 +27,14 @@ xcopy "..\src\output\plugins" ".\plugins" /s /Y
 del ".\plugins\original_*"
 del ".\plugins\*.zip"
 
+
 move latest_version.txt latest_version.txt_                         >nul 2>&1
 move latest_version.pre.txt latest_version.pre.txt_                 >nul 2>&1
 move latest_version_dbg.txt latest_version_dbg.txt_                 >nul 2>&1
 
+rem goto exit
 cd plugins
 
-del CSScriptNpp\CSScriptNpp.dll
-
 copy CSScriptNpp.x86.dll CSScriptNpp.dll
 "C:\Program Files\7-Zip\7z.exe" a ..\CSScriptNpp.x86.zip  *.dll -x!CSScriptNpp.*.dll CSScriptNpp
 
@@ -56,4 +56,5 @@ move latest_version.txt_ latest_version.txt                         >nul 2>&1
 move latest_version.pre.txt_ latest_version.pre.txt                 >nul 2>&1
 move latest_version_dbg.txt_ latest_version_dbg.txt                 >nul 2>&1
 
-pause
+pause
+:exit
diff --git a/bin/package.cs b/bin/package.cs
@@ -8,6 +8,7 @@
 void main(string[] args)
 {
     var version = AssemblyName.GetAssemblyName(@".\plugins\CSScriptNpp\CSScriptNpp.asm.dll").Version.ToString();
+    // var hostVersion = AssemblyName.GetAssemblyName(@"..\src\NppPlugin.Host\output\NppPlugin.host.dll").Version.ToString();
     // var version = Directory.GetFiles(".", "CSScriptNpp.*.msi").Select(x => Path.GetFileNameWithoutExtension(x)).First().Replace("CSScriptNpp.", "");
 
     Console.WriteLine("Injecting version into file names: " + version);
diff --git a/src/CSScriptIntellisense/AutocompleteForm.cs b/src/CSScriptIntellisense/AutocompleteForm.cs
@@ -1,14 +1,14 @@
-﻿using Intellisense.Common;
-using CSScriptIntellisense.Interop;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using Res = CSScriptIntellisense.Images;
+using CSScriptIntellisense.Interop;
+using Intellisense.Common;
 using Kbg.NppPluginNET.PluginInfrastructure;
+using Res = CSScriptIntellisense.Images;
 
 namespace CSScriptIntellisense
 {
@@ -221,8 +221,8 @@ public bool OnKeyDown(Keys key)
                 else
                 {
                     if (key == Keys.Enter ||
-                       (key == Keys.Right && Config.Instance.UseArrowToAccept) ||
-                       (key == Keys.Tab && Config.Instance.UseTabToAccept))
+                        (key == Keys.Right && Config.Instance.UseArrowToAccept) ||
+                        (key == Keys.Tab && Config.Instance.UseTabToAccept))
                     {
                         OnAutocompletionAccepted(selectedSuggestion as ICompletionData);
                         Dispatcher.Schedule(10, Close);
diff --git a/src/CSScriptIntellisense/CSScriptIntellisense.csproj b/src/CSScriptIntellisense/CSScriptIntellisense.csproj
@@ -12,7 +12,7 @@
     <AssemblyName>CSScriptIntellisense</AssemblyName>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/src/CSScriptIntellisense/CSharpIntellisense/Config.cs b/src/CSScriptIntellisense/CSharpIntellisense/Config.cs
@@ -1,9 +1,9 @@
-using Kbg.NppPluginNET.PluginInfrastructure;
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+using Kbg.NppPluginNET.PluginInfrastructure;
 
 namespace CSScriptIntellisense
 {
diff --git a/src/CSScriptIntellisense/CSharpIntellisense/Intellisense.Common.dll b/src/CSScriptIntellisense/CSharpIntellisense/Intellisense.Common.dll
diff --git a/src/CSScriptIntellisense/CodeSnippets/Resources.Designer.cs b/src/CSScriptIntellisense/CodeSnippets/Resources.Designer.cs
diff --git a/src/CSScriptIntellisense/Images/Images.Designer.cs b/src/CSScriptIntellisense/Images/Images.Designer.cs
diff --git a/src/CSScriptIntellisense/Interop/NppExtensions.cs b/src/CSScriptIntellisense/Interop/NppExtensions.cs
@@ -1,4 +1,3 @@
-using Kbg.NppPluginNET.PluginInfrastructure;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -7,6 +6,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using Kbg.NppPluginNET.PluginInfrastructure;
 
 namespace CSScriptIntellisense
 {
@@ -74,11 +74,7 @@ static public string GetTextBetween(this ScintillaGateway document, int start, i
             if (end == -1)
                 end = document.GetLength();
 
-            using (var tr = new TextRange(start, end, end - start + 1)) //+1 for null termination
-            {
-                document.GetTextRange(tr);
-                return tr.lpstrText;
-            }
+            return document.get_text_range(start, end, end - start + 1); //+1 for null termination
         }
 
         static public string TextBeforePosition(this IScintillaGateway document, int position, int maxLength)
@@ -91,13 +87,7 @@ static public string TextBeforePosition(this IScintillaGateway document, int pos
             int size = currentPos - startPos;
 
             if (size > 0)
-            {
-                using (var tr = new TextRange(startPos, currentPos, bufCapacity))
-                {
-                    document.GetTextRange(tr);
-                    return tr.lpstrText;
-                }
-            }
+                return document.get_text_range(startPos, currentPos, bufCapacity);
             else
                 return null;
         }
@@ -459,15 +449,41 @@ static public string TextAfterPosition(this ScintillaGateway document, int posit
             int size = endPos - startPos;
 
             if (size > 0)
-            {
-                using (var tr = new TextRange(startPos, endPos, bufCapacity))
+                return document.get_text_range(startPos, endPos, bufCapacity);
+            else
+                return null;
+        }
+
+        static string get_text_range(this IScintillaGateway document, int startPos, int endPos, int bufCapacity)
+        {
+            var version = PluginBase.GetNppVersion();
+
+            // starting from v8.31 N++ uses Scintilla interface with TextRange min and max members as `IntPtr`
+            // while previously they were `int`. If a wrong type passed N++ just crashes.
+
+            bool newNppVersion;
+            if (version[0] > 8) // major version
+                newNppVersion = true;
+            else if (version[0] == 8)
+                newNppVersion = version[1] >= 31; // minor version
+            else
+                newNppVersion = false;
+
+            if (Environment.GetEnvironmentVariable("CSSCRIPT_NPP_NEW_NPP_API") != null)
+                newNppVersion = Environment.GetEnvironmentVariable("CSSCRIPT_NPP_NEW_NPP_API").ToLower() == "true";
+
+            if (newNppVersion)
+                using (var tr = new TextRange((IntPtr)startPos, (IntPtr)endPos, bufCapacity))
                 {
                     document.GetTextRange(tr);
                     return tr.lpstrText;
                 }
-            }
             else
-                return null;
+                using (var tr = new TextRangeLegacy(startPos, endPos, bufCapacity))
+                {
+                    document.GetTextRangeLegacy(tr);
+                    return tr.lpstrText;
+                }
         }
 
         /// <summary>
diff --git a/src/CSScriptIntellisense/NppEditor.cs b/src/CSScriptIntellisense/NppEditor.cs
@@ -1,8 +1,8 @@
-using Kbg.NppPluginNET.PluginInfrastructure;
-using Mono.CSharp;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Kbg.NppPluginNET.PluginInfrastructure;
+using Mono.CSharp;
 
 namespace CSScriptIntellisense
 {
diff --git a/src/CSScriptIntellisense/Properties/Resources.Designer.cs b/src/CSScriptIntellisense/Properties/Resources.Designer.cs
diff --git a/src/CSScriptIntellisense/Syntaxer.cs b/src/CSScriptIntellisense/Syntaxer.cs
@@ -1,4 +1,3 @@
-using Intellisense.Common;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -10,6 +9,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Intellisense.Common;
 using UltraSharp.Cecil;
 
 namespace CSScriptIntellisense
@@ -277,6 +277,8 @@ public static string WithTempCopy(this string editorText, string originalFile, F
 
                 string response = action(tempFile);
 
+                LogAnyErrors(response);
+
                 if (fixTempFileInsertions != null)
                     response = fixTempFileInsertions(response);
 
@@ -326,9 +328,19 @@ public static Intellisense.Common.MemberInfoData[] ToMemberInfoData(this string
                                .ToArray();
                 }
                 catch { }
+
             return new Intellisense.Common.MemberInfoData[0];
         }
 
+        public static void LogAnyErrors(string data)
+        {
+            if (data?.StartsWith("<error>") == true)
+            {
+                string logFile = Path.Combine(PluginEnv.LogDir, "last_syntaxer_error.txt");
+                File.WriteAllText(logFile, data);
+            }
+        }
+
         public static Intellisense.Common.TypeInfo[] ToTypeInfos(this string data)
         {
             if (data != null && !data.StartsWith("<error>"))
diff --git a/src/CSScriptIntellisense/app.config b/src/CSScriptIntellisense/app.config
@@ -8,4 +8,4 @@
       </dependentAssembly>
     </assemblyBinding>-->
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/src/CSScriptNpp/ProjectPanel.cs b/src/CSScriptNpp/ProjectPanel.cs
@@ -1,17 +1,17 @@
 ﻿using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Diagnostics;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 using CSScriptIntellisense;
+using CSScriptIntellisense.Interop;
 using CSScriptLibrary;
 using CSScriptNpp.Dialogs;
-using System.Windows.Forms;
-using System.Collections.Generic;
-using CSScriptIntellisense.Interop;
 using Kbg.NppPluginNET.PluginInfrastructure;
-using System.Runtime.InteropServices;
 
 namespace CSScriptNpp
 {
@@ -166,9 +166,9 @@ void ReloadScriptHistory()
                                 this.historyBtn.DropDownItems.Remove(item);
 
                                 var scripts = Config.Instance.ScriptHistory.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
-                                                                          .Distinct()
-                                                                          .Where(x => x != script)
-                                                                          .ToArray();
+                                                                           .Distinct()
+                                                                           .Where(x => x != script)
+                                                                           .ToArray();
 
                                 Config.Instance.ScriptHistory = string.Join("|", scripts);
                                 Config.Instance.Save();
@@ -234,8 +234,13 @@ void newBtn_Click(object sender, EventArgs e)
                 if (!File.Exists(newScript))
                 {
                     File.WriteAllText(newScript, scriptCode);
-
-                    PluginBase.Editor.Open(newScript);
+                    try
+                    {
+                        PluginBase.Editor.Open(newScript);
+                    }
+                    catch
+                    {
+                    }
                     PluginBase.GetCurrentDocument().GrabFocus();
 
                     loadBtn.PerformClick();
diff --git a/src/CSScriptNpp/Properties/AssemblyInfo.cs b/src/CSScriptNpp/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Oleg Shilo")]
 [assembly: AssemblyProduct("CS-Script for Notepad++")]
-[assembly: AssemblyCopyright("Copyright © Oleg Shilo 2014-2018")]
+[assembly: AssemblyCopyright("Copyright © Oleg Shilo 2014-2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyDescription("Notepad++ plugin for CS-Script integration. \r\n" +
@@ -32,5 +32,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.7.26.0")]
-[assembly: AssemblyFileVersion("1.7.26.0")]
+[assembly: AssemblyVersion("1.7.28.0")]
+[assembly: AssemblyFileVersion("1.7.28.0")]
diff --git a/src/CSScriptNpp/Resources/WhatsNew.txt b/src/CSScriptNpp/Resources/WhatsNew.txt
@@ -1,7 +1,8 @@
-Release v1.7.26.0
+Release v1.7.27.0
 ----
-v1.7.25-26
-- Fixed problem (inflicted by Scintilla update) with suggestion list not being updated on character removing
-- Added integration with .NET 5 edition of CS-Script.
-The script engine needs to be enabled from settings dialog (see "Enable .NET 5/Core integration") 
-- The process's TLS protocol is set to v1.2 to address "Check for updates" failures
+v1.7.27
+- Patched NppPluginNet: `CharacterRange.cpMin` and `CharacterRange.cpMax` changed from `int` to `IntPtr`
+  This addresses the problems triggered by this the third-party component (NppPluginNet):
+  - Issue #64: Creating a new script crashes latest 64-bit Notepad++ release
+  - Issue #65: Intermittent crashes (and the culprit is CS-Script)
+- Added logging syntaxer internal errors to the plugin log dir.
diff --git a/src/tools/set_host_version.cs b/src/tools/set_host_version.cs

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`void main(string[] args)`
`9`	`9`	`{`
`10`	`10`	`var version = AssemblyName.GetAssemblyName(@".\plugins\CSScriptNpp\CSScriptNpp.asm.dll").Version.ToString();`
	`11`	`+ // var hostVersion = AssemblyName.GetAssemblyName(@"..\src\NppPlugin.Host\output\NppPlugin.host.dll").Version.ToString();`
`11`	`12`	`// var version = Directory.GetFiles(".", "CSScriptNpp.*.msi").Select(x => Path.GetFileNameWithoutExtension(x)).First().Replace("CSScriptNpp.", "");`
`12`	`13`
`13`	`14`	`Console.WriteLine("Injecting version into file names: " + version);`