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

codetools: identifier completion: no semicolon outside of statements

Browse Source 
git-svn-id: trunk@16669 -
This commit is contained in:
mattias 2008-09-22 09:37:45 +00:00
parent a58a097488
commit d7a960e8ba
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
components/codetools/identcompletiontool.pas
View File

@ -1537,26 +1537,28 @@ begin
MoveCursorToCleanPos(IdentEndPos); MoveCursorToCleanPos(IdentEndPos);
ReadNextAtom; ReadNextAtom;
CurrentIdentifierList.StartAtomBehind:=CurPos; CurrentIdentifierList.StartAtomBehind:=CurPos;
// check if a semicolon is needed at the end
if (CurrentIdentifierList.StartBracketLvl>0)
or (CurPos.Flag in [cafSemicolon, cafEqual, cafColon, cafComma,
cafPoint, cafRoundBracketOpen, cafRoundBracketClose,
cafEdgedBracketOpen, cafEdgedBracketClose])
or ((CurPos.Flag=cafWord)
and (UpAtomIs('ELSE')
or UpAtomIs('THEN')
or UpAtomIs('DO')
or UpAtomIs('TO')
or UpAtomIs('OF')))
then begin
// do not add semicolon
CurrentIdentifierList.ContextFlags:=
CurrentIdentifierList.ContextFlags+[ilcfNoEndSemicolon];
end;
// check if in statement // check if in statement
if (ilcfStartInStatement in CurrentIdentifierList.ContextFlags) then if (ilcfStartInStatement in CurrentIdentifierList.ContextFlags) then
begin begin
// check if a semicolon is needed at the end // check if a semicolon is needed at the end
if (CurrentIdentifierList.StartBracketLvl>0) if (not (ilcfNoEndSemicolon in CurrentIdentifierList.ContextFlags))
or (CurPos.Flag in [cafSemicolon, cafEqual, cafColon, cafComma, and (not (ilcfStartIsLValue in CurrentIdentifierList.ContextFlags))
cafPoint, cafRoundBracketOpen, cafRoundBracketClose,
cafEdgedBracketOpen, cafEdgedBracketClose])
or ((CurPos.Flag=cafWord)
and (UpAtomIs('ELSE')
or UpAtomIs('THEN')
or UpAtomIs('DO')
or UpAtomIs('TO')
or UpAtomIs('OF')))
then begin
// do not add semicolon
CurrentIdentifierList.ContextFlags:=
CurrentIdentifierList.ContextFlags+[ilcfNoEndSemicolon];
end
else if (not (ilcfStartIsLValue in CurrentIdentifierList.ContextFlags))
then begin then begin
// check if a semicolon is needed at the end // check if a semicolon is needed at the end
if (CurPos.Flag in [cafEnd,cafBegin]) if (CurPos.Flag in [cafEnd,cafBegin])