mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-26 15:09:23 +02:00
codetools: FindFileAtCursor: disabled directives
git-svn-id: trunk@53289 -
This commit is contained in:
mattias
parent
9e59740549
commit
47fc941c8f
@ -666,6 +666,7 @@ type
|
||||
ffatIncludeFile,
|
||||
ffatDisabledIncludeFile,
|
||||
ffatResource,
|
||||
ffatDisabledResource,
|
||||
ffatLiteral,
|
||||
ffatComment
|
||||
);
|
||||
@ -3495,12 +3496,75 @@ function TFindDeclarationTool.FindFileAtCursor(
|
||||
FoundFilename: string; SearchFor: TFindFileAtCursorFlags;
|
||||
StartPos: PCodeXYPosition): boolean;
|
||||
var
|
||||
CleanPos, CommentStart, CommentEnd: integer;
|
||||
CleanPos: integer;
|
||||
|
||||
function CheckComment(CommentStart, CommentEnd: integer; Enabled: boolean): boolean;
|
||||
var
|
||||
DirectiveName, Param: string;
|
||||
NewCode: TCodeBuffer;
|
||||
MissingIncludeFile: TMissingIncludeFile;
|
||||
NewCodePtr: Pointer;
|
||||
begin
|
||||
Result:=false;
|
||||
// cursor in comment in parsed code
|
||||
{$IFDEF VerboseFindFileAtCursor}
|
||||
debugln(['TFindDeclarationTool.FindFileAtCursor.CheckComment']);
|
||||
{$ENDIF}
|
||||
if ExtractLongParamDirective(Src,CommentStart,DirectiveName,Param) then begin
|
||||
DirectiveName:=lowercase(DirectiveName);
|
||||
if ((Enabled and (ffatIncludeFile in SearchFor))
|
||||
or (not Enabled and (ffatDisabledIncludeFile in SearchFor)))
|
||||
and (DirectiveName='i') or (DirectiveName='include')
|
||||
then begin
|
||||
// include directive
|
||||
if (Param<>'') and (Param[1]<>'%') then begin
|
||||
// include file directive
|
||||
Result:=true;
|
||||
if Enabled then
|
||||
Found:=ffatIncludeFile
|
||||
else
|
||||
Found:=ffatDisabledIncludeFile;
|
||||
if Enabled and IsIncludeDirectiveAtPos(CleanPos,CommentStart,NewCode) then
|
||||
begin
|
||||
FoundFilename:=NewCode.Filename;
|
||||
end else begin
|
||||
FoundFilename:=ResolveDots(GetForcedPathDelims(Param));
|
||||
// search include file
|
||||
MissingIncludeFile:=nil;
|
||||
if Scanner.SearchIncludeFile(FoundFilename,NewCodePtr,
|
||||
MissingIncludeFile)
|
||||
then
|
||||
FoundFilename:=TCodeBuffer(NewCodePtr).Filename;
|
||||
end;
|
||||
exit;
|
||||
end;
|
||||
end else if ((Enabled and (ffatResource in SearchFor))
|
||||
or (not Enabled and (ffatDisabledResource in SearchFor)))
|
||||
and ((DirectiveName='r') or (DirectiveName='resource'))
|
||||
then begin
|
||||
// resource directive
|
||||
Result:=true;
|
||||
if Enabled then
|
||||
Found:=ffatResource
|
||||
else
|
||||
Found:=ffatDisabledResource;
|
||||
FoundFilename:=ResolveDots(GetForcedPathDelims(Param));
|
||||
if (FoundFilename<>'') and (copy(FoundFilename,1,2)='*.') then begin
|
||||
Delete(FoundFilename,1,1);
|
||||
FoundFilename:=ChangeFileExt(MainFilename,FoundFilename);
|
||||
end else if not FilenameIsAbsolute(FoundFilename) then begin
|
||||
FoundFilename:=ResolveDots(ExtractFilePath(MainFilename)+FoundFilename);
|
||||
end;
|
||||
exit;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
var
|
||||
CommentStart, CommentEnd: integer;
|
||||
Node: TCodeTreeNode;
|
||||
aUnitName, UnitInFilename, DirectiveName, Param, Line: string;
|
||||
aUnitName, UnitInFilename, Line: string;
|
||||
NewCode: TCodeBuffer;
|
||||
NewCodePtr: Pointer;
|
||||
MissingIncludeFile: TMissingIncludeFile;
|
||||
begin
|
||||
Result:=false;
|
||||
Found:=ffatNone;
|
||||
@ -3529,52 +3593,20 @@ begin
|
||||
// cursor in parsed code
|
||||
if CleanPosIsInComment(CleanPos,Node.StartPos,CommentStart,CommentEnd,true)
|
||||
then begin
|
||||
// cursor in comment in parsed code
|
||||
{$IFDEF VerboseFindFileAtCursor}
|
||||
debugln(['TFindDeclarationTool.FindFileAtCursor in comment']);
|
||||
{$ENDIF}
|
||||
if ExtractLongParamDirective(Src,CommentStart,DirectiveName,Param)
|
||||
then begin
|
||||
DirectiveName:=lowercase(DirectiveName);
|
||||
if (ffatIncludeFile in SearchFor)
|
||||
and (DirectiveName='i') or (DirectiveName='include') then begin
|
||||
// include directive
|
||||
if (Param<>'') and (Param[1]<>'%') then begin
|
||||
// include file directive
|
||||
Result:=true;
|
||||
Found:=ffatIncludeFile;
|
||||
if IsIncludeDirectiveAtPos(CleanPos,CommentStart,NewCode) then
|
||||
begin
|
||||
FoundFilename:=NewCode.Filename;
|
||||
end else begin
|
||||
FoundFilename:=ResolveDots(GetForcedPathDelims(Param));
|
||||
// search include file
|
||||
MissingIncludeFile:=nil;
|
||||
if Scanner.SearchIncludeFile(FoundFilename,NewCodePtr,
|
||||
MissingIncludeFile)
|
||||
then
|
||||
FoundFilename:=TCodeBuffer(NewCodePtr).Filename;
|
||||
end;
|
||||
exit;
|
||||
end;
|
||||
end else if (ffatResource in SearchFor)
|
||||
and ((DirectiveName='r') or (DirectiveName='resource')) then begin
|
||||
// resource directive
|
||||
Result:=true;
|
||||
Found:=ffatResource;
|
||||
FoundFilename:=ResolveDots(GetForcedPathDelims(Param));
|
||||
if (FoundFilename<>'') and (copy(FoundFilename,1,2)='*.') then begin
|
||||
Delete(FoundFilename,1,1);
|
||||
FoundFilename:=ChangeFileExt(MainFilename,FoundFilename);
|
||||
end else if not FilenameIsAbsolute(FoundFilename) then begin
|
||||
FoundFilename:=ResolveDots(ExtractFilePath(MainFilename)+FoundFilename);
|
||||
end;
|
||||
exit;
|
||||
//debugln(['TFindDeclarationTool.FindFileAtCursor Comment="',copy(Src,CommentStart,CommentEnd-CommentStart),'"']);
|
||||
if (CommentEnd-CommentStart>4)
|
||||
and (Src[CommentStart]='{') and (Src[CommentStart+1]=#3) then begin
|
||||
// cursor in disabled code
|
||||
if CleanPosIsInComment(CleanPos,CommentStart+2,CommentStart,CommentEnd,true)
|
||||
then begin
|
||||
// cursor in disabled comment
|
||||
if CheckComment(CommentStart,CommentEnd,false) then
|
||||
exit(true);
|
||||
end;
|
||||
end;
|
||||
if ffatComment in SearchFor then begin
|
||||
// ToDo: check comment
|
||||
|
||||
end else begin
|
||||
// cursor in enabled comment
|
||||
if CheckComment(CommentStart,CommentEnd,true) then
|
||||
exit(true);
|
||||
end;
|
||||
end else begin
|
||||
{$IFDEF VerboseFindFileAtCursor}
|
||||
|
||||
@ -315,13 +315,14 @@ end;
|
||||
|
||||
procedure TTestFindDeclaration.TestFindDeclaration_FileAtCursor;
|
||||
var
|
||||
Code, SubUnit2Code: TCodeBuffer;
|
||||
Code, SubUnit2Code, LFMCode: TCodeBuffer;
|
||||
Found: TFindFileAtCursorFlag;
|
||||
FoundFilename: string;
|
||||
begin
|
||||
Code:=CodeToolBoss.CreateFile('test1.lpr');
|
||||
Code.Source:='uses unit2 in ''sub/../unit2.pas'';'+LineEnding;
|
||||
SubUnit2Code:=CodeToolBoss.CreateFile('unit2.pas');
|
||||
LFMCode:=CodeToolBoss.CreateFile('test1.lfm');
|
||||
try
|
||||
// --- used unit ---
|
||||
// test cursor on 'unit2'
|
||||
@ -346,20 +347,50 @@ begin
|
||||
+'{$i unit2.pas}'+LineEnding;
|
||||
SubUnit2Code.Source:='';
|
||||
if not CodeToolBoss.FindFileAtCursor(Code,1,2,Found,FoundFilename) then
|
||||
Fail('CodeToolBoss.FindFileAtCursor at uses unit2 failed');
|
||||
AssertEquals('FindFileAtCursor at enabled include directive Found',ord(ffatIncludeFile),ord(Found));
|
||||
AssertEquals('FindFileAtCursor at enabled include directive FoundFilename','unit2.pas',FoundFilename);
|
||||
Fail('CodeToolBoss.FindFileAtCursor at enabled include directive of empty inc failed');
|
||||
AssertEquals('FindFileAtCursor at enabled include directive of empty Found',ord(ffatIncludeFile),ord(Found));
|
||||
AssertEquals('FindFileAtCursor at enabled include directive of empty FoundFilename','unit2.pas',FoundFilename);
|
||||
|
||||
SubUnit2Code.Source:='{$define a}';
|
||||
if not CodeToolBoss.FindFileAtCursor(Code,1,2,Found,FoundFilename) then
|
||||
Fail('CodeToolBoss.FindFileAtCursor at enabled include directive of non-empty inc failed');
|
||||
AssertEquals('FindFileAtCursor at enabled include directive of non-empty Found',ord(ffatIncludeFile),ord(Found));
|
||||
AssertEquals('FindFileAtCursor at enabled include directive of non-empty FoundFilename','unit2.pas',FoundFilename);
|
||||
|
||||
// --- disabled include directive ---
|
||||
// test cursor on disabled include directive
|
||||
Code.Source:='program test1;'+LineEnding
|
||||
+'{$ifdef disabled}'+LineEnding
|
||||
+'{$i unit2.pas}'+LineEnding
|
||||
+'{$endif}'+LineEnding;
|
||||
SubUnit2Code.Source:='';
|
||||
if not CodeToolBoss.FindFileAtCursor(Code,1,3,Found,FoundFilename) then
|
||||
Fail('CodeToolBoss.FindFileAtCursor at disabled include directive failed');
|
||||
AssertEquals('FindFileAtCursor at disabled include directive Found',ord(ffatDisabledIncludeFile),ord(Found));
|
||||
AssertEquals('FindFileAtCursor at disabled include directive FoundFilename','unit2.pas',FoundFilename);
|
||||
|
||||
// --- enabled resource directive ---
|
||||
Code.Source:='program test1;'+LineEnding
|
||||
+'{$R test1.lfm}'+LineEnding;
|
||||
if not CodeToolBoss.FindFileAtCursor(Code,1,2,Found,FoundFilename) then
|
||||
Fail('CodeToolBoss.FindFileAtCursor at enabled resource directive failed');
|
||||
AssertEquals('FindFileAtCursor at enabled resource directive Found',ord(ffatResource),ord(Found));
|
||||
AssertEquals('FindFileAtCursor at enabled resource directive FoundFilename','test1.lfm',FoundFilename);
|
||||
|
||||
Code.Source:='program test1;'+LineEnding
|
||||
+'{$R *.lfm}'+LineEnding;
|
||||
if not CodeToolBoss.FindFileAtCursor(Code,1,2,Found,FoundFilename) then
|
||||
Fail('CodeToolBoss.FindFileAtCursor at enabled resource directive failed');
|
||||
AssertEquals('FindFileAtCursor at enabled resource directive Found',ord(ffatResource),ord(Found));
|
||||
AssertEquals('FindFileAtCursor at enabled resource directive FoundFilename','test1.lfm',FoundFilename);
|
||||
|
||||
finally
|
||||
Code.IsDeleted:=true;
|
||||
SubUnit2Code.IsDeleted:=true;
|
||||
LFMCode.IsDeleted:=true;
|
||||
end;
|
||||
// ToDo: test $i in code
|
||||
// ToDo: test $i 'file with spaces' in code
|
||||
// ToDo: test $i in disabled code
|
||||
// ToDo: test $R file.lfm
|
||||
// ToDo: test $R *.lfm
|
||||
// ToDo: test 'readme.txt' in active code
|
||||
// ToDo: test readme.txt in active code fails
|
||||
// ToDo: test readme.txt in comment works
|
||||
|
||||
Loading…
Reference in New Issue
Block a user