Skip to content

Commit f2b6761

Browse files
authored
Merge pull request #688 from Shopify/rm-layout-department
Enable cops in the Layout Department
2 parents 9a7bc1d + 1cd1833 commit f2b6761

File tree

2 files changed

+64
-219
lines changed

2 files changed

+64
-219
lines changed

rubocop.yml

Lines changed: 6 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ Gemspec/RequiredRubyVersion:
4141

4242

4343
# Layout Department
44-
Layout/AccessModifierIndentation:
45-
Enabled: false
46-
4744
Layout/ArgumentAlignment:
48-
Enabled: false
4945
EnforcedStyle: with_fixed_indentation
5046

5147
Layout/ArrayAlignment:
@@ -70,73 +66,19 @@ Layout/CaseIndentation:
7066
Layout/ClosingHeredocIndentation:
7167
Enabled: false
7268

73-
Layout/ClosingParenthesisIndentation:
74-
Enabled: false
75-
76-
Layout/CommentIndentation:
77-
Enabled: false
78-
79-
Layout/ConditionPosition:
80-
Enabled: false
81-
82-
Layout/DefEndAlignment:
83-
Enabled: false
84-
85-
Layout/DotPosition:
86-
Enabled: false
87-
88-
Layout/ElseAlignment:
89-
Enabled: false
90-
9169
Layout/EmptyComment:
9270
Enabled: false
9371

9472
Layout/EmptyLineAfterGuardClause:
9573
Enabled: false
9674

97-
Layout/EmptyLineAfterMagicComment:
98-
Enabled: false
99-
100-
Layout/EmptyLineBetweenDefs:
101-
Enabled: false
102-
10375
Layout/EmptyLines:
10476
Enabled: false
10577

106-
Layout/EmptyLinesAroundAccessModifier:
107-
Enabled: false
108-
109-
Layout/EmptyLinesAroundArguments:
110-
Enabled: false
111-
112-
Layout/EmptyLinesAroundAttributeAccessor:
113-
Enabled: false
114-
115-
Layout/EmptyLinesAroundBeginBody:
116-
Enabled: false
117-
118-
Layout/EmptyLinesAroundBlockBody:
119-
Enabled: false
120-
121-
Layout/EmptyLinesAroundClassBody:
122-
Enabled: false
123-
124-
Layout/EmptyLinesAroundExceptionHandlingKeywords:
125-
Enabled: false
126-
127-
Layout/EmptyLinesAroundMethodBody:
128-
Enabled: false
129-
130-
Layout/EmptyLinesAroundModuleBody:
131-
Enabled: false
132-
13378
Layout/EndAlignment:
13479
Enabled: false
13580
EnforcedStyleAlignWith: variable
13681

137-
Layout/EndOfLine:
138-
Enabled: false
139-
14082
Layout/ExtraSpacing:
14183
Enabled: false
14284

@@ -168,29 +110,16 @@ Layout/HashAlignment:
168110
Layout/HeredocIndentation:
169111
Enabled: false
170112

171-
Layout/IndentationConsistency:
172-
Enabled: false
173-
174-
Layout/IndentationStyle:
175-
Enabled: false
176-
177-
Layout/IndentationWidth:
178-
Enabled: false
179-
180-
Layout/InitialIndentation:
181-
Enabled: false
182-
113+
<% if rubocop_version >= "1.67" %>
183114
Layout/LeadingCommentSpace:
184-
Enabled: false
185-
186-
Layout/LeadingEmptyLines:
187-
Enabled: false
115+
AllowRBSInlineAnnotation: true
116+
<% end %>
188117

189118
Layout/LineContinuationLeadingSpace:
190-
Enabled: false
119+
Enabled: true
191120

192121
Layout/LineContinuationSpacing:
193-
Enabled: false
122+
Enabled: true
194123

195124
Layout/LineEndStringConcatenationIndentation:
196125
Enabled: false
@@ -208,9 +137,6 @@ Layout/MultilineArrayBraceLayout:
208137
Layout/MultilineArrayLineBreaks:
209138
AllowMultilineFinalElement: true
210139

211-
Layout/MultilineBlockLayout:
212-
Enabled: false
213-
214140
Layout/MultilineHashBraceLayout:
215141
Enabled: false
216142

@@ -236,89 +162,8 @@ Layout/ParameterAlignment:
236162
Layout/RescueEnsureAlignment:
237163
Enabled: false
238164

239-
Layout/SpaceAfterColon:
240-
Enabled: false
241-
242-
Layout/SpaceAfterComma:
243-
Enabled: false
244-
245-
Layout/SpaceAfterMethodName:
246-
Enabled: false
247-
248-
Layout/SpaceAfterNot:
249-
Enabled: false
250-
251-
Layout/SpaceAfterSemicolon:
252-
Enabled: false
253-
254-
Layout/SpaceAroundBlockParameters:
255-
Enabled: false
256-
257-
Layout/SpaceAroundEqualsInParameterDefault:
258-
Enabled: false
259-
260-
Layout/SpaceAroundKeyword:
261-
Enabled: false
262-
263-
Layout/SpaceAroundMethodCallOperator:
264-
Enabled: false
265-
266-
Layout/SpaceAroundOperators:
267-
Enabled: false
268-
269-
Layout/SpaceBeforeBlockBraces:
270-
Enabled: false
271-
272165
Layout/SpaceBeforeBrackets:
273-
Enabled: false
274-
275-
Layout/SpaceBeforeComma:
276-
Enabled: false
277-
278-
Layout/SpaceBeforeComment:
279-
Enabled: false
280-
281-
Layout/SpaceBeforeFirstArg:
282-
Enabled: false
283-
284-
Layout/SpaceBeforeSemicolon:
285-
Enabled: false
286-
287-
Layout/SpaceInLambdaLiteral:
288-
Enabled: false
289-
290-
Layout/SpaceInsideArrayLiteralBrackets:
291-
Enabled: false
292-
293-
Layout/SpaceInsideArrayPercentLiteral:
294-
Enabled: false
295-
296-
Layout/SpaceInsideBlockBraces:
297-
Enabled: false
298-
299-
Layout/SpaceInsideHashLiteralBraces:
300-
Enabled: false
301-
302-
Layout/SpaceInsideParens:
303-
Enabled: false
304-
305-
Layout/SpaceInsidePercentLiteralDelimiters:
306-
Enabled: false
307-
308-
Layout/SpaceInsideRangeLiteral:
309-
Enabled: false
310-
311-
Layout/SpaceInsideReferenceBrackets:
312-
Enabled: false
313-
314-
Layout/SpaceInsideStringInterpolation:
315-
Enabled: false
316-
317-
Layout/TrailingEmptyLines:
318-
Enabled: false
319-
320-
Layout/TrailingWhitespace:
321-
Enabled: false
166+
Enabled: true
322167

323168

324169
# Lint Department

0 commit comments

Comments
 (0)