From 150472e8f8862c8910ebdbaf83a0d6e04099b2f3 Mon Sep 17 00:00:00 2001
From: Rory Hunter <roryhunter2@gmail.com>
Date: Mon, 8 Feb 2021 15:49:23 +0000
Subject: [PATCH] Enable BooleanNegation checkstyle rule always

---
 buildSrc/src/main/resources/checkstyle.xml     | 18 +++++++++---------
 .../main/resources/checkstyle_ide_fragment.xml | 12 ------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/buildSrc/src/main/resources/checkstyle.xml b/buildSrc/src/main/resources/checkstyle.xml
index c6e8a8c3d3527..14618da1ab592 100644
--- a/buildSrc/src/main/resources/checkstyle.xml
+++ b/buildSrc/src/main/resources/checkstyle.xml
@@ -124,17 +124,17 @@
     </module>
 
     <!-- Forbid using '!' for logical negations in favour of checking against 'false' explicitly. -->
-    <!-- This is disabled for now because there are many violations, hence the rule is reporting at the "warning" severity. -->
-    <!--
+    <!-- This is only reported in the IDE for now because there are many violations -->
     <module name="DescendantToken">
-      <property name="id" value="BooleanNegation" />
-      <property name="tokens" value="EXPR"/>
-      <property name="limitedTokens" value="LNOT"/>
-      <property name="maximumNumber" value="0"/>
-      <property name="maximumDepth" value="1"/>
-      <message key="descendant.token.max" value="Do not negate boolean expressions with '!', but check explicitly with '== false' as it is more explicit"/>
+        <property name="id" value="BooleanNegation" />
+        <property name="tokens" value="EXPR"/>
+        <property name="limitedTokens" value="LNOT"/>
+        <property name="maximumNumber" value="0"/>
+        <property name="maximumDepth" value="2"/>
+        <message
+            key="descendant.token.max"
+            value="Do not negate boolean expressions with '!', but check explicitly with '== false' as it is more explicit"/>
     </module>
-    -->
 
   </module>
 </module>
diff --git a/buildSrc/src/main/resources/checkstyle_ide_fragment.xml b/buildSrc/src/main/resources/checkstyle_ide_fragment.xml
index 8895c0801a21b..060eba540cd50 100644
--- a/buildSrc/src/main/resources/checkstyle_ide_fragment.xml
+++ b/buildSrc/src/main/resources/checkstyle_ide_fragment.xml
@@ -8,18 +8,6 @@
 <!-- Checkstyle config by the `:configureIdeCheckstyle` task.           -->
 
 <module name="IdeFragment">
-    <!-- Forbid using '!' for logical negations in favour of checking against 'false' explicitly. -->
-    <!-- This is only reported in the IDE for now because there are many violations -->
-    <module name="DescendantToken">
-        <property name="id" value="BooleanNegation" />
-        <property name="tokens" value="EXPR"/>
-        <property name="limitedTokens" value="LNOT"/>
-        <property name="maximumNumber" value="0"/>
-        <property name="maximumDepth" value="2"/>
-        <message
-            key="descendant.token.max"
-            value="Do not negate boolean expressions with '!', but check explicitly with '== false' as it is more explicit"/>
-    </module>
 
     <!-- See CONTRIBUTING.md for our guidelines on Javadoc -->