From d3e3225fc1b035d5f49db18e98ce695b35582a3f Mon Sep 17 00:00:00 2001
From: Ashwin Maroli <ashmaroli@gmail.com>
Date: Thu, 5 Nov 2020 16:00:33 +0530
Subject: [PATCH] Configure cops introduced in RuboCop v1.2

---
 .rubocop.yml           | 6 ++++++
 lib/jekyll/document.rb | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2541921e..4ed27743 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -92,6 +92,8 @@ Lint/MixedRegexpCaptureTypes:
 Lint/NestedPercentLiteral:
   Exclude:
     - test/test_site.rb
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: false
 Lint/OutOfRangeRegexpRef:
   Enabled: true
 Lint/RaiseException:
@@ -221,6 +223,8 @@ Style/ClassAndModuleChildren:
     - test/**/*.rb
 Style/ClassEqualityComparison:
   Enabled: true
+Style/CollectionCompact:
+  Enabled: true
 Style/CombinableLoops:
   Enabled: true
 Style/Documentation:
@@ -266,6 +270,8 @@ Style/ModuleFunction:
   Enabled: false
 Style/MultilineTernaryOperator:
   Severity: error
+Style/NegatedIfElseCondition:
+  Enabled: true
 Style/OptionalBooleanParameter:
   Enabled: true
 Style/PercentLiteralDelimiters:
diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index cd922dd6..2d6ae9a3 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -350,11 +350,14 @@ module Jekyll
     # True if the document has a collection and if that collection's #write?
     # method returns true, and if the site's Publisher will publish the document.
     # False otherwise.
+    #
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     def write?
       return @write_p if defined?(@write_p)
 
       @write_p = collection&.write? && site.publisher.publish?(self)
     end
+    # rubocop:enable Naming/MemoizedInstanceVariableName
 
     # The Document excerpt_separator, from the YAML Front-Matter or site
     # default excerpt_separator value