From 8c2d0fd644def12854cbc502fa02f4e368dfa321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C5=ABnas=20Gruodis?= Date: Tue, 24 Oct 2017 10:43:01 +0300 Subject: [PATCH] prefer early return --- lib/rubocop/git/style_guide.rb | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/lib/rubocop/git/style_guide.rb b/lib/rubocop/git/style_guide.rb index d9ec13e..cf86a8d 100644 --- a/lib/rubocop/git/style_guide.rb +++ b/lib/rubocop/git/style_guide.rb @@ -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