UDA to disable linting: cleaning

Author: ricardaxel

src/dscanner/analysis/base.d

@@ -422,16 +422,14 @@ public:
 	/**
 	* Visits a declaration.
 	*
-	* When overriden, make sure to disable and reenable error messages
+	* When overriden, make sure to keep this structure
 	*/
 	override void visit(const(Declaration) decl)
 	{
-		const msgDisabled = maybeDisableErrorMessage(decl);
+		if(stopLinting(decl))
+			return;
 
 		decl.accept(this);
-
-		if(msgDisabled)
-			reenableErrorMessage();
 	}
 
 	AutoFix.CodeReplacement[] resolveAutoFix(
@@ -452,7 +450,6 @@ protected:
 
 	bool inAggregate;
 	bool skipTests;
-	int errorMsgDisabled;
 
 	template visitTemplate(T)
 	{
@@ -467,87 +464,45 @@ 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(!errorMsgEnabled())
-			return;
 		_messages.insert(Message(fileName, line, column, key, message, getName()));
 	}
 
 	void addErrorMessage(const BaseNode node, string key, string message, AutoFix[] autofixes = null)
 	{
-		if(!errorMsgEnabled())
-			return;
 		addErrorMessage(Message.Diagnostic.from(fileName, node, message), key, autofixes);
 	}
 
 	void addErrorMessage(const Token token, string key, string message, AutoFix[] autofixes = null)
 	{
-		if(!errorMsgEnabled())
-			return;
 		addErrorMessage(Message.Diagnostic.from(fileName, token, message), key, autofixes);
 	}
 
 	void addErrorMessage(const Token[] tokens, string key, string message, AutoFix[] autofixes = null)
 	{
-		if(!errorMsgEnabled())
-			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(!errorMsgEnabled())
-			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(!errorMsgEnabled())
-			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(!errorMsgEnabled())
-			return;
 		_messages.insert(Message(diagnostic, key, getName(), autofixes));
 	}
 
 	void addErrorMessage(Message.Diagnostic diagnostic, Message.Diagnostic[] supplemental, string key, AutoFix[] autofixes = null)
 	{
-		if(!errorMsgEnabled())
-			return;
 		_messages.insert(Message(diagnostic, supplemental, key, getName(), autofixes));
 	}
 
-	void reenableErrorMessage()
-	in(this.errorMsgDisabled > 0)
-	{
-		this.errorMsgDisabled--;
-	}
-
-	bool errorMsgEnabled() const
-	{
-		return this.errorMsgDisabled == 0;
-	}
-
-	// Disable error message if declaration contains UDA :
-	// @("nolint(..)") and @nolint(".."), ..
-	// that indicates to skip linting on this declaration
-	// Return wheter the message is actually disabled or not
-	bool maybeDisableErrorMessage(const Declaration decl)
-	{
-		if(stopLinting(decl))
-		{
-			this.errorMsgDisabled++;
-			return true;
-		}
-		else
-			return false;
-	}
-
 	bool stopLinting(AstNode)(const AstNode node)
 	{
 		import std.typecons: Nullable;

src/dscanner/analysis/useless_initializer.d

@@ -91,15 +91,13 @@ public:
 
 	override void visit(const(Declaration) decl)
 	{
-		_inStruct.insert(decl.structDeclaration !is null);
+		if(stopLinting(decl))
+			return;
 
-		const msgDisabled = maybeDisableErrorMessage(decl);
+		_inStruct.insert(decl.structDeclaration !is null);
 
 		decl.accept(this);
 
-		if(msgDisabled)
-			reenableErrorMessage();
-
 		if (_inStruct.length > 1 && _inStruct[$-2] && decl.constructor &&
 			((decl.constructor.parameters && decl.constructor.parameters.parameters.length == 0) ||
 			!decl.constructor.parameters))