Continue with TODO

Author: IgorKukhtin

Source/Editor.pas

@@ -1802,12 +1802,8 @@ procedure TEditor.EditorPaintTransient(Sender: TObject; Canvas: TCanvas; Transie
     Exit;
 
   // At this point we have found both characters. Check if both are visible
-  // TODO: Lift. Is FoldHidesLine same as AllFoldRanges.FoldHidesLine?
-  {if Assigned(fText.AllFoldRanges.FoldHidesLine(HighlightCharPos.Line,OutIndex)) or
-    Assigned(fText.AllFoldRanges.FoldHidesLine(ComplementCharPos.Line,OutIndex)) then
-    Exit;}
-  if fText.AllFoldRanges.FoldHidesLine(HighlightCharPos.Line,OutIndex) or
-    fText.AllFoldRanges.FoldHidesLine(ComplementCharPos.Line,OutIndex) then
+  if fText.AllFoldRanges.FoldHidesLine(HighlightCharPos.Line, OutIndex) or
+    fText.AllFoldRanges.FoldHidesLine(ComplementCharPos.Line, OutIndex) then
     Exit;
 
   // Both are visible. Draw them
@@ -1819,7 +1815,7 @@ procedure TEditor.EditorPaintTransient(Sender: TObject; Canvas: TCanvas; Transie
   // Draw the character the caret is at here using this color
   SetColors(HighlightCharPos);
   Pix := fText.RowColumnToPixels(fText.BufferToDisplayPos(HighlightCharPos));
-  // TODO: Lift. Find fText.GutterWidth
+
   if Pix.X > fText.Gutter.Width then begin // only draw if inside viewable area
     S := fText.Lines[HighlightCharPos.Line - 1][HighlightCharPos.Char];
     Canvas.TextOut(Pix.X, Pix.Y, S);
@@ -1828,7 +1824,7 @@ procedure TEditor.EditorPaintTransient(Sender: TObject; Canvas: TCanvas; Transie
   // Then draw complement
   SetColors(ComplementCharPos);
   Pix := fText.RowColumnToPixels(fText.BufferToDisplayPos(ComplementCharPos));
-  // TODO: Lift. Find fText.GutterWidth
+
   if Pix.X > fText.Gutter.Width then begin // only draw if inside viewable area
     S := fText.Lines[ComplementCharPos.Line - 1][ComplementCharPos.Char];
     Canvas.TextOut(Pix.X, Pix.Y, S);

Source/Utils.pas

@@ -490,13 +490,13 @@ function RunAndGetOutput(const Cmd, WorkDir: String;
   si: TStartupInfo;
   pi: TProcessInformation;
   nRead: DWORD;
-  // TODO:: LIFT. Change this to TBytes for example
-  aBuf: array[0..8192] of AnsiChar;
+//  aBuf: array[0..8192] of Byte;
+  aBuf: TBytes;
   sa: TSecurityAttributes;
   hOutputReadTmp, hOutputRead, hOutputWrite, hInputWriteTmp, hInputRead,
     hInputWrite, hErrorWrite: THandle;
-  FOutput: AnsiString;
-  CurrentLine: AnsiString;
+  FOutput: String;
+  CurrentLine: String;
   bAbort: boolean;
 begin
   FOutput := '';
@@ -596,6 +596,8 @@ function RunAndGetOutput(const Cmd, WorkDir: String;
   end;
 
   bAbort := False;
+  SetLength(aBuf, 8192);
+  var BufStr: string := '';
   repeat
     // Ask our caller if he wants us to quit
     if Assigned(CheckAbortFunc) then
@@ -604,15 +606,16 @@ function RunAndGetOutput(const Cmd, WorkDir: String;
       TerminateProcess(pi.hProcess, 1);
       Break;
     end;
-    if (not ReadFile(hOutputRead, aBuf, SizeOf(aBuf) - 1, nRead, nil)) or (nRead = 0) then begin
+    if (not ReadFile(hOutputRead, (@aBuf[0])^, SizeOf(aBuf) - 1, nRead, nil)) or (nRead = 0) then begin
       if GetLastError = ERROR_BROKEN_PIPE then
         Break; // pipe done - normal exit path
     end;
-    aBuf[nRead] := #0;
-    FOutput := FOutput + PAnsiChar(@aBuf[0]);
+//    aBuf[nRead] := 0;
+    BufStr := TEncoding.Default.GetString(aBuf, Low(aBuf), nRead);
+    FOutput := FOutput + BufStr;
 
     if Assigned(LineOutputFunc) then begin
-      CurrentLine := CurrentLine + PAnsiChar(@aBuf[0]);
+      CurrentLine := CurrentLine + BufStr;
       if CurrentLine[Length(CurrentLine)] = #10 then begin
         Delete(CurrentLine, Length(CurrentLine), 1);
         LineOutputFunc(CurrentLine);