Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions lib/rubocop/git/style_guide.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,17 @@ def config
end

def rubocop_options
if config["ShowCopNames"]
{ debug: true }
else
{}
end.merge(@rubocop_options)
return @rubocop_options unless config["ShowCopNames"]
{ debug: true }.merge(@rubocop_options)
end

def override_config
if @override_config_content
config_content = YAML.load(@override_config_content)
override_config = RuboCop::Config.new(config_content, "")
override_config.add_missing_namespaces
override_config.make_excludes_absolute
override_config
else
{}
end
return {} unless @override_config_content
config_content = YAML.load(@override_config_content)
override_config = RuboCop::Config.new(config_content, "")
override_config.add_missing_namespaces
override_config.make_excludes_absolute
override_config
end

# TODO: DELETE ME when we drop support for 0.x releases of rubocop
Expand Down