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

codetools: clean up

Browse Source 
git-svn-id: trunk@48654 -
This commit is contained in:
mattias 2015-04-06 17:06:53 +00:00
parent 39dcf2b4ff
commit 5182b88700
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/codetools/codecompletiontool.pas
View File

@ -1936,7 +1936,7 @@ var
DebugLn(' CompleteLocalIdentifierByParameter.AddProcedure: jumping to new method body...');
{$ENDIF}
// jump to new method body
if not JumpToMethod(AMethodDefinition,AMethodAttr,NewPos,NewTopLine,false)
if not JumpToMethod(AMethodDefinition,AMethodAttr,NewPos,NewTopLine)
then
RaiseException('CompleteLocalIdentifierByParameter.AddProcedure JumpToMethod failed');
end;
@ -2050,7 +2050,7 @@ begin
DebugLn(' CompleteEventAssignment: jumping to new method body...');
{$ENDIF}
// jump to new method body
if not JumpToMethod(AMethodDefinition,AMethodAttr,NewPos,NewTopLine,false)
if not JumpToMethod(AMethodDefinition,AMethodAttr,NewPos,NewTopLine)
then
RaiseException('CompleteEventAssignment Internal Error 2');
@ -2158,7 +2158,7 @@ function TCodeCompletionCodeTool.CompleteLocalIdentifierByParameter(
DebugLn(' CompleteLocalIdentifierByParameter.AddMethod: jumping to new method body...');
{$ENDIF}
// jump to new method body
if not JumpToMethod(AMethodDefinition,AMethodAttr,NewPos,NewTopLine,false)
if not JumpToMethod(AMethodDefinition,AMethodAttr,NewPos,NewTopLine)
then
RaiseException('CompleteLocalIdentifierByParameter.AddMethod JumpToMethod failed');
end;
@ -2184,7 +2184,7 @@ function TCodeCompletionCodeTool.CompleteLocalIdentifierByParameter(
DebugLn(' CompleteLocalIdentifierByParameter.AddProcedure: jumping to new method body...');
{$ENDIF}
// jump to new method body
if not JumpToMethod(AMethodDefinition,AMethodAttr,NewPos,NewTopLine,false)
if not JumpToMethod(AMethodDefinition,AMethodAttr,NewPos,NewTopLine)
then
RaiseException('CompleteLocalIdentifierByParameter.AddProcedure JumpToMethod failed');
end;

8
components/codetools/methodjumptool.pas
View File

@ -40,7 +40,7 @@ uses
{$IFDEF MEM_CHECK}
MemCheck,
{$ENDIF}
Classes, SysUtils, FileProcs, CodeTree, CodeAtom, PascalParserTool,
Classes, SysUtils, FileProcs, CodeTree, PascalParserTool,
StdCodeTools, CodeTemplatesTool, KeywordFuncLists, BasicCodeTools,
LinkScanner, CodeCache, AVL_Tree;
@ -69,8 +69,7 @@ type
function FindFirstDifferenceNode(SearchForNodes, SearchInNodes: TAVLTree;
var DiffTxtPos: integer): TAVLTreeNode;
function JumpToMethod(const ProcHead: string; Attr: TProcHeadAttributes;
var NewPos: TCodeXYPosition; var NewTopLine: integer;
IgnoreJumpCentered: boolean): boolean;
var NewPos: TCodeXYPosition; var NewTopLine: integer): boolean;
function FindNodeExtInTree(ATree: TAVLTree;
const UpperCode: string): TCodeTreeNodeExtension;
function CreateSubProcPath(StartNode: TCodeTreeNode;
@ -1209,8 +1208,7 @@ end;
function TMethodJumpingCodeTool.JumpToMethod(const ProcHead: string;
Attr: TProcHeadAttributes;
var NewPos: TCodeXYPosition; var NewTopLine: integer;
IgnoreJumpCentered: boolean): boolean;
var NewPos: TCodeXYPosition; var NewTopLine: integer): boolean;
var SectionNode, CurProcNode: TCodeTreeNode;
CurProcHead: string;
begin