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

codetools: fixed line indenter unindent for next token

Browse Source 
git-svn-id: trunk@23830 -
This commit is contained in:
mattias 2010-03-03 16:24:54 +00:00
parent efa3daf8eb
commit d131d2469d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/codetools/codebeautifier.pas
View File

@ -1239,7 +1239,7 @@ function TFullyAutomaticBeautifier.FindStackPosForBlockCloseAtPos(
var var
i: Integer; i: Integer;
begin begin
i:=Stack.Top+FindStackPosForBlockCloseAtPos; i:=FindStackPosForBlockCloseAtPos;
if (i>=0) and (i<=Stack.Top) then if (i>=0) and (i<=Stack.Top) then
Result:=Stack.Stack[i].Typ Result:=Stack.Stack[i].Typ
else else
@ -1272,7 +1272,7 @@ function TFullyAutomaticBeautifier.FindStackPosForBlockCloseAtPos(
var var
i: Integer; i: Integer;
begin begin
i:=Stack.Top+FindStackPosForBlockCloseAtPos; i:=FindStackPosForBlockCloseAtPos;
Result:=(StackTopType in bbtAllProcedures) Result:=(StackTopType in bbtAllProcedures)
and (i>0) and (i>0)
and (Stack.Stack[i-1].Typ=bbtClassSection); and (Stack.Stack[i-1].Typ=bbtClassSection);
@ -1290,7 +1290,7 @@ function TFullyAutomaticBeautifier.FindStackPosForBlockCloseAtPos(
var var
i: Integer; i: Integer;
begin begin
i:=Stack.Top+FindStackPosForBlockCloseAtPos; i:=FindStackPosForBlockCloseAtPos;
if i>=0 then if i>=0 then
EndBlock(i+1); EndBlock(i+1);
end; end;

3
components/externhelp/externhelpfrm.pas
View File

@ -540,9 +540,10 @@ var
begin begin
if not (ssLeft in Shift) then begin if not (ssLeft in Shift) then begin
// no left mouse button => stop showing insert mark // no left mouse button => stop showing insert mark
if tvoAutoInsertMark in ItemsTreeView.Options then
DebugLn(['TExternHelpGeneralOptsFrame.ItemsTreeViewMouseMove no left']);
ItemsTreeView.Options:=ItemsTreeView.Options-[tvoAutoInsertMark]; ItemsTreeView.Options:=ItemsTreeView.Options-[tvoAutoInsertMark];
FDragNode:=nil; FDragNode:=nil;
DebugLn(['TExternHelpGeneralOptsFrame.ItemsTreeViewMouseMove no left']);
end else if (not ItemsTreeView.Dragging) then begin end else if (not ItemsTreeView.Dragging) then begin
// left mouse button is presses and not yet dragging => start dragging // left mouse button is presses and not yet dragging => start dragging
TVNode:=ItemsTreeView.GetNodeAt(X,Y); TVNode:=ItemsTreeView.GetNodeAt(X,Y);