forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Autofix for LambdaReturnCheck (#151)

This commit is contained in:
Vladiwostok 2024-11-09 21:44:41 +02:00 committed by Albert24GG
parent 14ccbeb354
commit 7980ac3a3b
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/dscanner/analysis/lambda_return_check.d
View File

@ -8,7 +8,6 @@ module dscanner.analysis.lambda_return_check;
import dscanner.analysis.base; import dscanner.analysis.base;
import dmd.tokens : Token, TOK; import dmd.tokens : Token, TOK;
// TODO: Fix AutoFix
extern (C++) class LambdaReturnCheck(AST) : BaseAnalyzerDmd extern (C++) class LambdaReturnCheck(AST) : BaseAnalyzerDmd
{ {
alias visit = BaseAnalyzerDmd.visit; alias visit = BaseAnalyzerDmd.visit;
@ -52,15 +51,45 @@ extern (C++) class LambdaReturnCheck(AST) : BaseAnalyzerDmd
if (lambda.fbody.isReturnStatement() is null) if (lambda.fbody.isReturnStatement() is null)
return; return;
auto tokenRange = tokens.filter!(t => t.loc.fileOffset > lambda.loc.fileOffset) auto lambdaRange = tokens.filter!(t => t.loc.fileOffset > lambda.loc.fileOffset)
.filter!(t => t.loc.fileOffset < lambda.endloc.fileOffset) .filter!(t => t.loc.fileOffset < lambda.endloc.fileOffset);
.find!(t => t.value == TOK.goesTo); auto tokenRange = lambdaRange.find!(t => t.value == TOK.goesTo);
if (!tokenRange.canFind!(t => t.value == TOK.leftCurly)) if (!tokenRange.canFind!(t => t.value == TOK.leftCurly))
return; return;
if (!tokenRange.canFind!(t => t.value == TOK.leftParenthesis)) if (!tokenRange.canFind!(t => t.value == TOK.leftParenthesis))
addErrorMessage(cast(ulong) lambda.loc.linnum, cast(ulong) lambda.loc.charnum, KEY, MSG); {
auto start = tokenRange.front.loc.fileOffset;
AutoFix fix0;
auto firstParam = (*(lambda.getParameterList().parameters))[0];
if (hasParensOnParams((*(lambda.getParameterList().parameters))[0]))
fix0 = AutoFix.replacement(start, start + 3, "", "Remove arrow (use function body)");
else
fix0 = AutoFix.insertionAt(firstParam.loc.fileOffset, "(")
.concat(AutoFix.insertionAt(start - 1, ")"))
.concat(AutoFix.replacement(start, start + 3, "", "Remove arrow (use function body)"));
addErrorMessage(
cast(ulong) lambda.loc.linnum, cast(ulong) lambda.loc.charnum, KEY, MSG,
[fix0, AutoFix.insertionAt(start + 2, " ()")]
);
}
}
private bool hasParensOnParams(AST.Parameter param)
{
int idx;
foreach (token; tokens)
{
if (token.loc.fileOffset == param.loc.fileOffset)
break;
idx++;
}
return tokens[idx - 1].value == TOK.leftParenthesis && tokens[idx - 2].value == TOK.leftParenthesis;
} }
} }
@ -88,7 +117,6 @@ unittest
} }
}c.format(msg, msg, msg), sac); }c.format(msg, msg, msg), sac);
/+ TODO: Fix AutoFix
assertAutoFix(q{ assertAutoFix(q{
void main() void main()
{ {
@ -111,7 +139,7 @@ unittest
pragma(msg, typeof((a) { return a; })); // fix:0 pragma(msg, typeof((a) { return a; })); // fix:0
pragma(msg, typeof((a) => () { return a; })); // fix:1 pragma(msg, typeof((a) => () { return a; })); // fix:1
} }
}c, sac);+/ }c, sac, true);
stderr.writeln("Unittest for LambdaReturnCheck passed."); stderr.writeln("Unittest for LambdaReturnCheck passed.");
} }