Merge branch 'main' into extract7zippage

jrsoftware · Nov 14, 2024 · 1dfd2f7 · 1dfd2f7
2 parents aa1e83a + de57c26
commit 1dfd2f7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 33 deletions.
diff --git a/Components/ScintEdit.pas b/Components/ScintEdit.pas
@@ -369,8 +369,8 @@   TScintEdit = class(TWinControl)
     function TestRawRegularExpression(const S: TScintRawString): Boolean;
     procedure Undo;
     procedure UpdateStyleAttributes;
-    function WordAtCursor: String;
-    function WordAtCursorRange: TScintRange;
+    function WordAtCaret: String;
+    function WordAtCaretRange: TScintRange;
     procedure ZoomIn;
     procedure ZoomOut;
     property AutoCompleteActive: Boolean read GetAutoCompleteActive;
@@ -2483,13 +2483,13 @@ procedure TScintEdit.UpdateStyleAttributes;
     Call(SCI_AUTOCSETSTYLE, 0, 0);
 end;
 
-function TScintEdit.WordAtCursor: String;
+function TScintEdit.WordAtCaret: String;
 begin
-  var Range := WordAtCursorRange;
+  var Range := WordAtCaretRange;
   Result := GetTextRange(Range.StartPos, Range.EndPos);
 end;
 
-function TScintEdit.WordAtCursorRange: TScintRange;
+function TScintEdit.WordAtCaretRange: TScintRange;
 begin
   var Pos := GetCaretPosition;
   Result.StartPos := GetWordStartPosition(Pos, True);

diff --git a/Projects/Src/IDE.HelperFunc.pas b/Projects/Src/IDE.HelperFunc.pas
@@ -76,8 +76,6 @@ function GetSourcePath(const AFilename: String): String;
 function ReadScriptLines(const ALines: TStringList; const ReadFromFile: Boolean;
   const ReadFromFileFilename: String; const NotReadFromFileMemo: TScintEdit): Integer;
 function CreateBitmapInfo(const Width, Height, BitCount: Integer): TBitmapInfo;
-function GetWordOccurrenceFindOptions: TScintFindOptions;
-function GetSelTextOccurrenceFindOptions: TScintFindOptions;
 function GetPreferredMemoFont: String;
 function DoubleAmp(const S: String): String;
 
@@ -848,16 +846,6 @@ function CreateBitmapInfo(const Width, Height, BitCount: Integer): TBitmapInfo;
   Result.bmiHeader.biCompression := BI_RGB;
 end;
 
-function GetWordOccurrenceFindOptions: TScintFindOptions;
-begin
-  Result := [sfoMatchCase, sfoWholeWord];
-end;
-
-function GetSelTextOccurrenceFindOptions: TScintFindOptions;
-begin
-  Result := [];
-end;
-
 var
   PreferredMemoFont: String;
 

diff --git a/Projects/Src/IDE.MainForm.pas b/Projects/Src/IDE.MainForm.pas
@@ -1451,7 +1451,7 @@ procedure TMainForm.MemoKeyDown(Sender: TObject; var Key: Word;
     var HelpFile := GetHelpFile;
     if Assigned(HtmlHelp) then begin
       HtmlHelp(GetDesktopWindow, PChar(HelpFile), HH_DISPLAY_TOPIC, 0);
-      var S := FActiveMemo.WordAtCursor;
+      var S := FActiveMemo.WordAtCaret;
       if S <> '' then begin
         var KLink: THH_AKLINK;
         FillChar(KLink, SizeOf(KLink), 0);
@@ -2995,26 +2995,20 @@ procedure TMainForm.ESelectAllClick(Sender: TObject);
 procedure TMainForm.ESelectAllOccurrencesClick(Sender: TObject);
 begin
   { Might be called even if ESelectAllOccurrences.Enabled would be False in EMenuClick }
-  var Options := GetSelTextOccurrenceFindOptions;
   if FActiveMemo.SelEmpty then begin
-    var Range := FActiveMemo.WordAtCursorRange;
-    if Range.StartPos <> Range.EndPos then begin
+    { If the selection is empty then SelectAllOccurrences will actually just select
+      the word at caret which is not what we want, so preselect this word ourselves }
+    var Range := FActiveMemo.WordAtCaretRange;
+    if Range.StartPos <> Range.EndPos then
       FActiveMemo.SetSingleSelection(Range.EndPos, Range.StartPos);
-      Options := GetWordOccurrenceFindOptions;
-    end;
   end;
-  FActiveMemo.SelectAllOccurrences(Options);
+  FActiveMemo.SelectAllOccurrences([sfoMatchCase]);
 end;
 
 procedure TMainForm.ESelectNextOccurrenceClick(Sender: TObject);
 begin
   { Might be called even if ESelectNextOccurrence.Enabled would be False in EMenuClick }
-
-  { Currently this always uses GetWordOccurrenceFindOptions but ideally it would
-    know whether this is the 'first' SelectNext or not. Then, if first it would
-    do what SelectAll does to choose a FindOptions. And if next it would reuse
-    that. This is what VSCode does. }
-  FActiveMemo.SelectNextOccurrence(GetWordOccurrenceFindOptions);
+  FActiveMemo.SelectNextOccurrence([sfoMatchCase]);
 end;
 
 procedure TMainForm.EToggleLinesCommentClick(Sender: TObject);
@@ -4023,11 +4017,11 @@ procedure TMainForm.UpdateOccurrenceIndicators(const AMemo: TIDEScintEdit);
     Selections := TScintRangeList.Create;
 
     if FOptions.HighlightWordAtCursorOccurrences and (AMemo.CaretVirtualSpace = 0) and MainSelSingleLine then begin
-      var Word := AMemo.WordAtCursorRange;
+      var Word := AMemo.WordAtCaretRange;
       if (Word.StartPos <> Word.EndPos) and MainSelection.Within(Word) then begin
         var TextToIndicate := AMemo.GetRawTextRange(Word.StartPos, Word.EndPos);
         AMemo.GetSelections(Selections); { Gets any additional selections as well }
-        FindTextAndAddRanges(AMemo, TextToIndicate, GetWordOccurrenceFindOptions, Selections, IndicatorRanges);
+        FindTextAndAddRanges(AMemo, TextToIndicate, [sfoMatchCase, sfoWholeWord], Selections, IndicatorRanges);
       end;
     end;
     AMemo.UpdateIndicators(IndicatorRanges, minWordAtCursorOccurrence);
@@ -4037,7 +4031,7 @@ procedure TMainForm.UpdateOccurrenceIndicators(const AMemo: TIDEScintEdit);
       var TextToIndicate := AMemo.RawMainSelText;
       if Selections.Count = 0 then { If 0 then we didn't already call GetSelections above}
         AMemo.GetSelections(Selections);
-      FindTextAndAddRanges(AMemo, TextToIndicate, GetSelTextOccurrenceFindOptions, Selections, IndicatorRanges);
+      FindTextAndAddRanges(AMemo, TextToIndicate, [], Selections, IndicatorRanges);
     end;
     AMemo.UpdateIndicators(IndicatorRanges, minSelTextOccurrence);
   finally