Skip to content

Commit 036f0df

Browse files
authored
Prefer inline access modifiers (#901)
Now that this is supported in Zed, I think it makes sense to use this style.
1 parent ccd0700 commit 036f0df

File tree

6 files changed

+34
-226
lines changed

6 files changed

+34
-226
lines changed

.rubocop-https---www-goodcop-style-base-yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -688,6 +688,10 @@ Security/YAMLLoad:
688688
Style/ArgumentsForwarding:
689689
Enabled: true
690690

691+
Style/AccessModifierDeclarations:
692+
Enabled: true
693+
EnforcedStyle: inline
694+
691695
Style/ComparableClamp:
692696
Enabled: true
693697

.rubocop-https---www-goodcop-style-rubocop-yml

Lines changed: 0 additions & 188 deletions
This file was deleted.

lib/phlex/csv.rb

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -139,32 +139,30 @@ def delimiter
139139
","
140140
end
141141

142-
private
143-
144-
def column(header = nil, value)
142+
private def column(header = nil, value)
145143
@_row_buffer << [header, value]
146144
end
147145

148-
def each_item(&)
146+
private def each_item(&)
149147
collection.each(&)
150148
end
151149

152150
# Override and set to `false` to disable rendering headers.
153-
def render_headers?
151+
private def render_headers?
154152
true
155153
end
156154

157155
# Override and set to `true` to strip leading and trailing whitespace from values.
158-
def trim_whitespace?
156+
private def trim_whitespace?
159157
false
160158
end
161159

162160
# Override and set to `false` to disable CSV injection escapes or `true` to enable.
163-
def escape_csv_injection?
161+
private def escape_csv_injection?
164162
UNDEFINED
165163
end
166164

167-
def __escape__(buffer, value, escape_csv_injection:, strip_whitespace:, escape_regex:)
165+
private def __escape__(buffer, value, escape_csv_injection:, strip_whitespace:, escape_regex:)
168166
value = case value
169167
when String
170168
value
@@ -218,12 +216,12 @@ def __escape__(buffer, value, escape_csv_injection:, strip_whitespace:, escape_r
218216
end
219217

220218
# Handle legacy `view_template` method
221-
def respond_to_missing?(method_name, include_private)
219+
private def respond_to_missing?(method_name, include_private)
222220
(method_name == :row_template && respond_to?(:view_template)) || super
223221
end
224222

225223
# Handle legacy `view_template` method
226-
def method_missing(method_name, ...)
224+
private def method_missing(method_name, ...)
227225
if method_name == :row_template && respond_to?(:view_template)
228226
warn "Deprecated: Use `row_template` instead of `view_template` in Phlex CSVs."
229227
self.class.alias_method :row_template, :view_template
@@ -233,7 +231,7 @@ def method_missing(method_name, ...)
233231
end
234232
end
235233

236-
def ensure_escape_csv_injection_configured!
234+
private def ensure_escape_csv_injection_configured!
237235
if escape_csv_injection? == UNDEFINED
238236
raise <<~MESSAGE
239237
You need to define `escape_csv_injection?` in #{self.class.name}.

lib/phlex/fifo_cache_store.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ def clear
2828
@fifo.clear
2929
end
3030

31-
private
32-
33-
def map_key(value)
31+
private def map_key(value)
3432
case value
3533
when Array
3634
value.map { |it| map_key(it) }

lib/phlex/helpers.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
# @api private
44
module Phlex::Helpers
5-
private
6-
7-
def mix(*args)
5+
private def mix(*args)
86
args.each_with_object({}) do |object, result|
97
result.merge!(object) do |_key, old, new|
108
case [old, new].freeze
@@ -43,7 +41,7 @@ def mix(*args)
4341
end
4442
end
4543

46-
def grab(**bindings)
44+
private def grab(**bindings)
4745
if bindings.size > 1
4846
bindings.values
4947
else

0 commit comments

Comments
 (0)