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

Codetools: Fixed incorrect auto-indent when pasting code. Issue #19836, patch from Anton

Browse Source 
git-svn-id: trunk@31872 -
This commit is contained in:
juha 2011-08-05 12:37:05 +00:00
parent 21b9e581d4
commit 8b1fb0e09d
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/codetools/codebeautifier.pas
View File

@ -135,6 +135,8 @@ type
bbtMainBegin,
bbtFreeBegin, // a normal begin
bbtRepeat,
bbtWhile,
bbtWhileDo, // child of bbtWhile
bbtFor,
bbtForDo, // child of bbtFor
bbtCase,
@ -162,7 +164,7 @@ const
bbtAllCodeSections = [bbtInterface,bbtImplementation,bbtInitialization,
bbtFinalization];
bbtAllStatementParents = [bbtMainBegin,bbtFreeBegin,bbtProcedureBegin,
bbtRepeat,bbtForDo,
bbtRepeat,bbtWhileDo,bbtForDo,
bbtCaseColon,bbtCaseElse,
bbtTry,bbtFinally,bbtExcept,
bbtIfThen,bbtIfElse,bbtIfBegin];
@ -170,8 +172,8 @@ const
bbtStatement,bbtStatementRoundBracket,bbtStatementEdgedBracket];
bbtAllBrackets = [bbtTypeRoundBracket,bbtTypeEdgedBracket,
bbtStatementRoundBracket,bbtStatementEdgedBracket];
bbtAllAutoEnd = [bbtStatement,bbtIf,bbtIfThen,bbtIfElse,bbtFor,bbtForDo,
bbtCaseLabel,bbtCaseColon];
bbtAllAutoEnd = [bbtStatement,bbtIf,bbtIfThen,bbtIfElse,bbtWhile,bbtWhileDo,
bbtFor,bbtForDo,bbtCaseLabel,bbtCaseColon];
bbtAllAlignToSibling = [bbtNone]+bbtAllStatements;
const
@ -207,6 +209,8 @@ const
'bbtMainBegin',
'bbtFreeBegin',
'bbtRepeat',
'bbtWhile',
'bbtWhileDo',
'bbtFor',
'bbtForDo',
'bbtCase',
@ -859,8 +863,10 @@ begin
case UpChars[r[1]] of
'O':
if CompareIdentifiers('DO',r)=0 then begin
if Stack.TopType=bbtFor then
BeginBlock(bbtForDo);
case Stack.TopType of
bbtWhile: BeginBlock(bbtWhileDo);
bbtFor: BeginBlock(bbtForDo);
end;
end;
'E':
if CompareIdentifiers('DESTRUCTOR',r)=0 then
@ -1143,6 +1149,11 @@ begin
if CompareIdentifiers('VAR',r)=0 then begin
StartIdentifierSection(bbtVarSection);
end;
'W':
if CompareIdentifiers('WHILE',r)=0 then begin
if Stack.TopType in bbtAllStatements then
BeginBlock(bbtWhile)
end;
';':
begin
// common syntax error: unclosed bracket => ignore it