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

ide: load unit source buffer if it was not loaded before in LoadDependencyHidden, improve verbosity

Browse Source 
git-svn-id: trunk@14848 -
This commit is contained in:
paul 2008-04-16 08:28:44 +00:00
parent c2db5ffa0f
commit b70cfb3a82
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/codetoolmanager.pas
View File

@ -1454,6 +1454,8 @@ begin
MainCode:=GetMainCode(Code); MainCode:=GetMainCode(Code);
if MainCode=nil then begin if MainCode=nil then begin
fErrorMsg:='TCodeToolManager.InitCurCodeTool MainCode=nil'; fErrorMsg:='TCodeToolManager.InitCurCodeTool MainCode=nil';
if Code = nil then
fErrorMsg := fErrorMsg + ' Code=nil';
exit; exit;
end; end;
if MainCode.Scanner=nil then begin if MainCode.Scanner=nil then begin

12
ide/main.pp
View File

@ -5592,7 +5592,7 @@ var
function LoadDependencyHidden(const RefRootName: string): TModalResult; function LoadDependencyHidden(const RefRootName: string): TModalResult;
var var
LFMFilename: String; LFMFilename: String;
LFMCode: TCodeBuffer; UnitCode, LFMCode: TCodeBuffer;
ModalResult: TModalResult; ModalResult: TModalResult;
UnitFilename: String; UnitFilename: String;
RefUnitInfo: TUnitInfo; RefUnitInfo: TUnitInfo;
@ -5620,6 +5620,16 @@ var
Project1.AddFile(RefUnitInfo,false); Project1.AddFile(RefUnitInfo,false);
end; end;
if RefUnitInfo.Source = nil then
begin
ModalResult := LoadCodeBuffer(UnitCode, UnitFileName, [lbfCheckIfText]);
if ModalResult<>mrOk then begin
debugln('TMainIDE.DoFixupComponentReferences Failed loading ',UnitFilename);
exit(mrCancel);
end;
RefUnitInfo.Source := UnitCode;
end;
// load resource hidden // load resource hidden
Result:=DoLoadLFM(RefUnitInfo,LFMCode, Result:=DoLoadLFM(RefUnitInfo,LFMCode,
OpenFlags+[ofLoadHiddenResource],[]); OpenFlags+[ofLoadHiddenResource],[]);