Better management of the length of text

Sébastien Geiser · Sébastien Geiser · commit fda35ee6a787 · 2019-02-25T11:30:31.000+01:00
diff --git a/CSharpRegexTools4Npp/BNpp.cs b/CSharpRegexTools4Npp/BNpp.cs
@@ -163,15 +163,16 @@ public static string Text
             get
             {
                 IScintillaGateway scintilla = new ScintillaGateway(PluginBase.GetCurrentScintilla());
-                return BEncoding.GetUtf8TextFromScintillaText(scintilla.GetText(scintilla.GetTextLength()));
+                // Multiply by 2 to managed 2 bytes encoded chars
+                return BEncoding.GetUtf8TextFromScintillaText(scintilla.GetText(scintilla.GetTextLength() * 2));
             }
 
             set
             {
                 IScintillaGateway scintilla = new ScintillaGateway(PluginBase.GetCurrentScintilla());
                 scintilla.ClearAll();
                 string text = BEncoding.GetScintillaTextFromUtf8Text(value, out int length);
-                scintilla.AppendText(length, text);
+                scintilla.SetText(text);
             }
         }
 
diff --git a/CSharpRegexTools4Npp/PluginInfrastructure/ScintillaGateway.cs b/CSharpRegexTools4Npp/PluginInfrastructure/ScintillaGateway.cs
@@ -1802,7 +1802,7 @@ public unsafe void SetText(string text)
         /// </summary>
         public unsafe string GetText(int length)
         {
-            byte[] textBuffer = new byte[10000];
+            byte[] textBuffer = new byte[length];
             fixed (byte* textPtr = textBuffer)
             {
                 IntPtr res = Win32.SendMessage(scintilla, SciMsg.SCI_GETTEXT, length, (IntPtr) textPtr);

Original file line number	Diff line number	Diff line change
`@@ -163,15 +163,16 @@ public static string Text`
`163`	`163`	`get`
`164`	`164`	`{`
`165`	`165`	`IScintillaGateway scintilla = new ScintillaGateway(PluginBase.GetCurrentScintilla());`
`166`		`- return BEncoding.GetUtf8TextFromScintillaText(scintilla.GetText(scintilla.GetTextLength()));`
	`166`	`+ // Multiply by 2 to managed 2 bytes encoded chars`
	`167`	`+ return BEncoding.GetUtf8TextFromScintillaText(scintilla.GetText(scintilla.GetTextLength() * 2));`
`167`	`168`	`}`
`168`	`169`
`169`	`170`	`set`
`170`	`171`	`{`
`171`	`172`	`IScintillaGateway scintilla = new ScintillaGateway(PluginBase.GetCurrentScintilla());`
`172`	`173`	`scintilla.ClearAll();`
`173`	`174`	`string text = BEncoding.GetScintillaTextFromUtf8Text(value, out int length);`
`174`		`- scintilla.AppendText(length, text);`
	`175`	`+ scintilla.SetText(text);`
`175`	`176`	`}`
`176`	`177`	`}`
`177`	`178`
Original file line number	Diff line number	Diff line change
`@@ -1802,7 +1802,7 @@ public unsafe void SetText(string text)`
`1802`	`1802`	`/// </summary>`
`1803`	`1803`	`public unsafe string GetText(int length)`
`1804`	`1804`	`{`
`1805`		`- byte[] textBuffer = new byte[10000];`
	`1805`	`+ byte[] textBuffer = new byte[length];`
`1806`	`1806`	`fixed (byte* textPtr = textBuffer)`
`1807`	`1807`	`{`
`1808`	`1808`	`IntPtr res = Win32.SendMessage(scintilla, SciMsg.SCI_GETTEXT, length, (IntPtr) textPtr);`