mirrors/D-Scanner
1
0
Fork 0
mirror of https://github.com/dlang-community/D-Scanner.git synced 2025-04-28 06:10:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Autofix for AutoFunctionChecker (#149)

Browse source
This commit is contained in:
Vladiwostok 2024-10-07 09:24:47 +03:00 • committed by Vladiwostok
parent 686a963a85
commit 517b017058
1 changed files with 38 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/dscanner/analysis/auto_function.d
View file

@ -16,7 +16,6 @@ import std.algorithm.searching : canFind;
* detected by the compiler. However sometimes they can be used as a trick * detected by the compiler. However sometimes they can be used as a trick
* to infer attributes. * to infer attributes.
*/ */
// TODO: Fix Autofix
extern (C++) class AutoFunctionChecker(AST) : BaseAnalyzerDmd extern (C++) class AutoFunctionChecker(AST) : BaseAnalyzerDmd
{ {
alias visit = BaseAnalyzerDmd.visit; alias visit = BaseAnalyzerDmd.visit;
@ -58,16 +57,50 @@ extern (C++) class AutoFunctionChecker(AST) : BaseAnalyzerDmd
if (!foundReturn && !foundFalseAssert) if (!foundReturn && !foundFalseAssert)
{ {
if (d.storage_class & STC.auto_) if (d.storage_class & STC.auto_)
addErrorMessage(lineNum, charNum, KEY, MESSAGE); {
auto voidStart = extractVoidStartLocation(d);
addErrorMessage(
lineNum, charNum, KEY, MESSAGE,
[
AutoFix.replacement(voidStart + 1, voidStart + 6, "", "Replace `auto` with `void`")
.concat(AutoFix.insertionAt(d.loc.fileOffset, "void "))
]
);
}
else if (auto returnType = cast(AST.TypeFunction) d.type) else if (auto returnType = cast(AST.TypeFunction) d.type)
{
if (returnType.next is null) if (returnType.next is null)
addErrorMessage(lineNum, charNum, KEY, MESSAGE_INSERT); {
addErrorMessage(
lineNum, charNum, KEY, MESSAGE_INSERT,
[AutoFix.insertionAt(d.loc.fileOffset, "void ")]
);
}
}
} }
foundReturn = oldFoundReturn; foundReturn = oldFoundReturn;
foundFalseAssert = oldFoundFalseAssert; foundFalseAssert = oldFoundFalseAssert;
} }
private auto extractVoidStartLocation(AST.FuncDeclaration d)
{
import dmd.common.outbuffer : OutBuffer;
import dmd.hdrgen : toCBuffer, HdrGenState;
import std.string : indexOf;
OutBuffer buf;
HdrGenState hgs;
toCBuffer(d, buf, hgs);
string funcStr = cast(string) buf.extractSlice();
string funcName = cast(string) d.ident.toString();
auto funcNameStart = funcStr.indexOf(funcName);
auto voidTokenStart = funcStr.indexOf("void");
auto voidOffset = funcNameStart - voidTokenStart;
return d.loc.fileOffset - voidOffset;
}
override void visit(AST.ReturnStatement s) override void visit(AST.ReturnStatement s)
{ {
foundReturn = true; foundReturn = true;
@ -122,7 +155,7 @@ unittest
import std.stdio : stderr; import std.stdio : stderr;
import std.format : format; import std.format : format;
import dscanner.analysis.config : StaticAnalysisConfig, Check, disabledConfig; import dscanner.analysis.config : StaticAnalysisConfig, Check, disabledConfig;
import dscanner.analysis.helpers : assertAnalyzerWarningsDMD; import dscanner.analysis.helpers : assertAnalyzerWarningsDMD, assertAutoFix;
StaticAnalysisConfig sac = disabledConfig(); StaticAnalysisConfig sac = disabledConfig();
sac.auto_function_check = Check.enabled; sac.auto_function_check = Check.enabled;
@ -182,7 +215,6 @@ unittest
auto doStuff(){ mixin(_genSave);} auto doStuff(){ mixin(_genSave);}
}, sac); }, sac);
/+ TODO: Fix Autofix
assertAutoFix(q{ assertAutoFix(q{
auto ref doStuff(){} // fix auto ref doStuff(){} // fix
auto doStuff(){} // fix auto doStuff(){} // fix
@ -197,7 +229,7 @@ unittest
@safe void doStuff(){} // fix @safe void doStuff(){} // fix
@Custom @Custom
void doStuff(){} // fix void doStuff(){} // fix
}c, sac);+/ }c, sac, true);
stderr.writeln("Unittest for AutoFunctionChecker passed."); stderr.writeln("Unittest for AutoFunctionChecker passed.");
} }