paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-11 05:07:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fixed enclose block starting with empty lines, bug #26494

Browse Source 
git-svn-id: trunk@45910 -
This commit is contained in:
mattias 2014-07-18 07:58:57 +00:00
parent 0ca42776d5
commit 73c8a9abf0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ide/encloseselectiondlg.pas
View File

@ -248,13 +248,14 @@ var
IndentStr: String;
MinX: Integer;
MaxX: Integer;
l: Integer;
begin
IndentStr:=GetIndentStr(TemplateIndent-OldSelectionIndent);
for CurY:=SelectionStart.Y to SelectionEnd.Y do begin
CurLine:=Source[CurY-1];
//debugln(['InsertSelection CurY=',CurY,' CurLine="',dbgstr(CurLine),'"']);
MinX:=1;
MaxX:=length(CurLine);
MaxX:=length(CurLine)+1;
if (CurY=SelectionStart.Y) then begin
MinX:=SelectionStart.X;
if MinX<=OldSelectionIndent then
@ -264,7 +265,7 @@ var
end;
if (CurY=SelectionEnd.Y) and (MaxX>SelectionEnd.X) then
MaxX:=SelectionEnd.X;
//debugln(['InsertSelection CurY=',CurY,' Range=',MinX,'-',MaxX,' Indent="',length(IndentStr),'" "',copy(CurLine,MinX,MaxX-MinX+1),'"']);
//debugln(['InsertSelection CurY=',CurY,' Range=',MinX,'-',MaxX,' Indent="',length(IndentStr),'" "',copy(CurLine,MinX,MaxX-MinX),'"']);
X:=1;
// write indent
if (IndentStr<>'') and (CurY<>SelectionStart.Y) then begin
@ -272,9 +273,10 @@ var
inc(X,length(IndentStr));
end;
// write line
if MaxX>=MinX then begin
NewSelect.Write(CurLine[MinX],MaxX-MinX+1);
inc(X,MaxX-MinX+1);
l:=MaxX-MinX;
if l>0 then begin
NewSelect.Write(CurLine[MinX],l);
inc(X,l);
end;
// write line break and adjust cursor
if CurY<SelectionEnd.Y then begin
@ -328,6 +330,7 @@ var
OldSelectionIndent:=CurIndent;
break;
end;
inc(CurY);
end;
end;