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

IDE: codehelp: skip code nodes with same fpdoc element

Browse Source 
git-svn-id: trunk@22168 -
This commit is contained in:
mattias 2009-10-14 09:45:40 +00:00
parent c7114afbc4
commit dd3e06155d
1 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ide/codehelp.pas
View File

@ -170,6 +170,8 @@ type
property Items[Index: integer]: TCodeHelpElement read GetItems; default;
property Count: integer read GetCount;
function IndexOfFile(AFile: TLazFPDocFile): integer;
function IndexOfElementName(ElementName: string): integer;
function IndexOfElementName(ElementUnitName, ElementName: string): integer;
function IsValid: boolean;
procedure MakeValid;
function DocFile: TLazFPDocFile;
@ -1941,9 +1943,12 @@ var
FPDocFilename: String;
FindContext: TFindContext;
AnOwner: TObject;
NewElementName: String;
NewUnitName: String;
begin
Chain:=nil;
ListOfPCodeXYPosition:=nil;
CodeToolBoss.ActivateWriteLock;
try
//DebugLn(['TCodeHelpManager.GetElementChain GetDeclarationChain...']);
// get the declaration chain
@ -1955,7 +1960,7 @@ begin
exit;
end;
if (not CacheWasUsed) and (not Complete) then exit(chprParsing);
{$IFDEF VerboseLazDoc}
DebugLn(['TCodeHelpManager.GetElementChain init the element chain: ListOfPCodeXYPosition.Count=',ListOfPCodeXYPosition.Count,' ...']);
{$ENDIF}
@ -1974,15 +1979,23 @@ begin
if Result<>chprSuccess then continue;
if (not CacheWasUsed) and (not Complete) then exit(chprParsing);
// get fpdoc element path
NewUnitName:=FindContext.Tool.GetSourceName(false);
NewElementName:=CodeNodeToElementName(FindContext.Tool,FindContext.Node);
// skip code nodes with same fpdoc element
if (Chain.IndexOfElementName(NewUnitName,NewElementName)>=0) then continue;
// add element
CHElement:=Chain.Add;
CHElement.CodeXYPos:=CodePos^;
CHElement.CodeContext:=FindContext;
CHElement.ElementName:=NewElementName;
//DebugLn(['TCodeHelpManager.GetElementChain i=',i,' CodeContext=',FindContextToString(CHElement.CodeContext)]);
// find corresponding FPDoc file
CHElement.ElementUnitFileName:=CHElement.CodeContext.Tool.MainFilename;
CHElement.ElementUnitName:=CHElement.CodeContext.Tool.GetSourceName(false);
CHElement.ElementUnitName:=NewUnitName;
AnOwner:=Self;
FPDocFilename:=GetFPDocFilenameForSource(CHElement.ElementUnitFileName,
false,CacheWasUsed,AnOwner);
@ -2001,9 +2014,6 @@ begin
// get fpdoc nodes
for i:=0 to Chain.Count-1 do begin
CHElement:=Chain[i];
// get fpdoc element path
CHElement.ElementName:=CodeNodeToElementName(CHElement.CodeContext.Tool,
CHElement.CodeContext.Node);
//DebugLn(['TCodeHelpManager.GetElementChain i=',i,' Element=',CHElement.ElementName]);
// get fpdoc node
if (CHElement.FPDocFile<>nil) and (CHElement.ElementName<>'') then begin
@ -2018,6 +2028,7 @@ begin
finally
if Result<>chprSuccess then
FreeAndNil(Chain);
CodeToolBoss.DeactivateWriteLock;
end;
end;
@ -2361,6 +2372,28 @@ begin
end;
end;
function TCodeHelpElementChain.IndexOfElementName(ElementName: string
): integer;
begin
Result:=FItems.Count-1;
while (Result>=0) do begin
if SysUtils.CompareText(Items[Result].ElementName,ElementName)=0 then exit;
dec(Result);
end;
end;
function TCodeHelpElementChain.IndexOfElementName(ElementUnitName,
ElementName: string): integer;
begin
Result:=FItems.Count-1;
while (Result>=0) do begin
if (SysUtils.CompareText(Items[Result].ElementUnitName,ElementUnitName)=0)
and (SysUtils.CompareText(Items[Result].ElementName,ElementName)=0) then
exit;
dec(Result);
end;
end;
function TCodeHelpElementChain.IsValid: boolean;
begin
Result:=(IDEChangeStep=CompilerParseStamp)