Cleanup.

Author: martijnlaan

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);

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);
@@ -2998,7 +2998,7 @@ procedure TMainForm.ESelectAllOccurrencesClick(Sender: TObject);
   if FActiveMemo.SelEmpty 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.WordAtCursorRange;
+    var Range := FActiveMemo.WordAtCaretRange;
     if Range.StartPos <> Range.EndPos then
       FActiveMemo.SetSingleSelection(Range.EndPos, Range.StartPos);
   end;
@@ -4017,7 +4017,7 @@ 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 }