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

Jedi code format: dont't ident comments before procedures at the end of sections. Issue #40533.

Browse Source 
(cherry picked from commit 8035014eaf)
This commit is contained in:
DomingoGP 2023-10-01 21:21:02 +02:00
parent 33f1955e14
commit 6b1e474e2b
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/jcf2/Process/Indent/Indenter.pas
View File

@ -128,6 +128,16 @@ begin
Result := True;
end;
function HasEmptyLineAfterComment(const pt: TSourceToken): Boolean;
var
pnext: TSourceToken;
begin
result:=false;
pnext:=pt.NextTokenWithExclusions([ttWhiteSpace]); //End of current line
if (pnext<>nil) and (pnext.TokenType=ttReturn) then
result:= pnext.NextTokenTypeWithExclusions([ttWhiteSpace])=ttReturn;
end;
function IsIndented(const pt: TSourceToken): Boolean;
begin
Result := IsFirstSolidTokenOnLine(pt);
@ -669,6 +679,21 @@ begin
end;
end;
// last comments in var, const,... sections belongs to the next procedure/function.
if (pt.TokenType=ttComment) and pt.HasParentNode([nTypeSection,nVarSection,nConstSection,nUses])
and (pt.NextSolidTokenType in ProcedureWords)
and ( not pt.HasParentNode(ObjectBodies + [nRecordType]))
//not followed by a blank line.
and not HasEmptyLineAfterComment(pt) then
begin
Result:=0;
if FormattingSettings.Indent.IndentLibraryProcs then
begin
if pt.HasParentNode([nLibrary, nProgram]) and (liIndentCount >= 1) then
Result:=1;
end;
end;
end;
constructor TIndenter.Create;