UDA to disable linting: use key instead of linter type

Author: ricardaxel

src/dscanner/analysis/base.d

@@ -467,57 +467,57 @@ protected:
 	deprecated("Use the overload taking start and end locations or a Node instead")
 	void addErrorMessage(size_t line, size_t column, string key, string message)
 	{
-		if(noLint.containsCheck(this.getName()))
+		if(noLint.containsCheck(key))
 			return;
 		_messages.insert(Message(fileName, line, column, key, message, getName()));
 	}
 
 	void addErrorMessage(const BaseNode node, string key, string message, AutoFix[] autofixes = null)
 	{
-		if(noLint.containsCheck(this.getName()))
+		if(noLint.containsCheck(key))
 			return;
 		addErrorMessage(Message.Diagnostic.from(fileName, node, message), key, autofixes);
 	}
 
 	void addErrorMessage(const Token token, string key, string message, AutoFix[] autofixes = null)
 	{
-		if(noLint.containsCheck(this.getName()))
+		if(noLint.containsCheck(key))
 			return;
 		addErrorMessage(Message.Diagnostic.from(fileName, token, message), key, autofixes);
 	}
 
 	void addErrorMessage(const Token[] tokens, string key, string message, AutoFix[] autofixes = null)
 	{
-		if(noLint.containsCheck(this.getName()))
+		if(noLint.containsCheck(key))
 			return;
 		addErrorMessage(Message.Diagnostic.from(fileName, tokens, message), key, autofixes);
 	}
 
 	void addErrorMessage(size_t[2] index, size_t line, size_t[2] columns, string key, string message, AutoFix[] autofixes = null)
 	{
-		if(noLint.containsCheck(this.getName()))
+		if(noLint.containsCheck(key))
 			return;
 		addErrorMessage(index, [line, line], columns, key, message, autofixes);
 	}
 
 	void addErrorMessage(size_t[2] index, size_t[2] lines, size_t[2] columns, string key, string message, AutoFix[] autofixes = null)
 	{
-		if(noLint.containsCheck(this.getName()))
+		if(noLint.containsCheck(key))
 			return;
 		auto d = Message.Diagnostic.from(fileName, index, lines, columns, message);
 		_messages.insert(Message(d, key, getName(), autofixes));
 	}
 
 	void addErrorMessage(Message.Diagnostic diagnostic, string key, AutoFix[] autofixes = null)
 	{
-		if(noLint.containsCheck(this.getName()))
+		if(noLint.containsCheck(key))
 			return;
 		_messages.insert(Message(diagnostic, key, getName(), autofixes));
 	}
 
 	void addErrorMessage(Message.Diagnostic diagnostic, Message.Diagnostic[] supplemental, string key, AutoFix[] autofixes = null)
 	{
-		if(noLint.containsCheck(this.getName()))
+		if(noLint.containsCheck(key))
 			return;
 		_messages.insert(Message(diagnostic, supplemental, key, getName(), autofixes));
 	}

src/dscanner/analysis/nolint.d

@@ -178,7 +178,7 @@ private:
 	// into a NoLint struct
 	static Nullable!NoLint fromString(in string str)
 	{
-		auto re = regex(`\w+`, "g");
+		auto re = regex(`[\w-_.]+`, "g");
 		auto matches = matchAll(str, re);
 
 		if(!matches)
@@ -212,7 +212,8 @@ unittest
 	const s1 = "nolint(abc)";
 	const s2 = "nolint(abc, efg, hij)";
 	const s3 = "    nolint (   abc ,  efg  )    ";
-	const s4 = "OtherUda(abc)";
+	const s4 = "nolint(dscanner.style.abc_efg-ijh)";
+	const s5 = "OtherUda(abc)";
 
 	assert(NoLintFactory.fromString(s1).get.containsCheck("abc"));
 
@@ -223,5 +224,10 @@ unittest
 	assert(NoLintFactory.fromString(s3).get.containsCheck("abc"));
 	assert(NoLintFactory.fromString(s3).get.containsCheck("efg"));
 
-	assert(NoLintFactory.fromString(s4).isNull);
+	assert(NoLintFactory.fromString(s4).get.containsCheck("dscanner.style.abc_efg-ijh"));
+
+	assert(NoLintFactory.fromString(s5).isNull);
+
+	import std.stdio: stderr, writeln;
+	stderr.writeln("Unittest for NoLint passed.");
 }

src/dscanner/analysis/style.d

@@ -238,7 +238,7 @@ unittest
 	}c, sac);
 
 	assertAnalyzerWarnings(q{
-		@("nolint(style_check)")
+		@("nolint(dscanner.style.phobos_naming_convention)")
 		module AMODULE;
 	}c, sac);
 

src/dscanner/analysis/useless_initializer.d

@@ -370,27 +370,27 @@ public:
 
 	// passes
 	assertAnalyzerWarnings(q{
-			@("nolint(useless_initializer)")
+			@("nolint(dscanner.useless-initializer)")
 			int a = 0;
 		    int a = 0;      /+
 		            ^ [warn]: X +/
 
-			@("nolint(useless_initializer)")
+			@("nolint(dscanner.useless-initializer)")
 			int f() {
 				int a = 0;
 			}
 
 			struct nolint { string s; }
 
-			@nolint("useless_initializer")
+			@nolint("dscanner.useless-initializer")
 			int a = 0;
 		    int a = 0;      /+
 		            ^ [warn]: X +/
 
-			@("nolint(other_check, useless_initializer, another_one)")
+			@("nolint(other_check, dscanner.useless-initializer, another_one)")
 			int a = 0;
 
-			@nolint("other_check", "another_one", "useless_initializer")
+			@nolint("other_check", "another_one", "dscanner.useless-initializer")
 			int a = 0;
 
 	}, sac);