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

ToDoList: Improve include file handling. Part of issue #41421.

Browse Source
This commit is contained in:
Juha 2025-02-16 11:31:43 +02:00
parent a5bf264276
commit 4f6cf9605a
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/todolist/todolistcore.pas
View File

@ -432,7 +432,7 @@ end;
class procedure TToDoListCore.ScanFile(const aFileName: string; const aScannedFiles: TAvlTree);
var
ExpandedFilename, Ext, Src: String;
FN, Src: String;
AVLNode: TAvlTreeNode;
Tool: TCodeTool;
Code: TCodeBuffer;
@ -445,10 +445,10 @@ var
IncFiles: TStringList;
begin
//DebugLn(['TToDoListCore.ScanFile ',aFileName]);
ExpandedFilename:=TrimFilename(aFileName);
Code:=CodeToolBoss.LoadFile(ExpandedFilename,true,false);
FN:=TrimFilename(aFileName);
Code:=CodeToolBoss.LoadFile(FN,true,false);
if Code=nil then begin
debugln(['TToDoListCore.ScanFile failed loading ',ExpandedFilename]);
debugln(['TToDoListCore.ScanFile failed loading ',FN]);
exit;
end;
@ -497,20 +497,19 @@ begin
Exit;
end;
// Save include file names. Use heuristics, assume name ends with ".inc".
ExpandedFilename:=CodeXYPosition.Code.Filename;
Ext:=ExtractFileExt(ExpandedFilename);
if Ext='.inc' then
IncFiles.Add(ExpandedFilename);
FN:=CodeXYPosition.Code.Filename;
if FilenameExtIs(FN, 'inc') then
IncFiles.Add(FN);
// Process a comment
CommentEnd:=FindCommentEnd(Src,p,NestedComment);
CommentStr:=copy(Src,p,CommentEnd-p);
//DebugLn(['TToDoListCore.ScanFile CommentStr="',CommentStr,'"']);
if Src[p]='/' then
CreateToDoItem(CurFile,CodeXYPosition.Code.Filename, '//', '', CommentStr, CodeXYPosition.Y)
CreateToDoItem(CurFile, FN, '//', '', CommentStr, CodeXYPosition.Y)
else if Src[p]='{' then
CreateToDoItem(CurFile,CodeXYPosition.Code.Filename, '{', '}', CommentStr, CodeXYPosition.Y)
CreateToDoItem(CurFile, FN, '{', '}', CommentStr, CodeXYPosition.Y)
else if Src[p]='(' then
CreateToDoItem(CurFile,CodeXYPosition.Code.Filename, '(*', '*)', CommentStr, CodeXYPosition.Y);
CreateToDoItem(CurFile, FN, '(*', '*)', CommentStr, CodeXYPosition.Y);
p:=CommentEnd;
until false;
// Copy include file names to fScannedIncFiles