(CONT-811) Correct Style/SoleNestedConditional

Author: GSPatton

lib/puppet-lint/data.rb

@@ -318,19 +318,17 @@ def definition_indexes(type)
             brace_depth += 1
           when :RBRACE
             brace_depth -= 1
-            if brace_depth.zero? && !in_params
-              if token.next_code_token.type != :LBRACE
-                result << {
-                  start: i,
-                  end: i + j + 1,
-                  tokens: tokens[i..(i + j + 1)],
-                  param_tokens: param_tokens(tokens[i..(i + j + 1)]),
-                  type: type,
-                  name_token: token.next_code_token,
-                  inherited_token: inherited_class,
-                }
-                break
-              end
+            if brace_depth.zero? && !in_params && (token.next_code_token.type != :LBRACE)
+              result << {
+                start: i,
+                end: i + j + 1,
+                tokens: tokens[i..(i + j + 1)],
+                param_tokens: param_tokens(tokens[i..(i + j + 1)]),
+                type: type,
+                name_token: token.next_code_token,
+                inherited_token: inherited_class,
+              }
+              break
             end
           end
         end

lib/puppet-lint/lexer/token.rb

@@ -176,9 +176,7 @@ def find_token_of(direction, type, opts = {})
 
       token_iter = send("#{direction}_token".to_sym)
       until token_iter.nil?
-        if to_find.include?(token_iter.type)
-          return token_iter if opts[:value].nil? || token_iter.value == opts[:value]
-        end
+        return token_iter if to_find.include?(token_iter.type) && (opts[:value].nil? || token_iter.value == opts[:value])
 
         opening_token = (direction == :next) ? 'L' : 'R'
         closing_token = (direction == :next) ? 'R' : 'L'

lib/puppet-lint/plugins/check_classes/variable_scope.rb

@@ -117,9 +117,7 @@ def check
 
       msg = 'top-scope variable being used without an explicit namespace'
       referenced_variables.each do |token|
-        unless future_parser_scopes[token.line].nil?
-          next if future_parser_scopes[token.line].include?(token.value.gsub(%r{\[.+\]\Z}, ''))
-        end
+        next if !future_parser_scopes[token.line].nil? && future_parser_scopes[token.line].include?(token.value.gsub(%r{\[.+\]\Z}, ''))
 
         next if token.value.include?('::')
         next if %r{^(facts|trusted)\[.+\]}.match?(token.value)