aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorKoichi ITO <koic.ito@gmail.com>2018-01-18 12:09:16 +0900
committerKoichi ITO <koic.ito@gmail.com>2018-01-18 17:19:13 +0900
commit5ac6ec54a673e493cddf6bf2eff5b98e52b3c268 (patch)
tree1a11a6b248c977ccb1a6c0db46cc69625a04ea51 /railties
parentffd9902b4464719bd92d49db709d1cf8865337e3 (diff)
downloadrails-5ac6ec54a673e493cddf6bf2eff5b98e52b3c268.tar.gz
rails-5ac6ec54a673e493cddf6bf2eff5b98e52b3c268.tar.bz2
rails-5ac6ec54a673e493cddf6bf2eff5b98e52b3c268.zip
Enable autocorrect for `Lint/EndAlignment` cop
### Summary This PR changes .rubocop.yml. Regarding the code using `if ... else ... end`, I think the coding style that Rails expects is as follows. ```ruby var = if cond a else b end ``` However, the current .rubocop.yml setting does not offense for the following code. ```ruby var = if cond a else b end ``` I think that the above code expects offense to be warned. Moreover, the layout by autocorrect is unnatural. ```ruby var = if cond a else b end ``` This PR adds a setting to .rubocop.yml to make an offense warning and autocorrect as expected by the coding style. And this change also fixes `case ... when ... end` together. Also this PR itself is an example that arranges the layout using `rubocop -a`. ### Other Information Autocorrect of `Lint/EndAlignment` cop is `false` by default. https://github.com/bbatsov/rubocop/blob/v0.51.0/config/default.yml#L1443 This PR changes this value to `true`. Also this PR has changed it together as it is necessary to enable `Layout/ElseAlignment` cop to make this behavior.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/generated_attribute.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index 2728459968..f7fd30a5fb 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -75,7 +75,7 @@ module Rails
when :date then :date_select
when :text then :text_area
when :boolean then :check_box
- else
+ else
:text_field
end
end
@@ -91,7 +91,7 @@ module Rails
when :text then "MyText"
when :boolean then false
when :references, :belongs_to then nil
- else
+ else
""
end
end