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

IDE: check for unit forms implies using interfaces

Browse Source 
git-svn-id: trunk@36480 -
This commit is contained in:
mattias 2012-03-31 12:30:57 +00:00
parent d9645f4278
commit 69f2bc9bd7
3 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/lazarusidestrconsts.pas
View File

@ -2090,8 +2090,8 @@ resourcestring
lisTheContainsANotExistingDirectory = 'The %s contains a not existing '
+'directory:%s%s';
lisTheProjectDoesNotUseTheLCLUnitInterfacesButItSeems = 'The project does '
+'not use the LCL unit interfaces, but it seems it needs it.%sYou will '
+'get strange linker errors if you use the LCL forms without interfaces.';
+'not use the LCL unit interfaces, which is required by LCLBase.%sYou will '
+'get strange linker errors if you use the LCL without interfaces.';
lisAddUnitInterfaces = 'Add unit interfaces';
lisCCODatesDiffer = 'The dates of the .ppu files of FPC'
+' differ more than one hour.%s'

6
ide/main.pp
View File

@ -11797,10 +11797,10 @@ begin
MainUnitInfo:=Project1.MainUnitInfo;
if (MainUnitInfo=nil) or (MainUnitInfo.Source=nil) then exit;
if PackageGraph.FindDependencyRecursively(Project1.FirstRequiredDependency,
PackageGraph.LCLPackage)=nil
PackageGraph.LCLBasePackage)=nil
then
exit; // project does not use LCL
// project uses LCL
exit; // project does not use LCLBase
// project uses LCLBase
MainUsesSection:=nil;
ImplementationUsesSection:=nil;
try

94
ide/msgquickfixes.pas
View File

@ -323,6 +323,55 @@ procedure TQuickFixUnitNotFoundPosition.Execute(const Msg: TIDEMessageLine;
end;
end;
procedure CheckUnitUsedByIDE(MissingUnitname: string;
var PPUFilename, PkgName: string);
var
i, j: Integer;
Pkg: TIDEPackage;
PkgFile: TLazPackageFile;
DirCache: TCTDirectoryCache;
UnitOutDir: String;
begin
// search ppu in installed packages
if PPUFilename='' then begin
for i:=0 to PackageEditingInterface.GetPackageCount-1 do begin
Pkg:=PackageEditingInterface.GetPackages(i);
if Pkg.AutoInstall=pitNope then continue;
UnitOutDir:=Pkg.LazCompilerOptions.GetUnitOutputDirectory(false);
//debugln(['TQuickFixUnitNotFoundPosition.Execute ',Pkg.Name,' UnitOutDir=',UnitOutDir]);
if FilenameIsAbsolute(UnitOutDir) then begin
DirCache:=CodeToolBoss.DirectoryCachePool.GetCache(UnitOutDir,true,false);
PPUFilename:=DirCache.FindFile(MissingUnitname+'.ppu',ctsfcLoUpCase);
//debugln(['TQuickFixUnitNotFoundPosition.Execute ShortPPU=',PPUFilename]);
if PPUFilename<>'' then begin
PkgName:=Pkg.Name;
PPUFilename:=AppendPathDelim(DirCache.Directory)+PPUFilename;
break;
end;
end;
end;
end;
if PkgName='' then begin
// search unit in installed packages
for i:=0 to PackageEditingInterface.GetPackageCount-1 do begin
Pkg:=PackageEditingInterface.GetPackages(i);
if Pkg.AutoInstall=pitNope then continue;
if CompareTextCT(Pkg.Name,MissingUnitname)=0 then begin
PkgName:=Pkg.Name;
break;
end;
for j:=0 to Pkg.FileCount-1 do begin
PkgFile:=Pkg.Files[j];
if not FilenameIsPascalUnit(PkgFile.Filename) then continue;
if CompareTextCT(ExtractFileNameOnly(PkgFile.Filename),MissingUnitname)<>0
then continue;
PkgName:=Pkg.Name;
break;
end;
end;
end;
end;
var
CodeBuf: TCodeBuffer;
MissingUnitname: String;
@ -331,16 +380,10 @@ var
Dir: String;
PPUFilename: String;
s: String;
i: Integer;
Pkg: TIDEPackage;
UnitOutDir: String;
Filename: string;
Line: integer;
Col: integer;
DirCache: TCTDirectoryCache;
PkgName: String;
PkgFile: TLazPackageFile;
j: Integer;
begin
if Step<>imqfoImproveMessage then exit;
//DebugLn('QuickFixUnitNotFoundPosition ');
@ -413,44 +456,7 @@ begin
//debugln(['TQuickFixUnitNotFoundPosition.Execute AAA1 PPUFilename=',PPUFilename,' IsFileInIDESrcDir=',IsFileInIDESrcDir(Dir+'test')]);
PkgName:='';
if IsFileInIDESrcDir(Dir+'test') then begin
// search ppu in installed packages
if PPUFilename='' then begin
for i:=0 to PackageEditingInterface.GetPackageCount-1 do begin
Pkg:=PackageEditingInterface.GetPackages(i);
if Pkg.AutoInstall=pitNope then continue;
UnitOutDir:=Pkg.LazCompilerOptions.GetUnitOutputDirectory(false);
//debugln(['TQuickFixUnitNotFoundPosition.Execute ',Pkg.Name,' UnitOutDir=',UnitOutDir]);
if FilenameIsAbsolute(UnitOutDir) then begin
DirCache:=CodeToolBoss.DirectoryCachePool.GetCache(UnitOutDir,true,false);
PPUFilename:=DirCache.FindFile(MissingUnitname+'.ppu',ctsfcLoUpCase);
//debugln(['TQuickFixUnitNotFoundPosition.Execute ShortPPU=',PPUFilename]);
if PPUFilename<>'' then begin
PkgName:=Pkg.Name;
PPUFilename:=AppendPathDelim(DirCache.Directory)+PPUFilename;
break;
end;
end;
end;
end;
if PkgName='' then begin
// search unit in installed packages
for i:=0 to PackageEditingInterface.GetPackageCount-1 do begin
Pkg:=PackageEditingInterface.GetPackages(i);
if Pkg.AutoInstall=pitNope then continue;
if CompareTextCT(Pkg.Name,MissingUnitname)=0 then begin
PkgName:=Pkg.Name;
break;
end;
for j:=0 to Pkg.FileCount-1 do begin
PkgFile:=Pkg.Files[j];
if not FilenameIsPascalUnit(PkgFile.Filename) then continue;
if CompareTextCT(ExtractFileNameOnly(PkgFile.Filename),MissingUnitname)<>0
then continue;
PkgName:=Pkg.Name;
break;
end;
end;
end;
CheckUnitUsedByIDE(MissingUnitname,PPUFilename,PkgName);
end;
if PPUFilename<>'' then begin