From 235e9d08848dcc3b4469a9e4ec1f74668f259f19 Mon Sep 17 00:00:00 2001
From: lucica28 <57060141+lucica28@users.noreply.github.com>
Date: Mon, 22 May 2023 10:44:52 +0300
Subject: [PATCH] replace libdparse in redundant parens check (#61)

---
 src/dscanner/analysis/redundant_parens.d | 84 +++++++++++++-----------
 src/dscanner/analysis/run.d              | 10 +--
 2 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/src/dscanner/analysis/redundant_parens.d b/src/dscanner/analysis/redundant_parens.d
index a541c17..b728e30 100644
--- a/src/dscanner/analysis/redundant_parens.d
+++ b/src/dscanner/analysis/redundant_parens.d
@@ -5,60 +5,66 @@
 
 module dscanner.analysis.redundant_parens;
 
-import dparse.ast;
-import dparse.lexer;
 import dscanner.analysis.base;
-import dsymbol.scope_ : Scope;
 
+// TODO: check and fix
 /**
  * Checks for redundant parenthesis
  */
-final class RedundantParenCheck : BaseAnalyzer
+extern(C++) class RedundantParenCheck(AST) : BaseAnalyzerDmd
 {
-	alias visit = BaseAnalyzer.visit;
-
+	alias visit = BaseAnalyzerDmd.visit;
 	mixin AnalyzerInfo!"redundant_parens_check";
 
 	///
-	this(BaseAnalyzerArguments args)
+	extern(D) this(string fileName, bool skipTests = false)
 	{
-		super(args);
+		super(fileName, skipTests);
 	}
 
-	override void visit(const IfStatement statement)
+	override void visit(AST.IfStatement s)
 	{
-		UnaryExpression unary;
-		if (statement.condition.expression is null || statement.condition.expression.items.length != 1)
-			goto end;
-		unary = cast(UnaryExpression) statement.condition.expression.items[0];
-		if (unary is null)
-			goto end;
-		if (unary.primaryExpression is null)
-			goto end;
-		if (unary.primaryExpression.expression is null)
-			goto end;
-		addErrorMessage(unary.primaryExpression, KEY, "Redundant parenthesis.");
-	end:
-		statement.accept(this);
-	}
-
-	override void visit(const PrimaryExpression primaryExpression)
-	{
-		UnaryExpression unary;
-		if (primaryExpression.expression is null)
-			goto end;
-		unary = cast(UnaryExpression) primaryExpression.expression.items[0];
-		if (unary is null)
-			goto end;
-		if (unary.primaryExpression is null)
-			goto end;
-		if (unary.primaryExpression.expression is null)
-			goto end;
-		addErrorMessage(primaryExpression, KEY, "Redundant parenthesis.");
-	end:
-		primaryExpression.accept(this);
+		if (s.condition.parens)
+			addErrorMessage(cast(ulong) s.loc.linnum, cast(ulong) s.loc.charnum,
+							KEY, MESSAGE);
 	}
 
 private:
 	enum string KEY = "dscanner.suspicious.redundant_parens";
+	enum string MESSAGE = "Redundant parenthesis.";
+}
+
+unittest
+{
+	import dscanner.analysis.config : StaticAnalysisConfig, Check, disabledConfig;
+	import std.stdio : stderr;
+	import dscanner.analysis.helpers : assertAnalyzerWarnings = assertAnalyzerWarningsDMD;
+
+	StaticAnalysisConfig sac = disabledConfig();
+	sac.redundant_parens_check = Check.enabled;
+
+	assertAnalyzerWarnings(q{
+		void testRedundantParens()
+		{
+			int a = 0;
+			bool b = true;
+
+			if ((a + 2 == 3)) // [warn]: Redundant parenthesis.
+			{
+
+			} 
+
+			if ((b)) // [warn]: Redundant parenthesis.
+			{
+
+			}
+
+			if (b) { }
+
+			if (a * 2 == 0) { }
+		}
+	}c, sac);
+
+	stderr.writeln("Unittest for RedundantParenthesis passed.");
+
 }
diff --git a/src/dscanner/analysis/run.d b/src/dscanner/analysis/run.d
index c6d3224..93c0b84 100644
--- a/src/dscanner/analysis/run.d
+++ b/src/dscanner/analysis/run.d
@@ -881,10 +881,6 @@ private BaseAnalyzer[] getAnalyzersForModuleAndConfig(string fileName,
 		checks ~= new NumberStyleCheck(args.setSkipTests(
 		analysisConfig.number_style_check == Check.skipTests && !ut));
 
-	if (moduleName.shouldRun!RedundantParenCheck(analysisConfig))
-		checks ~= new RedundantParenCheck(args.setSkipTests(
-		analysisConfig.redundant_parens_check == Check.skipTests && !ut));
-
 	if (moduleName.shouldRun!StyleChecker(analysisConfig))
 		checks ~= new StyleChecker(args.setSkipTests(
 		analysisConfig.style_check == Check.skipTests && !ut));
@@ -1343,6 +1339,12 @@ MessageSet analyzeDmd(string fileName, ASTCodegen.Module m, const char[] moduleN
 			config.properly_documented_public_functions == Check.skipTests && !ut
 		);
 
+	if (moduleName.shouldRunDmd!(RedundantParenCheck!ASTCodegen)(config))
+		visitors ~= new RedundantParenCheck!ASTCodegen(
+			fileName,
+			config.redundant_parens_check == Check.skipTests && !ut
+		);
+
 	foreach (visitor; visitors)
 	{
 		m.accept(visitor);