Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge in changes from latest master in original file #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

tridnguyen
Copy link

also update to work with ruby 3.1.2

also update to work with ruby 3.1.2
Copy link

@codestronger codestronger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't try building it, but lgtm. Doesn't seem like the kindsys customizations are useful anymore, but we can maintaining better tracking of gem dependencies in this fork.

spec.add_dependency('rubocop-rails', '~> 2.3.0')
spec.add_development_dependency('rspec', '~> 3.5')
spec.add_dependency('rubocop', '~> 1.39')
spec.add_dependency('rubocop-performance', '~> 1.15.0')

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi, there are newer versions of rubocop-performance and rubocop-rails. might want to bump those up if they are compatible. i kinda prefer >= these days, but reducing the constraints to major.minor is fine too.

@@ -14,9 +14,7 @@ def enforce_violation(node)
alias on_send enforce_violation
alias on_if enforce_violation

rubocop_version = Gem.loaded_specs.fetch('rubocop', nil)&.version.to_s
assignments = rubocop_version.to_f >= 0.59 ? AST::Node::ASSIGNMENTS : Util::ASGN_NODES

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We lost this customization, but I can't see why this would be wrong in the master branch. Gonna have to ask John to figure out the history behind this one... 🤔

@@ -227,7 +227,7 @@ Layout/FirstMethodParameterLineBreak:
Enabled: false

# Supports --auto-correct
Layout/IndentFirstArgument:
Layout/FirstArgumentIndentation:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we lost the custom renames of these rules. oth, i don't know why we wanted to customize this by renaming rules anyway. Seems like a low ROI and high maintenance cost to me. Would recommend we ditch our customizations, but probably want to check w/ John. Also, they changed the format so the old kindsys renames would be inconsistent anyway.

afaict, there are 3 renames in the kindsys customizations (note that the source rule names have changed):
Layout/FirstParameterIndentation -> Layout/IndentFirstArgument
Layout/IndentArray -> Layout/IndentFirstArrayElement
Layout/IndentHash -> Layout/IndentFirstHashElement

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants