From 5a3630c919ec53a09b91e9ad92525a2e6ca12a47 Mon Sep 17 00:00:00 2001
From: dmitry <dmitry@lazarus-ide.org>
Date: Tue, 2 Jun 2020 02:30:43 +0000
Subject: [PATCH] cocoa: changing the implementation of strings count. (if the
 last line is empty, don't recognize it a full line. Compatible with Win32.
 bug #36664

git-svn-id: trunk@63273 -
---
 lcl/interfaces/cocoa/cocoawsstdctrls.pas | 26 +++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lcl/interfaces/cocoa/cocoawsstdctrls.pas b/lcl/interfaces/cocoa/cocoawsstdctrls.pas
index a36a17e400..ed032dfe8f 100644
--- a/lcl/interfaces/cocoa/cocoawsstdctrls.pas
+++ b/lcl/interfaces/cocoa/cocoawsstdctrls.pas
@@ -166,7 +166,6 @@ type
     FTextView: TCocoaTextView;
   public
     class procedure GetLineStart(const s: AnsiString; LineIndex: Integer; var Offset, LinesSkipped: Integer);
-    class function GetLinesCount(const s: AnsiString): Integer;
   protected
     function GetTextStr: string; override;
     procedure SetTextStr(const Value: string); override;
@@ -1227,19 +1226,22 @@ begin
   Offset:=i;
 end;
 
-class function TCocoaMemoStrings.GetLinesCount(const s: AnsiString): Integer;
-var
-  ofs : Integer;
-begin
-  Result:=0;
-  ofs:=0;
-  GetLineStart(s, -1, ofs, Result);
-end;
-
 function TCocoaMemoStrings.GetCount:Integer;
+var
+  s      : NSString;
+  i      : LongWord;
+  strLen : LongWord;
 begin
-  Result:=GetLinesCount(GetTextStr);
-  inc(Result);
+  s := FTextView.string_;
+  // it's a very nice example for Apple's docs
+  // https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/TextLayout/Tasks/CountLines.html
+  strLen := s.length;
+  i := 0;
+  Result := 0;
+  while (i < strLen) do begin
+    i := NSMaxRange(s.lineRangeForRange(NSMakeRange(i, 0)));
+    inc(Result);
+  end;
 end;
 
 function TCocoaMemoStrings.Get(Index:Integer):string;