Prefer SCI_REPLACETARGETMINIMAL where possible

Also:

  * re-position caret *after* decoded Unicode text for greater
    consistency with entity decoding -- i.e., smooth over the
    differenc ebetween SCI_REPLACETARGET(MINIMAL) and SCI_REPLACESEL

  * assume zero-padded version words for N++ >=8.4.1; prevents
    mistaking 8.4.1/2 as supporting SCI_GETTEXTRANGEFULL due to
    5951d5b; also prevents mistaking 8.4.1-8.4.8 as depending on the
    Vista-era graphics API, due to c4d621b, so to avoid adjusting the
    About dialog's height when not necessary

Author: rdipardo

src/Include/SciApi.inc

@@ -1,7 +1,7 @@
 {$IFNDEF SCIAPI_INC}
 {$DEFINE SCIAPI_INC}
 {
-  Copyright (c) 2022 Robert Di Pardo <dipardo.r@gmail.com>
+  Copyright (c) 2022, 2023 Robert Di Pardo <dipardo.r@gmail.com>
 
   This Source Code Form is subject to the terms of the Mozilla Public License,
   v. 2.0. If a copy of the MPL was not distributed with this file, You can
@@ -21,7 +21,12 @@ type
         /// >= v5.2.3
         /// SCI_GETTEXTRANGEFULL, SCI_FINDTEXTFULL and SCI_FORMATRANGEFULL introduced
         /// https://groups.google.com/g/scintilla-interest/c/mPLwYdC0-FE
-        sciApi_GTE_523
+        sciApi_GTE_523,
+
+        /// >= v5.3.2
+        /// SCI_REPLACETARGETMINIMAL introduced
+        /// https://groups.google.com/g/scintilla-interest/c/9OG2VdnWJ5I
+        sciApi_GTE_532
     );
 
 {$ENDIF ~SCIAPI_INC}

src/Include/SciSupport.inc

@@ -70,8 +70,8 @@ type
   end;
 
 const
-// Definitions for Scintilla 5.2.3
-// https://github.com/notepad-plus-plus/notepad-plus-plus/commit/ed4bb1a93e763001aac842698fcde0856ba8b0bc
+// Definitions for Scintilla 5.3.2
+// https://github.com/notepad-plus-plus/notepad-plus-plus/commit/fc61868cf2e317bfb7384502f80b6476fda6ddc8
     INVALID_POSITION = -1;
     SCI_START = 2000;
     SCI_OPTIONAL_START = 3000;
@@ -94,6 +94,7 @@ const
     SCI_SELECTALL = 2013;
     SCI_SETSAVEPOINT = 2014;
     SCI_GETSTYLEDTEXT = 2015;
+    SCI_GETSTYLEDTEXTFULL = 2778;
     SCI_CANREDO = 2016;
     SCI_MARKERLINEFROMHANDLE = 2017;
     SCI_MARKERDELETEHANDLE = 2018;
@@ -183,7 +184,12 @@ const
     SC_MARK_RGBAIMAGE = 30;
     SC_MARK_BOOKMARK = 31;
     SC_MARK_VERTICALBOOKMARK = 32;
+    SC_MARK_BAR = 33;
     SC_MARK_CHARACTER = 10000;
+    SC_MARKNUM_HISTORY_REVERTED_TO_ORIGIN = 21;
+    SC_MARKNUM_HISTORY_SAVED = 22;
+    SC_MARKNUM_HISTORY_MODIFIED = 23;
+    SC_MARKNUM_HISTORY_REVERTED_TO_MODIFIED = 24;
     SC_MARKNUM_FOLDEREND = 25;
     SC_MARKNUM_FOLDEROPENMID = 26;
     SC_MARKNUM_FOLDERMIDTAIL = 27;
@@ -306,6 +312,8 @@ const
     SCI_STYLESETHOTSPOT = 2409;
     SCI_STYLESETCHECKMONOSPACED = 2254;
     SCI_STYLEGETCHECKMONOSPACED = 2255;
+    SCI_STYLESETINVISIBLEREPRESENTATION = 2256;
+    SCI_STYLEGETINVISIBLEREPRESENTATION = 2257;
     SC_ELEMENT_LIST = 0;
     SC_ELEMENT_LIST_BACK = 1;
     SC_ELEMENT_LIST_SELECTED = 2;
@@ -384,15 +392,24 @@ const
     INDIC_POINTCHARACTER = 19;
     INDIC_GRADIENT = 20;
     INDIC_GRADIENTCENTRE = 21;
-    INDIC_EXPLORERLINK = 22;
+    INDIC_POINT_TOP = 22;
+    INDIC_EXPLORERLINK = 23;
     INDIC_CONTAINER = 8;
     INDIC_IME = 32;
     INDIC_IME_MAX = 35;
     INDIC_MAX = 35;
     INDICATOR_CONTAINER = 8;
     INDICATOR_IME = 32;
     INDICATOR_IME_MAX = 35;
-    INDICATOR_MAX = 35;
+    INDICATOR_HISTORY_REVERTED_TO_ORIGIN_INSERTION = 36;
+    INDICATOR_HISTORY_REVERTED_TO_ORIGIN_DELETION = 37;
+    INDICATOR_HISTORY_SAVED_INSERTION = 38;
+    INDICATOR_HISTORY_SAVED_DELETION = 39;
+    INDICATOR_HISTORY_MODIFIED_INSERTION = 40;
+    INDICATOR_HISTORY_MODIFIED_DELETION =41;
+    INDICATOR_HISTORY_REVERTED_TO_MODIFIED_INSERTION = 42;
+    INDICATOR_HISTORY_REVERTED_TO_MODIFIED_DELETION = 43;
+    INDICATOR_MAX = 43;
     SCI_INDICSETSTYLE = 2080;
     SCI_INDICGETSTYLE = 2081;
     SCI_INDICSETFORE = 2082;
@@ -509,6 +526,12 @@ const
     SCI_FINDTEXTFULL = 2196;
     SCI_FORMATRANGE = 2151;
     SCI_FORMATRANGEFULL = 2777;
+    SC_CHANGE_HISTORY_DISABLED = 0;
+    SC_CHANGE_HISTORY_ENABLED = 1;
+    SC_CHANGE_HISTORY_MARKERS = 2;
+    SC_CHANGE_HISTORY_INDICATORS = 4;
+    SCI_SETCHANGEHISTORY = 2780;
+    SCI_GETCHANGEHISTORY = 2781;
     SCI_GETFIRSTVISIBLELINE = 2152;
     SCI_GETLINE = 2153;
     SCI_GETLINECOUNT = 2154;
@@ -523,6 +546,7 @@ const
     SCI_GETTEXTRANGE = 2162;
     SCI_GETTEXTRANGEFULL = 2039;
     SCI_HIDESELECTION = 2163;
+    SCI_GETSELECTIONHIDDEN = 2088;
     SCI_POINTXFROMPOSITION = 2164;
     SCI_POINTYFROMPOSITION = 2165;
     SCI_LINEFROMPOSITION = 2166;
@@ -565,6 +589,7 @@ const
     SCI_TARGETWHOLEDOCUMENT = 2690;
     SCI_REPLACETARGET = 2194;
     SCI_REPLACETARGETRE = 2195;
+    SCI_REPLACETARGETMINIMAL = 2779;
     SCI_SEARCHINTARGET = 2197;
     SCI_SETSEARCHFLAGS = 2198;
     SCI_GETSEARCHFLAGS = 2199;
@@ -609,6 +634,7 @@ const
     SC_FOLDACTION_CONTRACT = 0;
     SC_FOLDACTION_EXPAND = 1;
     SC_FOLDACTION_TOGGLE = 2;
+    SC_FOLDACTION_CONTRACT_EVERY_LEVEL = 4;
     SCI_FOLDLINE = 2237;
     SCI_FOLDCHILDREN = 2238;
     SCI_EXPANDCHILDREN = 2239;
@@ -1247,6 +1273,7 @@ const
     SC_AC_TAB = 3;
     SC_AC_NEWLINE = 4;
     SC_AC_COMMAND = 5;
+    SC_AC_SINGLE_CHOICE = 6;
     SC_CHARACTERSOURCE_DIRECT_INPUT = 0;
     SC_CHARACTERSOURCE_TENTATIVE_INPUT = 1;
     SC_CHARACTERSOURCE_IME_RESULT = 2;

src/LibNppPlugin/NppSimpleObjects.pas

@@ -345,12 +345,9 @@ function TTextRange.GetText: WideString;
   tr: RSciTextRange;
   Chars: AnsiString;
 begin
-  case FEditor.ApiLevel of
-    sciApi_GTE_523:
-      SciMsg := SCI_GETTEXTRANGEFULL;
-    else
+  SciMsg := SCI_GETTEXTRANGEFULL;
+  if FEditor.ApiLevel < sciApi_GTE_523 then
       SciMsg := SCI_GETTEXTRANGE;
-  end;
   Chars := AnsiString(StringOfChar(#0, GetLength + 1));
   tr.chrg.cpMin := FStartPos;
   tr.chrg.cpMax := FEndPos;
@@ -361,9 +358,13 @@ function TTextRange.GetText: WideString;
 { ------------------------------------------------------------------------------------------------ }
 procedure TTextRange.SetText(const AValue: WideString);
 var
+  SciMsg: UINT;
   Chars: AnsiString;
   TxtRng: Integer;
 begin
+  SciMsg := SCI_REPLACETARGETMINIMAL;
+  if FEditor.ApiLevel < sciApi_GTE_532 then
+    SciMsg := SCI_REPLACETARGET;
   case FEditor.SendMessage(SCI_GETCODEPAGE) of
   SC_CP_UTF8:
     Chars := UTF8Encode(AValue)
@@ -373,7 +374,7 @@ procedure TTextRange.SetText(const AValue: WideString);
   TxtRng := System.Length(Chars);
   FEditor.SendMessage(SCI_SETTARGETSTART, FStartPos);
   FEditor.SendMessage(SCI_SETTARGETEND, FEndPos);
-  Dec(FEndPos, (FEndPos - FStartPos) - Integer(FEditor.SendMessage(SCI_REPLACETARGET, TxtRng, PAnsiChar(Chars))));
+  Inc(FStartPos, Sci_Position(FEditor.SendMessage(SciMsg, TxtRng, PAnsiChar(Chars))));
 end;
 
 
@@ -665,12 +666,9 @@ procedure TActiveDocument.Find(const AText: WideString; var ATarget: TTextRange;
   TTF: RSciTextToFind;
   StartPos: LRESULT;
 begin
-  case Self.ApiLevel of
-    sciApi_GTE_523:
-      SciMsg := SCI_FINDTEXTFULL;
-    else
+  SciMsg := SCI_FINDTEXTFULL;
+  if Self.ApiLevel < sciApi_GTE_523 then
       SciMsg := SCI_FINDTEXT;
-  end;
   TTF := Default(RSciTextToFind);
   if AStartPos < 0 then
     TTF.chrg.cpMin := 0

src/LibNppPlugin/nppplugin.pas

@@ -53,6 +53,7 @@   TNppPlugin = class(TObject)
     function SupportsBigFiles: Boolean;
     function HasV5Apis: Boolean;
     function HasFullRangeApis: Boolean;
+    function HasMinimalReplacementApi: Boolean;
     function GetApiLevel: TSciApiLevel;
     function GetNppVersion: Cardinal;
     function GetPluginsConfigDir: string;
@@ -332,8 +333,10 @@ function TNppPlugin.GetApiLevel: TSciApiLevel;
     Result := sciApi_LT_5
   else if (not self.HasFullRangeApis) then
     Result := sciApi_GTE_515
+  else if (not self.HasMinimalReplacementApi) then
+    Result := sciApi_GTE_523
   else
-    Result := sciApi_GTE_523;
+    Result := sciApi_GTE_532;
 end;
 
 function TNppPlugin.GetNppVersion: Cardinal;
@@ -385,8 +388,7 @@ function TNppPlugin.HasFullRangeApis: Boolean;
   NppVersion := GetNppVersion;
   Result :=
     (HIWORD(NppVersion) > 8) or
-    ((HIWORD(NppVersion) = 8) and
-       ((LOWORD(NppVersion) >= 43) and (not (LOWORD(NppVersion) in [191, 192, 193]))));
+    ((HIWORD(NppVersion) = 8) and (LOWORD(NppVersion) >= 430));
 end;
 
 function TNppPlugin.IsDarkModeEnabled: Boolean;
@@ -409,15 +411,24 @@ function TNppPlugin.HasNarrowDialogBorders: Boolean;
         (TWinVer(SendMessage(self.NppData.NppHandle, NPPM_GETWINDOWSVERSION, 0, 0)) >= WV_WIN8);
 end;
 
+function TNppPlugin.HasMinimalReplacementApi: Boolean;
+var
+  NppVersion: Cardinal;
+begin
+  NppVersion := GetNppVersion;
+  Result :=
+    ((HIWORD(NppVersion) > 8) or
+     ((HIWORD(NppVersion) = 8) and (LOWORD(NppVersion) >= 480)));
+end;
+
 function TNppPlugin.MinSubsystemIsVista: Boolean;
 var
   NppVersion: Cardinal;
 begin
   NppVersion := GetNppVersion;
   Result :=
     ((HIWORD(NppVersion) > 8) or
-     ((HIWORD(NppVersion) = 8) and
-        (((LOWORD(NppVersion) >= 49) and (not (LOWORD(NppVersion) in [191, 192, 193]))))));
+     ((HIWORD(NppVersion) = 8) and (LOWORD(NppVersion) >= 490)));
 end;
 
 end.