bk/2024-09-16-1652

Author: Cesar4D

Src/CodeCompletion/DelphiAIDev.CodeCompletion.KeyTab.pas

@@ -45,7 +45,9 @@ procedure TDelphiAIDevCodeCompletionKeyTab.Process(const AContext: IOTAKeyContex
   for i := 0 to Pred(FVars.Contents.Count) do
     LText := LText + FVars.Contents[i].Trim + sLineBreak;
 
-  AContext.EditBuffer.EditPosition.Delete(FVars.Contents.Count);
+  if FVars.Contents.Count > 1 then
+    AContext.EditBuffer.EditPosition.Delete(Pred(FVars.Contents.Count));
+
   AContext.EditBuffer.EditPosition.InsertText(LText.Trim);
   //Context.EditBuffer.EditPosition.Move(TDelphiAIDevCodeCompletionVars.GetInstance.LineEnd, 20);
 

Src/CodeCompletion/DelphiAIDev.CodeCompletion.Search.pas

@@ -62,7 +62,7 @@ procedure TDelphiAIDevCodeCompletionSearch.Process(const AContext: IOTAKeyContex
 var
   LRow: Integer;
   LColumn: Integer;
-  LText: string;
+  LBlankTextLines: string;
   i: Integer;
   LIOTAEditPosition: IOTAEditPosition;
 begin
@@ -101,11 +101,11 @@ procedure TDelphiAIDevCodeCompletionSearch.Process(const AContext: IOTAKeyContex
     FVars.LineIni := LRow;
     FVars.LineEnd := FVars.LineIni + FVars.Contents.Count;
 
-    LText := '';
-    for i := 0 to Pred(FVars.Contents.Count) do
-      LText := LText + sLineBreak;
+    LBlankTextLines := '';
+    for i := 1 to Pred(FVars.Contents.Count) do
+      LBlankTextLines := LBlankTextLines + sLineBreak;
 
-    LIOTAEditPosition.InsertText(LText); //.TrimRight + sLineBreak);
+    LIOTAEditPosition.InsertText(LBlankTextLines);
     LIOTAEditPosition.Move(FVars.LineIni, LColumn);
   finally
     Screen.Cursor := crDefault;

Src/Utils/DelphiAIDev.Utils.pas

@@ -384,6 +384,10 @@ class function TUtils.CodeIdMarkBeginCode(const AValue: string): Boolean;
 end;
 
 class function TUtils.ConfReturnAI(const AValue: string): string;
+var
+  LStrings: TStrings;
+  LStrLine: string;
+  i: Integer;
 begin
   Result := AValue.Trim
     .Replace(TConsts.MARK_BEGIN_DELPHI, '', [rfReplaceAll, rfIgnoreCase])
@@ -392,6 +396,28 @@ class function TUtils.ConfReturnAI(const AValue: string): string;
     .Replace(TConsts.MARK_BEGIN_SQL, '', [rfReplaceAll, rfIgnoreCase])
     .Replace(TConsts.MARK_BEGIN_SQL2, '', [rfReplaceAll, rfIgnoreCase])
     .Replace(TConsts.MARK_END, '', [rfReplaceAll, rfIgnoreCase]);
+
+  LStrings := TStringList.Create;
+  try
+    LStrings.Text := Result;
+
+    Result := '';
+    for i := 0 to Pred(LStrings.Count) do
+    begin
+      LStrLine := LStrings[i];
+      if (i = 0) and ((LStrLine.Trim.IsEmpty)or(LStrLine = sLineBreak)) then
+        Continue;
+
+      //if (i = Pred(LStrings.Count)) and ((LStrLine.Trim.IsEmpty) or (LStrLine = sLineBreak)) then
+      //  Continue;
+
+      Result := Result + LStrLine + sLineBreak;
+    end;
+
+    Result := Result.TrimRight;
+  finally
+    LStrings.Free;
+  end;
 end;
 
 class function TUtils.ProcessTextForEditor(const AText: string): string;