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

IDE: move common code to a local function in TFileOpenClose.FindFile.

Browse Source 
git-svn-id: trunk@45698 -
This commit is contained in:
juha 2014-06-27 08:36:24 +00:00
parent 581bc575ac
commit 1d653dc9e3
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ide/sourcefilemanager.pas
View File

@ -851,9 +851,20 @@ function TFileOpenClose.FindFile(SearchPath: String): Boolean;
// Searches for FileName in SearchPath
// If FileName is not found, we'll check extensions pp and pas too
// Returns true if found. FFileName contains the full file+path in that case
var TempFile,TempPath,CurPath,FinalFile, Ext: String;
var TempFile,TempPath,CurPath: String;
p,c: Integer;
PasExt: TPascalExtType;
function SetFileIfExists(const Ext: String): Boolean;
var
FinalFile: String;
begin
FinalFile:=ExpandFileNameUTF8(CurPath+TempFile+Ext);
Result:=FileExistsUTF8(FinalFile);
if Result then
FFileName:=FinalFile;
end;
begin
if SearchPath='' then SearchPath:='.';
Result:=true;
@ -879,21 +890,11 @@ begin
2: TempFile:=UpperCase(FFileName);
end;
if ExtractFileExt(TempFile)='' then begin
for PasExt:=Low(TPascalExtType) to High(TPascalExtType) do begin
Ext:=PascalExtension[PasExt];
FinalFile:=ExpandFileNameUTF8(CurPath+TempFile+Ext);
if FileExistsUTF8(FinalFile) then begin
FFileName:=FinalFile;
exit;
end;
end;
end else begin
FinalFile:=ExpandFileNameUTF8(CurPath+TempFile);
if FileExistsUTF8(FinalFile) then begin
FFileName:=FinalFile;
exit;
end;
end;
for PasExt:=Low(TPascalExtType) to High(TPascalExtType) do
if SetFileIfExists(PascalExtension[PasExt]) then exit;
end
else
if SetFileIfExists('') then exit;
end;
end;
Result:=false;