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

codetools: debug gather unit names

Browse Source 
git-svn-id: trunk@54671 -
This commit is contained in:
mattias 2017-04-21 20:33:14 +00:00
parent 834318e937
commit 01f25f27ce
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/codetools/identcompletiontool.pas
View File

@ -1591,7 +1591,8 @@ begin
UnitPath:=''; UnitPath:='';
SrcPath:=''; SrcPath:='';
GatherUnitAndSrcPath(UnitPath,SrcPath); GatherUnitAndSrcPath(UnitPath,SrcPath);
//DebugLn('TIdentCompletionTool.GatherUnitnames UnitPath="',UnitPath,'" SrcPath="',SrcPath,'"'); CurSourceName:=GetSourceName;
//DebugLn('TIdentCompletionTool.GatherUnitnames CurSourceName="',CurSourceName,'" UnitPath="',UnitPath,'" SrcPath="',SrcPath,'"');
BaseDir:=ExtractFilePath(MainFilename); BaseDir:=ExtractFilePath(MainFilename);
FIDTTreeOfUnitFiles:=nil; FIDTTreeOfUnitFiles:=nil;
FIDTTreeOfNamespaces:=nil; FIDTTreeOfNamespaces:=nil;
@ -1603,33 +1604,38 @@ begin
if Scanner.CompilerMode=cmMacPas then if Scanner.CompilerMode=cmMacPas then
UnitExt:=UnitExt+';p'; UnitExt:=UnitExt+';p';
GatherUnitFiles(BaseDir,UnitPath,UnitExt,NameSpacePath,false,true,FIDTTreeOfUnitFiles, FIDTTreeOfNamespaces); GatherUnitFiles(BaseDir,UnitPath,UnitExt,NameSpacePath,false,true,FIDTTreeOfUnitFiles, FIDTTreeOfNamespaces);
//debugln(['TIdentCompletionTool.GatherUnitnames UnitPath ',FIDTTreeOfUnitFiles.Count]);
// search in srcpath // search in srcpath
SrcExt:='pp;pas'; SrcExt:='pp;pas';
if Scanner.CompilerMode=cmMacPas then if Scanner.CompilerMode=cmMacPas then
SrcExt:=SrcExt+';p'; SrcExt:=SrcExt+';p';
GatherUnitFiles(BaseDir,SrcPath,SrcExt,NameSpacePath,false,true,FIDTTreeOfUnitFiles, FIDTTreeOfNamespaces); GatherUnitFiles(BaseDir,SrcPath,SrcExt,NameSpacePath,false,true,FIDTTreeOfUnitFiles, FIDTTreeOfNamespaces);
//debugln(['TIdentCompletionTool.GatherUnitnames Plus SrcPath ',FIDTTreeOfUnitFiles.Count]);
// add unitlinks // add unitlinks
if Scanner.PascalCompiler=pcFPC then
GatherUnitsFromSet; GatherUnitsFromSet;
//debugln(['TIdentCompletionTool.GatherUnitnames Plus FPC units ',FIDTTreeOfUnitFiles.Count]);
// create list // create list
CurSourceName:=GetSourceName; if FIDTTreeOfUnitFiles<>nil then
if FIDTTreeOfUnitFiles<> nil then
begin begin
ANode:=FIDTTreeOfUnitFiles.FindLowest; ANode:=FIDTTreeOfUnitFiles.FindLowest;
while ANode<>nil do begin while ANode<>nil do begin
UnitFileInfo:=TUnitFileInfo(ANode.Data); UnitFileInfo:=TUnitFileInfo(ANode.Data);
ANode:=FIDTTreeOfUnitFiles.FindSuccessor(ANode);
//debugln(['TIdentCompletionTool.GatherUnitnames Unit=',UnitFileInfo.FileUnitName,' File=',UnitFileInfo.Filename]);
if CompareText(PChar(Pointer(UnitFileInfo.FileUnitName)), Length(UnitFileInfo.FileUnitName), if CompareText(PChar(Pointer(UnitFileInfo.FileUnitName)), Length(UnitFileInfo.FileUnitName),
PChar(Pointer(CurSourceName)), Length(CurSourceName), False)<>0 PChar(Pointer(CurSourceName)), Length(CurSourceName), False)=0
then begin then
continue;
NewItem:=CUnitNameSpaceIdentifierListItem.Create( NewItem:=CUnitNameSpaceIdentifierListItem.Create(
icompCompatible,true,0, icompCompatible,true,0,
CurrentIdentifierList.CreateIdentifier(UnitFileInfo.FileUnitNameWithoutNamespace), CurrentIdentifierList.CreateIdentifier(UnitFileInfo.FileUnitNameWithoutNamespace),
0,nil,nil,ctnUnit, PChar(UnitFileInfo.FileUnitName), UnitFileInfo.IdentifierStartInUnitName); 0,nil,nil,ctnUnit, PChar(UnitFileInfo.FileUnitName), UnitFileInfo.IdentifierStartInUnitName);
if NewItem.IdentifierStartInUnitName < 1 then if NewItem.IdentifierStartInUnitName < 1 then
NewItem.IdentifierStartInUnitName := 1; NewItem.IdentifierStartInUnitName := 1;
//debugln(['TIdentCompletionTool.GatherUnitnames Add ',UnitFileInfo.FileUnitName,' NewCount=',CurrentIdentifierList]);
CurrentIdentifierList.Add(NewItem); CurrentIdentifierList.Add(NewItem);
end; end;
ANode:=FIDTTreeOfUnitFiles.FindSuccessor(ANode);
end;
end; end;
if FIDTTreeOfNamespaces<>nil then if FIDTTreeOfNamespaces<>nil then
begin begin
@ -2929,7 +2935,7 @@ begin
CurrentIdentifierList:=nil; CurrentIdentifierList:=nil;
end; end;
{$IFDEF CTDEBUG} {$IFDEF CTDEBUG}
DebugLn('TIdentCompletionTool.GatherIdentifiers END'); DebugLn(['TIdentCompletionTool.GatherIdentifiers END ']);
{$ENDIF} {$ENDIF}
end; end;