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

replace libdparse in delete check (#21) 

* replace libdparse in delete check

* delete comment
This commit is contained in:
lucica28 2022-07-20 12:48:39 +03:00 committed by Vladiwostok
parent 500f3b30ea
commit 6ae996fea6
2 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/dscanner/analysis/del.d
View File

@ -6,74 +6,47 @@
module dscanner.analysis.del; module dscanner.analysis.del;
import std.stdio; import std.stdio;
import dparse.ast;
import dparse.lexer;
import dscanner.analysis.base; import dscanner.analysis.base;
import dscanner.analysis.helpers;
import dsymbol.scope_; import dsymbol.scope_;
/** /**
* Checks for use of the deprecated 'delete' keyword * Checks for use of the deprecated 'delete' keyword
*/ */
final class DeleteCheck : BaseAnalyzer extern(C++) class DeleteCheck(AST) : BaseAnalyzerDmd
{ {
alias visit = BaseAnalyzer.visit; // alias visit = BaseAnalyzerDmd!AST.visit;
alias visit = BaseAnalyzerDmd.visit;
mixin AnalyzerInfo!"delete_check"; mixin AnalyzerInfo!"delete_check";
this(BaseAnalyzerArguments args) extern(D) this(string fileName)
{ {
super(args); super(fileName);
} }
override void visit(const DeleteExpression d) override void visit(AST.DeleteExp d)
{ {
addErrorMessage(d.tokens[0], KEY, addErrorMessage(cast(ulong) d.loc.linnum, cast(ulong) d.loc.charnum, "dscanner.deprecated.delete_keyword",
"Avoid using the 'delete' keyword.", "Avoid using the 'delete' keyword.");
[AutoFix.replacement(d.tokens[0], `destroy(`, "Replace delete with destroy()") super.visit(d);
.concat(AutoFix.insertionAfter(d.tokens[$ - 1], ")"))]);
d.accept(this);
} }
private enum string KEY = "dscanner.deprecated.delete_keyword";
} }
unittest unittest
{ {
import dscanner.analysis.config : Check, disabledConfig, StaticAnalysisConfig; import dscanner.analysis.config : StaticAnalysisConfig, Check, disabledConfig;
import dscanner.analysis.helpers : assertAnalyzerWarnings, assertAutoFix; import dscanner.analysis.helpers : assertAnalyzerWarnings;
StaticAnalysisConfig sac = disabledConfig(); StaticAnalysisConfig sac = disabledConfig();
sac.delete_check = Check.enabled; sac.delete_check = Check.enabled;
assertAnalyzerWarnings(q{ assertAnalyzerWarningsDMD(q{
void testDelete() void testDelete()
{ {
int[int] data = [1 : 2]; int[int] data = [1 : 2];
delete data[1]; /+ delete data[1]; // [warn]: Avoid using the 'delete' keyword.
^^^^^^ [warn]: Avoid using the 'delete' keyword. +/
auto a = new Class(); auto a = new Class();
delete a; /+ delete a; // [warn]: Avoid using the 'delete' keyword.
^^^^^^ [warn]: Avoid using the 'delete' keyword. +/
}
}c, sac);
assertAutoFix(q{
void testDelete()
{
int[int] data = [1 : 2];
delete data[1]; // fix
auto a = new Class();
delete a; // fix
}
}c, q{
void testDelete()
{
int[int] data = [1 : 2];
destroy(data[1]); // fix
auto a = new Class();
destroy(a); // fix
} }
}c, sac); }c, sac);

7
src/dscanner/analysis/run.d
View File

@ -848,10 +848,6 @@ private BaseAnalyzer[] getAnalyzersForModuleAndConfig(string fileName,
checks ~= new UnmodifiedFinder(args.setSkipTests( checks ~= new UnmodifiedFinder(args.setSkipTests(
analysisConfig.could_be_immutable_check == Check.skipTests && !ut)); analysisConfig.could_be_immutable_check == Check.skipTests && !ut));
if (moduleName.shouldRun!DeleteCheck(analysisConfig))
checks ~= new DeleteCheck(args.setSkipTests(
analysisConfig.delete_check == Check.skipTests && !ut));
if (moduleName.shouldRun!DuplicateAttributeCheck(analysisConfig)) if (moduleName.shouldRun!DuplicateAttributeCheck(analysisConfig))
checks ~= new DuplicateAttributeCheck(args.setSkipTests( checks ~= new DuplicateAttributeCheck(args.setSkipTests(
analysisConfig.duplicate_attribute == Check.skipTests && !ut)); analysisConfig.duplicate_attribute == Check.skipTests && !ut));
@ -1332,6 +1328,9 @@ MessageSet analyzeDmd(string fileName, ASTBase.Module m, const char[] moduleName
if (moduleName.shouldRunDmd!(EnumArrayVisitor!ASTBase)(config)) if (moduleName.shouldRunDmd!(EnumArrayVisitor!ASTBase)(config))
visitors ~= new EnumArrayVisitor!ASTBase(fileName); visitors ~= new EnumArrayVisitor!ASTBase(fileName);
if (moduleName.shouldRunDmd!(DeleteCheck!ASTBase)(config))
visitors ~= new DeleteCheck!ASTBase(fileName);
foreach (visitor; visitors) foreach (visitor; visitors)
{ {
m.accept(visitor); m.accept(visitor);