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

fixed searching second file in directory

Browse Source 
git-svn-id: trunk@8955 -
This commit is contained in:
mattias 2006-03-18 01:10:23 +00:00
parent 1f0d4ffeee
commit d8f62890ca
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/codetools/directorycacher.pas
View File

@ -570,7 +570,7 @@ begin
if FileExistsCached(Result) then begin if FileExistsCached(Result) then begin
exit; exit;
end; end;
// try also different extensions // try different extensions too
for pe:=Low(TCTPascalExtType) to High(TCTPascalExtType) do begin for pe:=Low(TCTPascalExtType) to High(TCTPascalExtType) do begin
if CompareFileExt(Result,CTPascalExtension[pe],false)<>0 then if CompareFileExt(Result,CTPascalExtension[pe],false)<>0 then
begin begin
@ -648,12 +648,16 @@ var
CurFilenameLen: LongInt; CurFilenameLen: LongInt;
begin begin
Result:=''; Result:='';
//DebugLn('TCTDirectoryCache.FindUnitSource UnitName="',Unitname,'" AnyCase=',dbgs(AnyCase),' Directory=',Directory); //if (CompareText(UnitName,'AddFileToAPackageDlg')=0) {and (System.Pos('packager',directory)>0)} then
// DebugLn('TCTDirectoryCache.FindUnitSource UnitName="',Unitname,'" AnyCase=',dbgs(AnyCase),' Directory=',Directory);
if UnitName='' then exit; if UnitName='' then exit;
if Directory<>'' then begin if Directory<>'' then begin
UpdateListing; UpdateListing;
if (FListing.Names=nil) then exit; if (FListing.Names=nil) then exit;
// binary search the nearest filename // binary search the nearest filename
//if (CompareText(UnitName,'AddFileToAPackageDlg')=0) and (System.Pos('packager',directory)>0) then
// WriteListing;
l:=0; l:=0;
r:=FListing.NameCount-1; r:=FListing.NameCount-1;
while r>=l do begin while r>=l do begin
@ -669,13 +673,15 @@ begin
end; end;
// now all files above m are higher than the Unitname // now all files above m are higher than the Unitname
// -> check that m is equal or above // -> check that m is equal or above
if (m>0) and (Cmp>0) then if (Cmp>0) then
inc(m); inc(m);
// now all files below m are lower than the Unitname // now all files below m are lower than the Unitname
// -> now find a filename with correct case and extension // -> now find a filename with correct case and extension
while m<FListing.NameCount do begin while m<FListing.NameCount do begin
CurFilename:=@FListing.Names[FListing.NameStarts[m]]; CurFilename:=@FListing.Names[FListing.NameStarts[m]];
CurFilenameLen:=strlen(CurFilename); CurFilenameLen:=strlen(CurFilename);
//if (CompareText(UnitName,'AddFileToAPackageDlg')=0) {and (System.Pos('packager',directory)>0)} then
// DebugLn('TCTDirectoryCache.FindUnitSource NEXT ',CurFilename);
// check if the filename prefix is the unitname // check if the filename prefix is the unitname
// if not, then all filenames are not compatible as well // if not, then all filenames are not compatible as well
@ -701,6 +707,9 @@ begin
end; end;
inc(m); inc(m);
end; end;
//if m<FListing.NameCount then
// if (CompareText(UnitName,'AddFileToAPackageDlg')=0) and (System.Pos('packager',directory)>0) then
// DebugLn('TCTDirectoryCache.FindUnitSource LAST ',CurFilename);
end else begin end else begin
// this is a virtual directory // this is a virtual directory
Result:=Pool.FindVirtualUnit(UnitName); Result:=Pool.FindVirtualUnit(UnitName);