@@ -103,7 +103,7 @@ TIncludeHandler = class(TInterfacedObject, IIncludeHandler)
103
103
FUnitPaths : TUnitPathsCache;
104
104
strict protected
105
105
procedure AppendUnits (usesNode: TSyntaxNode; const filePath: string; unitList: TStrings);
106
- procedure BuildUsesList (unitNode : TSyntaxNode; const fileName: string; isProject: boolean;
106
+ procedure BuildUsesList (rootNode : TSyntaxNode; const fileName: string; isProject: boolean;
107
107
unitList: TStringList);
108
108
function FindType (node: TSyntaxNode; nodeType: TSyntaxNodeType): TSyntaxNode;
109
109
procedure GetUnitSyntax (const fileName: string; var syntaxTree: TSyntaxNode; var
@@ -243,7 +243,7 @@ procedure TProjectIndexer.AppendUnits(usesNode: TSyntaxNode; const filePath: str
243
243
end ;
244
244
end ;
245
245
246
- procedure TProjectIndexer.BuildUsesList (unitNode : TSyntaxNode; const fileName: string;
246
+ procedure TProjectIndexer.BuildUsesList (rootNode : TSyntaxNode; const fileName: string;
247
247
isProject: boolean; unitList: TStringList);
248
248
var
249
249
fileFolder: string;
@@ -253,21 +253,21 @@ procedure TProjectIndexer.BuildUsesList(unitNode: TSyntaxNode; const fileName: s
253
253
begin
254
254
fileFolder := IncludeTrailingPathDelimiter(ExtractFilePath(fileName));
255
255
if isProject then begin
256
- usesNode := FindType(unitNode , ntUses);
256
+ usesNode := FindType(rootNode , ntUses);
257
257
if assigned(usesNode) then
258
258
AppendUnits(usesNode, fileFolder, unitList);
259
- usesNode := FindType(unitNode , ntContains);
259
+ usesNode := FindType(rootNode , ntContains);
260
260
if assigned(usesNode) then
261
261
AppendUnits(usesNode, fileFolder, unitList);
262
262
end
263
263
else begin
264
- intfNode := FindType(unitNode , ntInterface);
264
+ intfNode := FindType(rootNode , ntInterface);
265
265
if assigned(intfNode) then begin
266
266
usesNode := FindType(intfNode, ntUses);
267
267
if assigned(usesNode) then
268
268
AppendUnits(usesNode, fileFolder, unitList);
269
269
end ;
270
- implNode := FindType(unitNode , ntImplementation);
270
+ implNode := FindType(rootNode , ntImplementation);
271
271
if assigned(implNode) then begin
272
272
usesNode := FindType(implNode, ntUses);
273
273
if assigned(usesNode) then
@@ -518,17 +518,12 @@ procedure TProjectIndexer.ScanUsedUnits(const unitName, fileName: string; isProj
518
518
syntaxTree: TSyntaxNode; syntaxTreeFromParser: boolean);
519
519
var
520
520
unitList: TStringList;
521
- unitNode: TSyntaxNode;
522
521
usesName: string;
523
522
usesPath: string;
524
523
begin
525
- unitNode := FindType(syntaxTree, ntUnit);
526
- if not assigned(unitNode) then
527
- Exit;
528
-
529
524
unitList := TStringList.Create;
530
525
try
531
- BuildUsesList(unitNode , fileName, isProject, unitList);
526
+ BuildUsesList(syntaxTree , fileName, isProject, unitList);
532
527
533
528
NotifyUnitParsed(unitName, fileName, syntaxTree, syntaxTreeFromParser);
534
529
0 commit comments