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

Fix Style/ClassAndModuleChildren compaction for oneliner children #10811

Closed

Conversation

Morriar
Copy link

@Morriar Morriar commented Jul 13, 2022

Style/ClassAndModuleChildren with EnforcedStyle: Compact doesn't handle definitions on a single line properly.

Consider this example:

class Foo
  class Bar; end
end

Before this PR, the autocorrect was producing code with a syntax error:

class Foo::Barend

After this PR, the autocorrect is producing the correct code:

class Foo::Bar; end

This also fixes an error that was happening when autocorrecting this code:

class Foo
  class Bar end
end

Which was raising a Parser::ClobberingError: Parser::Source::TreeRewriter detected clobbering error.

After this PR, the autocorrect works properly:

class Foo::Bar end

Before submitting the PR make sure the following are checked:

  • The PR relates to only one subject with a clear title and description in grammatically correct, complete sentences.
  • Wrote good commit messages.
  • Commit message starts with [Fix #issue-number] (if the related issue exists).
  • Feature branch is up-to-date with master (if not - rebase it).
  • Squashed related commits together.
  • Added tests.
  • Ran bundle exec rake default. It executes all tests and runs RuboCop on its own code.
  • Added an entry (file) to the changelog folder named {change_type}_{change_description}.md if the new code introduces user-observable changes. See changelog entry format for details.

Signed-off-by: Alexandre Terrasa <alexandre.terrasa@shopify.com>
@Morriar Morriar force-pushed the at-fix-style-class_and_module_children branch from 24d05b2 to 2bb5782 Compare July 13, 2022 18:04
@bbatsov
Copy link
Collaborator

bbatsov commented Aug 9, 2022

The changes look good, but your branch has to be rebased on top of the current master branch due to merge conflicts.

@koic
Copy link
Member

koic commented Aug 9, 2022

The fix conflicted with #10826. Sorry for the late notice...

@koic koic closed this Aug 9, 2022
@Morriar Morriar deleted the at-fix-style-class_and_module_children branch August 10, 2022 14:39
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.

None yet

3 participants