paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-23 21:19:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

codetools: beautifier: do not split line in the point at some previous line and not after line break, patch #27671 form Anton

Browse Source 
git-svn-id: trunk@48343 -
This commit is contained in:
mattias 2015-03-14 16:04:40 +00:00
parent b981df5ee5
commit d40e78e415
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/codetools/sourcechanger.pas
View File

@ -1337,7 +1337,7 @@ begin
// start new line if necessary // start new line if necessary
if (LastLineEndInAtom<1) and (CurLineLen+length(NewAtom)>LineLength) if (LastLineEndInAtom<1) and (CurLineLen+length(NewAtom)>LineLength)
and (LastSplitPos>1) then begin and (LastSplitPos>LastSrcLineStart) then begin
// new atom does not fit into the line and there is a split position // new atom does not fit into the line and there is a split position
// -> split line // -> split line
//DebugLn(['[TBeautifyCodeOptions.AddAtom] NEW LINE CurLineLen=',CurLineLen,' NewAtom="',dbgstr(NewAtom),'" LastSplitPos="',dbgstr(copy(CurCode,LastSplitPos-5,5))+'|'+dbgstr(copy(CurCode,LastSplitPos,5)),'" LineLength=',LineLength]); //DebugLn(['[TBeautifyCodeOptions.AddAtom] NEW LINE CurLineLen=',CurLineLen,' NewAtom="',dbgstr(NewAtom),'" LastSplitPos="',dbgstr(copy(CurCode,LastSplitPos-5,5))+'|'+dbgstr(copy(CurCode,LastSplitPos,5)),'" LineLength=',LineLength]);
@ -1789,7 +1789,7 @@ begin
end; end;
if (not (CurAtomType in DoNotSplitLineInFront)) if (not (CurAtomType in DoNotSplitLineInFront))
and (not (LastAtomType in DoNotSplitLineAfter)) and (not (LastAtomType in DoNotSplitLineAfter+[atNewLine]))
and (CommentLvl=0) then and (CommentLvl=0) then
LastSplitPos:=length(Result)+1; LastSplitPos:=length(Result)+1;
{DebugLn('SPLIT LINE CurPos='+dbgs(CurPos)+' CurAtom="'+CurAtom+'"' {DebugLn('SPLIT LINE CurPos='+dbgs(CurPos)+' CurAtom="'+CurAtom+'"'