Codetools: Improve class code beautifier, patch from Anton.

git-svn-id: trunk@31984 -
This commit is contained in:
juha 2011-08-14 09:09:57 +00:00
parent e6e192474e
commit ea052b646d

View File

@ -693,7 +693,7 @@ var
procedure StartProcedure(Typ: TFABBlockType); procedure StartProcedure(Typ: TFABBlockType);
begin begin
if Stack.TopType<>bbtDefinition then if not (Stack.TopType in [bbtDefinition,bbtClassSection]) then
EndIdentifierSectionAndProc; EndIdentifierSectionAndProc;
if Stack.TopType in (bbtAllCodeSections+bbtAllProcedures+[bbtNone,bbtDefinition,bbtClassSection]) if Stack.TopType in (bbtAllCodeSections+bbtAllProcedures+[bbtNone,bbtDefinition,bbtClassSection])
then begin then begin
@ -727,8 +727,11 @@ var
if Stack.TopType=bbtProcedureHead then if Stack.TopType=bbtProcedureHead then
EndBlock; EndBlock;
if (Stack.TopType in bbtAllProcedures) and (not IsProcedureImplementation) if (Stack.TopType in bbtAllProcedures) and (not IsProcedureImplementation)
then then begin
EndBlock; EndBlock;
if Stack.TopType=bbtDefinition then
EndBlock;
end;
end; end;
function CheckProcedureModifiers: boolean; function CheckProcedureModifiers: boolean;