Update to Scintilla 3.7.5.

Components/ScintEdit.pas

@@ -62,7 +62,8 @@ type
     Left, Top, Right, Bottom: Integer;
   end;
   TScintStyleNumber = 0..StyleNumbers-1;
-  TScintVirtualSpaceOption = (svsRectangularSelection, svsUserAccessible);
+  TScintVirtualSpaceOption = (svsRectangularSelection, svsUserAccessible,
+    svsNoWrapLineStart);
   TScintVirtualSpaceOptions = set of TScintVirtualSpaceOption;
   PScintRangeToFormat = ^TScintRangeToFormat;
   TScintRangeToFormat = record
@@ -515,6 +516,8 @@ begin
     Flags := Flags or SCVS_RECTANGULARSELECTION;
   if svsUserAccessible in VirtualSpaceOptions then
     Flags := Flags or SCVS_USERACCESSIBLE;
+  if svsNoWrapLineStart in VirtualSpaceOptions then
+    Flags := Flags or SCVS_NOWRAPLINESTART;
   Call(SCI_SETVIRTUALSPACEOPTIONS, Flags, 0);
   Call(SCI_SETWRAPMODE, Ord(FWordWrap), 0);
   Call(SCI_SETINDENTATIONGUIDES, IndentationGuides[FIndentationGuides], 0);
@@ -1856,7 +1859,7 @@ var
 
 const
   { Note: This style is specific to our patched build }
-  STYLE_AUTOCOMPLETION = 39;
+  STYLE_AUTOCOMPLETION = 40;
 var
   I: Integer;
 begin

Components/ScintInt.pas

@@ -1,7 +1,7 @@
 unit ScintInt;
 
 {
-  Delphi translation of Scintilla.h from Scintilla 3.6.3
+  Delphi translation of Scintilla.h from Scintilla 3.7.5
   created by Jordan Russell and updated by Martijn Laan
 }
 
@@ -42,6 +42,10 @@ const
   SCWS_VISIBLEONLYININDENT = 3;
   SCI_GETVIEWWS = 2020;
   SCI_SETVIEWWS = 2021;
+  SCTD_LONGARROW = 0;
+  SCTD_STRIKEOUT = 1;
+  SCI_GETTABDRAWMODE = 2698;
+  SCI_SETTABDRAWMODE = 2699;
   SCI_POSITIONFROMPOINT = 2022;
   SCI_POSITIONFROMPOINTCLOSE = 2023;
   SCI_GOTOLINE = 2024;
@@ -133,6 +137,7 @@ const
   SC_MARGIN_FORE = 3;
   SC_MARGIN_TEXT = 4;
   SC_MARGIN_RTEXT = 5;
+  SC_MARGIN_COLOUR = 6;
   SCI_SETMARGINTYPEN = 2240;
   SCI_GETMARGINTYPEN = 2241;
   SCI_SETMARGINWIDTHN = 2242;
@@ -143,6 +148,10 @@ const
   SCI_GETMARGINSENSITIVEN = 2247;
   SCI_SETMARGINCURSORN = 2248;
   SCI_GETMARGINCURSORN = 2249;
+  SCI_SETMARGINBACKN = 2250;
+  SCI_GETMARGINBACKN = 2251;
+  SCI_SETMARGINS = 2252;
+  SCI_GETMARGINS = 2253;
   STYLE_DEFAULT = 32;
   STYLE_LINENUMBER = 33;
   STYLE_BRACELIGHT = 34;
@@ -150,6 +159,7 @@ const
   STYLE_CONTROLCHAR = 36;
   STYLE_INDENTGUIDE = 37;
   STYLE_CALLTIP = 38;
+  STYLE_FOLDDISPLAYTEXT = 39;
   STYLE_LASTPREDEFINED = 39;
   STYLE_MAX = 255;
   SC_CHARSET_ANSI = 0;
@@ -252,6 +262,8 @@ const
   INDIC_IME_MAX = 35;
   INDIC_MAX = 35;
   INDIC_CONTAINER = 8;
+  INDIC_POINT = 18;
+  INDIC_POINTCHARACTER = 19;
   INDIC0_MASK = $20;
   INDIC1_MASK = $40;
   INDIC2_MASK = $80;
@@ -284,6 +296,8 @@ const
   SCI_SETCARETLINEVISIBLE = 2096;
   SCI_GETCARETLINEBACK = 2097;
   SCI_SETCARETLINEBACK = 2098;
+  SCI_GETCARETLINEFRAME = 2704;
+  SCI_SETCARETLINEFRAME = 2705;
   SCI_STYLESETCHANGEABLE = 2099;
   SCI_AUTOCSHOW = 2100;
   SCI_AUTOCCANCEL = 2101;
@@ -442,6 +456,11 @@ const
   SCI_SETFOLDEXPANDED = 2229;
   SCI_GETFOLDEXPANDED = 2230;
   SCI_TOGGLEFOLD = 2231;
+  SCI_TOGGLEFOLDSHOWTEXT = 2700;
+  SC_FOLDDISPLAYTEXT_HIDDEN = 0;
+  SC_FOLDDISPLAYTEXT_STANDARD = 1;
+  SC_FOLDDISPLAYTEXT_BOXED = 2;
+  SCI_FOLDDISPLAYTEXTSETSTYLE = 2701;
   SC_FOLDACTION_CONTRACT = 0;
   SC_FOLDACTION_EXPAND = 1;
   SC_FOLDACTION_TOGGLE = 2;
@@ -544,6 +563,10 @@ const
   SCI_LINESSPLIT = 2289;
   SCI_SETFOLDMARGINCOLOUR = 2290;
   SCI_SETFOLDMARGINHICOLOUR = 2291;
+  SC_ACCESSIBILITY_DISABLED = 0;
+  SC_ACCESSIBILITY_ENABLED = 1;
+  SCI_SETACCESSIBILITY = 2702;
+  SCI_GETACCESSIBILITY = 2703;
   SCI_LINEDOWN = 2300;
   SCI_LINEDOWNEXTEND = 2301;
   SCI_LINEUP = 2302;
@@ -585,6 +608,7 @@ const
   SCI_LINECUT = 2337;
   SCI_LINEDELETE = 2338;
   SCI_LINETRANSPOSE = 2339;
+  SCI_LINEREVERSE = 2354;
   SCI_LINEDUPLICATE = 2404;
   SCI_LOWERCASE = 2340;
   SCI_UPPERCASE = 2341;
@@ -617,16 +641,22 @@ const
   EDGE_NONE = 0;
   EDGE_LINE = 1;
   EDGE_BACKGROUND = 2;
+  EDGE_MULTILINE = 3;
   SCI_GETEDGECOLUMN = 2360;
   SCI_SETEDGECOLUMN = 2361;
   SCI_GETEDGEMODE = 2362;
   SCI_SETEDGEMODE = 2363;
   SCI_GETEDGECOLOUR = 2364;
   SCI_SETEDGECOLOUR = 2365;
+  SCI_MULTIEDGEADDLINE = 2694;
+  SCI_MULTIEDGECLEARALL = 2695;
   SCI_SEARCHANCHOR = 2366;
   SCI_SEARCHNEXT = 2367;
   SCI_SEARCHPREV = 2368;
   SCI_LINESONSCREEN = 2370;
+  SC_POPUP_NEVER = 0;
+  SC_POPUP_ALL = 1;
+  SC_POPUP_TEXT = 2;
   SCI_USEPOPUP = 2371;
   SCI_SELECTIONISRECTANGLE = 2372;
   SCI_SETZOOM = 2373;
@@ -646,6 +676,8 @@ const
   SCI_GETSTATUS = 2383;
   SCI_SETMOUSEDOWNCAPTURES = 2384;
   SCI_GETMOUSEDOWNCAPTURES = 2385;
+  SCI_SETMOUSEWHEELCAPTURES = 2696;
+  SCI_GETMOUSEWHEELCAPTURES = 2697;
   SC_CURSORNORMAL = -1;
   SC_CURSORARROW = 2;
   SC_CURSORWAIT = 4;
@@ -862,6 +894,7 @@ const
   SCVS_NONE = 0;
   SCVS_RECTANGULARSELECTION = 1;
   SCVS_USERACCESSIBLE = 2;
+  SCVS_NOWRAPLINESTART = 4;
   SCI_SETVIRTUALSPACEOPTIONS = 2596;
   SCI_GETVIRTUALSPACEOPTIONS = 2597;
   SCI_SETRECTANGULARSELECTIONMODIFIER = 2598;
@@ -1036,6 +1069,7 @@ const
   SCN_FOCUSIN = 2028;
   SCN_FOCUSOUT = 2029;
   SCN_AUTOCCOMPLETED = 2030;
+  SCN_MARGINRIGHTCLICK = 2031;
 
 type
   TSci_Position = Integer;

Projects/Src/CompForm.pas

@@ -1973,7 +1973,7 @@ begin
     Memo.Call(SCI_INDICSETSTYLE, inSquiggly, SquigglyStyles[FOptions.UnderlineErrors]);
 
     if FOptions.CursorPastEOL then
-      Memo.VirtualSpaceOptions := [svsRectangularSelection, svsUserAccessible]
+      Memo.VirtualSpaceOptions := [svsRectangularSelection, svsUserAccessible, svsNoWrapLineStart]
     else
       Memo.VirtualSpaceOptions := [];
     Memo.FillSelectionToEdge := FOptions.CursorPastEOL;
@@ -2810,10 +2810,6 @@ begin
       end;
     end;
   end
-  else if (Key = VK_LEFT) and not (ssCtrl in Shift) and FOptions.CursorPastEOL then begin
-    if (FActiveMemo.CaretColumn = 0) and (FActiveMemo.CaretVirtualSpace = 0) then
-      Key := 0;
-  end
   else if ((Key = VK_RIGHT) and (Shift * [ssShift, ssAlt, ssCtrl] = [ssAlt])) and
            (ShortCut(Key, Shift) <> FForwardNavButtonShortCut) then begin
     InitiateAutoComplete(#0);

Projects/Src/CompScintEdit.pas

@@ -148,12 +148,8 @@ begin
     -3.6.6: Investigate SCFIND_CXX11REGEX: C++ 11 <regex> support built by default.
             Can be disabled by defining NO_CXX11_REGEX. Good (?) overview at:
             https://cplusplus.com/reference/regex/ECMAScript/
-    -3.6.7: Use SCVS_NOWRAPLINESTART in TCompileForm.SyncEditorOptions if
-            CursorPastEOL is on and remove our own VK_LEFT handling i
-            TCompileForm.MemoKeyDown.
     -3.7.1: Test if SCN_MARGINRIGHTCLICK works and if so: use it to display a
             set/clear breakpoint popup?
-    -3.7.5: This is the final release of SciTE 3.x.
     -4.0.0: Investigate: "The default encoding in Scintilla is UTF-8."
     -5.0.1: Review using SCI_INDICSETSTROKEWIDTH for high DPI support on INDIC_SQUIGGLE }