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

codetools: beautifiying end, bug #12078

Browse Source 
git-svn-id: trunk@16509 -
This commit is contained in:
mattias 2008-09-09 21:16:10 +00:00
parent 1261d75b75
commit 595bc12c8c
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/codetools/keywordfunclists.pas
View File

@ -104,6 +104,7 @@ var
IsKeyWordProcedureBracketSpecifier, IsKeyWordProcedureBracketSpecifier,
IsKeyWordSection, IsKeyWordSection,
IsKeyWordInConstAllowed, IsKeyWordInConstAllowed,
AllKeyWords,
WordIsKeyWord, WordIsKeyWord,
WordIsDelphiKeyWord, WordIsDelphiKeyWord,
IsWordBuiltInFunc, IsWordBuiltInFunc,
@ -941,8 +942,6 @@ begin
Add('NOT',{$ifdef FPC}@{$endif}AllwaysTrue); Add('NOT',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('OBJECT',{$ifdef FPC}@{$endif}AllwaysTrue); Add('OBJECT',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('OF',{$ifdef FPC}@{$endif}AllwaysTrue); Add('OF',{$ifdef FPC}@{$endif}AllwaysTrue);
//Add('OPERATOR',{$ifdef FPC}@{$endif}AllwaysTrue); // not for Delphi
//Add('ON',{$ifdef FPC}@{$endif}AllwaysTrue); // not for Delphi
Add('OR',{$ifdef FPC}@{$endif}AllwaysTrue); Add('OR',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('PACKED',{$ifdef FPC}@{$endif}AllwaysTrue); Add('PACKED',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('PROCEDURE',{$ifdef FPC}@{$endif}AllwaysTrue); Add('PROCEDURE',{$ifdef FPC}@{$endif}AllwaysTrue);
@ -968,7 +967,18 @@ begin
Add('WITH',{$ifdef FPC}@{$endif}AllwaysTrue); Add('WITH',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('XOR',{$ifdef FPC}@{$endif}AllwaysTrue); Add('XOR',{$ifdef FPC}@{$endif}AllwaysTrue);
end; end;
AllKeyWords:=TKeyWordFunctionList.Create;
KeyWordLists.Add(AllKeyWords);
AllKeyWords.Add(WordIsKeyWord);
with AllKeyWords do begin
Add('END',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('PROPERTY',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('GENERIC',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('ON',{$ifdef FPC}@{$endif}AllwaysTrue);
Add('OUT',{$ifdef FPC}@{$endif}AllwaysTrue);
end;
IsWordBuiltInFunc:=TKeyWordFunctionList.Create; IsWordBuiltInFunc:=TKeyWordFunctionList.Create;
KeyWordLists.Add(IsWordBuiltInFunc); KeyWordLists.Add(IsWordBuiltInFunc);
with IsWordBuiltInFunc do begin with IsWordBuiltInFunc do begin

2
components/codetools/sourcechanger.pas
View File

@ -985,7 +985,7 @@ begin
// beautify identifier // beautify identifier
if IsIdentStartChar[NewAtom[1]] then begin if IsIdentStartChar[NewAtom[1]] then begin
if WordIsKeyWord.DoItCaseInsensitive(NewAtom) then if AllKeyWords.DoItCaseInsensitive(NewAtom) then
NewAtom:=BeautifyWord(NewAtom,KeyWordPolicy) NewAtom:=BeautifyWord(NewAtom,KeyWordPolicy)
else else
NewAtom:=BeautifyWord(NewAtom,IdentifierPolicy); NewAtom:=BeautifyWord(NewAtom,IdentifierPolicy);

3
lcl/include/wincontrol.inc
View File

@ -5475,6 +5475,7 @@ begin
Include(FWinControlFlags,wcfReAlignNeeded); Include(FWinControlFlags,wcfReAlignNeeded);
exit; exit;
end; end;
Exclude(FWinControlFlags,wcfReAlignNeeded);// avoid calling after rekursive EnableAlign
{$IFDEF VerboseAutoSize} {$IFDEF VerboseAutoSize}
DebugLn('TWinControl.ReAlign A',Name,':',ClassName,' ', Dbgs(BoundsRect)); DebugLn('TWinControl.ReAlign A',Name,':',ClassName,' ', Dbgs(BoundsRect));
{$ENDIF} {$ENDIF}
@ -5482,7 +5483,7 @@ begin
{$IFDEF VerboseAutoSize} {$IFDEF VerboseAutoSize}
DebugLn('TWinControl.ReAlign B',Name,':',ClassName,' ', Dbgs(BoundsRect)); DebugLn('TWinControl.ReAlign B',Name,':',ClassName,' ', Dbgs(BoundsRect));
{$ENDIF} {$ENDIF}
Exclude(FWinControlFlags,wcfReAlignNeeded); Exclude(FWinControlFlags,wcfReAlignNeeded);// done
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------