scss_lint 0.43.2 → 0.44.0

data/lib/scss_lint/engine.rb

@@ -6,7 +6,7 @@ module SCSSLint
   # Contains all information for a parsed SCSS file, including its name,
   # contents, and parse tree.
   class Engine
-    ENGINE_OPTIONS = { cache: false, syntax: :scss }
+    ENGINE_OPTIONS = { cache: false, syntax: :scss }.freeze
 
     attr_reader :contents, :filename, :lines, :tree, :any_control_commands
 

data/lib/scss_lint/file_finder.rb

@@ -6,7 +6,7 @@ module SCSSLint
   class FileFinder
     # List of extensions of files to include when only a directory is specified
     # as a path.
-    VALID_EXTENSIONS = %w[.css .scss]
+    VALID_EXTENSIONS = %w[.css .scss].freeze
 
     # Create a {FileFinder}.
     #

data/lib/scss_lint/linter.rb

@@ -86,20 +86,21 @@ module SCSSLint
       last_line    = source_range.end_pos.line - 1
       start_pos    = source_range.start_pos.offset - 1
 
-      if current_line == last_line
-        source = engine.lines[current_line][start_pos..(source_range.end_pos.offset - 1)]
-      else
-        source = engine.lines[current_line][start_pos..-1]
-      end
+      source =
+        if current_line == last_line
+          engine.lines[current_line][start_pos..(source_range.end_pos.offset - 1)]
+        else
+          engine.lines[current_line][start_pos..-1]
+        end
 
       current_line += 1
       while current_line < last_line
-        source += "#{engine.lines[current_line]}"
+        source += engine.lines[current_line].to_s
         current_line += 1
       end
 
       if source_range.start_pos.line != source_range.end_pos.line
-        source += "#{(engine.lines[current_line] || '')[0...source_range.end_pos.offset]}"
+        source += ((engine.lines[current_line] || '')[0...source_range.end_pos.offset]).to_s
       end
 
       source

data/lib/scss_lint/linter/bang_format.rb

@@ -3,7 +3,7 @@ module SCSSLint
   class Linter::BangFormat < Linter
     include LinterRegistry
 
-    STOPPING_CHARACTERS = ['!', "'", '"', nil]
+    STOPPING_CHARACTERS = ['!', "'", '"', nil].freeze
 
     def visit_extend(node)
       check_bang(node)
@@ -31,7 +31,7 @@ module SCSSLint
       before_qualifier = config['space_before_bang'] ? '' : 'not '
       after_qualifier = config['space_after_bang'] ? '' : 'not '
 
-      add_lint(node, "! should #{before_qualifier}be preceeded by a space, " \
+      add_lint(node, "! should #{before_qualifier}be preceded by a space, " \
                      "and should #{after_qualifier}be followed by a space")
     end
 

data/lib/scss_lint/linter/border_zero.rb

@@ -6,7 +6,7 @@ module SCSSLint
     CONVENTION_TO_PREFERENCE = {
       'zero' => %w[0 none],
       'none' => %w[none 0],
-    }
+    }.freeze
 
     BORDER_PROPERTIES = %w[
       border
@@ -14,7 +14,7 @@ module SCSSLint
       border-right
       border-bottom
       border-left
-    ]
+    ].freeze
 
     def visit_root(_node)
       @preference = CONVENTION_TO_PREFERENCE[config['convention']]

data/lib/scss_lint/linter/color_variable.rb

@@ -3,7 +3,7 @@ module SCSSLint
   class Linter::ColorVariable < Linter
     include LinterRegistry
 
-    COLOR_FUNCTIONS = %w[rgb rgba hsl hsla]
+    COLOR_FUNCTIONS = %w[rgb rgba hsl hsla].freeze
 
     def visit_script_color(node)
       return if in_variable_declaration?(node) ||

data/lib/scss_lint/linter/declaration_order.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SCSSLint
   # Checks the order of nested items within a rule set.
   class Linter::DeclarationOrder < Linter
@@ -8,9 +10,9 @@ module SCSSLint
       yield # Continue linting children
     end
 
-    alias_method :visit_rule, :check_order
-    alias_method :visit_mixin, :check_order
-    alias_method :visit_media, :check_order
+    alias visit_rule check_order
+    alias visit_mixin check_order
+    alias visit_media check_order
 
   private
 
@@ -18,9 +20,9 @@ module SCSSLint
       'Rule sets should be ordered as follows: '\
       '`@extends`, `@includes` without `@content`, ' \
       'properties, `@includes` with `@content`, ' \
-      'nested rule sets'
+      'nested rule sets'.freeze
 
-    MIXIN_WITH_CONTENT = 'mixin_with_content'
+    MIXIN_WITH_CONTENT = 'mixin_with_content'.freeze
 
     DECLARATION_ORDER = [
       Sass::Tree::ExtendNode,
@@ -28,7 +30,7 @@ module SCSSLint
       Sass::Tree::PropNode,
       MIXIN_WITH_CONTENT,
       Sass::Tree::RuleNode,
-    ]
+    ].freeze
 
     def important_node?(node)
       DECLARATION_ORDER.include?(node.class)
@@ -36,8 +38,8 @@ module SCSSLint
 
     def check_node(node)
       children = node.children.each_with_index
-                              .select { |n, _| important_node?(n) }
-                              .map { |n, i| [n, node_declaration_type(n), i] }
+                     .select { |n, _| important_node?(n) }
+                     .map { |n, i| [n, node_declaration_type(n), i] }
 
       sorted_children = children.sort do |(_, a_type, i), (_, b_type, j)|
         [DECLARATION_ORDER.index(a_type), i] <=> [DECLARATION_ORDER.index(b_type), j]

data/lib/scss_lint/linter/duplicate_property.rb

@@ -18,8 +18,8 @@ module SCSSLint
       yield # Continue linting children
     end
 
-    alias_method :visit_rule,     :check_properties
-    alias_method :visit_mixindef, :check_properties
+    alias visit_rule check_properties
+    alias visit_mixindef check_properties
 
   private
 

data/lib/scss_lint/linter/empty_line_between_blocks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SCSSLint
   # Reports the lack of empty lines between block defintions.
   class Linter::EmptyLineBetweenBlocks < Linter
@@ -37,7 +39,7 @@ module SCSSLint
 
   private
 
-    MESSAGE_FORMAT = '%s declaration should be %s by an empty line'
+    MESSAGE_FORMAT = '%s declaration should be %s by an empty line'.freeze
 
     def check(node, type)
       return if config['ignore_single_line_blocks'] && node_on_single_line?(node)

data/lib/scss_lint/linter/final_newline.rb

@@ -11,10 +11,10 @@ module SCSSLint
       if config['present']
         add_lint(engine.lines.count,
                  'Files should end with a trailing newline') unless ends_with_newline
-      else
-        add_lint(engine.lines.count,
-                 'Files should not end with a trailing newline') if ends_with_newline
+      elsif ends_with_newline
+        add_lint(engine.lines.count, 'Files should not end with a trailing newline')
       end
+
       yield
     end
   end

data/lib/scss_lint/linter/indentation.rb

@@ -64,8 +64,8 @@ module SCSSLint
 
       if @allow_non_nested_indentation
         yield # Continue linting else statement
-      else
-        visit(node.else) if node.else
+      elsif node.else
+        visit(node.else)
       end
     end
 
@@ -103,26 +103,26 @@ module SCSSLint
     end
 
     # Define node types that increase indentation level
-    alias_method :visit_directive, :check_and_visit_children
-    alias_method :visit_each,      :check_and_visit_children
-    alias_method :visit_for,       :check_and_visit_children
-    alias_method :visit_function,  :check_and_visit_children
-    alias_method :visit_media,     :check_and_visit_children
-    alias_method :visit_mixin,     :check_and_visit_children
-    alias_method :visit_mixindef,  :check_and_visit_children
-    alias_method :visit_prop,      :check_and_visit_children
-    alias_method :visit_rule,      :check_and_visit_children
-    alias_method :visit_supports,  :check_and_visit_children
-    alias_method :visit_while,     :check_and_visit_children
+    alias visit_directive check_and_visit_children
+    alias visit_each check_and_visit_children
+    alias visit_for check_and_visit_children
+    alias visit_function check_and_visit_children
+    alias visit_media check_and_visit_children
+    alias visit_mixin check_and_visit_children
+    alias visit_mixindef check_and_visit_children
+    alias visit_prop check_and_visit_children
+    alias visit_rule check_and_visit_children
+    alias visit_supports check_and_visit_children
+    alias visit_while check_and_visit_children
 
     # Define node types to check indentation of (notice comments are left out)
-    alias_method :visit_charset,   :check_indentation
-    alias_method :visit_content,   :check_indentation
-    alias_method :visit_cssimport, :check_indentation
-    alias_method :visit_extend,    :check_indentation
-    alias_method :visit_return,    :check_indentation
-    alias_method :visit_variable,  :check_indentation
-    alias_method :visit_warn,      :check_indentation
+    alias visit_charset check_indentation
+    alias visit_content check_indentation
+    alias visit_cssimport check_indentation
+    alias visit_extend check_indentation
+    alias visit_return check_indentation
+    alias visit_variable check_indentation
+    alias visit_warn check_indentation
 
   private
 

data/lib/scss_lint/linter/leading_zero.rb

@@ -15,7 +15,7 @@ module SCSSLint
 
     def visit_script_number(node)
       return unless number =
-        source_from_range(node.source_range)[NUMBER_WITH_LEADING_ZERO_REGEX, 1]
+                      source_from_range(node.source_range)[NUMBER_WITH_LEADING_ZERO_REGEX, 1]
 
       check_for_leading_zeros(node, number)
     end
@@ -35,7 +35,7 @@ module SCSSLint
         validator: ->(original) { original =~ /^0\.\d+$/ },
         converter: ->(original) { "0#{original}" }
       },
-    }
+    }.freeze
 
     def check_for_leading_zeros(node, original_number)
       style = config.fetch('style', 'exclude_zero')

data/lib/scss_lint/linter/mergeable_selector.rb

@@ -23,8 +23,8 @@ module SCSSLint
       yield # Continue linting children
     end
 
-    alias_method :visit_root, :check_node
-    alias_method :visit_rule, :check_node
+    alias visit_root check_node
+    alias visit_rule check_node
 
   private
 
@@ -75,8 +75,7 @@ module SCSSLint
     end
 
     def subrule?(rule1, rule2)
-      "#{rule1}".start_with?("#{rule2} ") ||
-        "#{rule1}".start_with?("#{rule2}.")
+      rule1.to_s.start_with?("#{rule2} ", "#{rule2}.")
     end
 
     def whitelist_contains(node)

data/lib/scss_lint/linter/name_format.rb

@@ -20,6 +20,7 @@ module SCSSLint
 
     def visit_script_funcall(node)
       check_name(node, 'function') unless FUNCTION_WHITELIST.include?(node.name)
+      yield # Continue linting any arguments of this function call
     end
 
     def visit_script_variable(node)
@@ -72,7 +73,7 @@ module SCSSLint
                      'instead of underscores',
         validator: ->(name) { name !~ /[_A-Z]/ },
       },
-    }
+    }.freeze
 
     def violated_convention(name_string, type)
       convention_name = convention_name(type)

data/lib/scss_lint/linter/nesting_depth.rb

@@ -3,7 +3,7 @@ module SCSSLint
   class Linter::NestingDepth < Linter
     include LinterRegistry
 
-    IGNORED_SELECTORS = [Sass::Selector::Parent, Sass::Selector::Pseudo]
+    IGNORED_SELECTORS = [Sass::Selector::Parent, Sass::Selector::Pseudo].freeze
 
     def visit_root(_node)
       @max_depth = config['max_depth']

data/lib/scss_lint/linter/property_sort_order.rb

@@ -19,8 +19,8 @@ module SCSSLint
       end
 
       if sortable_props.count >= config.fetch('min_properties', 2)
-        sortable_prop_info = sortable_props
-          .map do |child|
+        sortable_prop_info =
+          sortable_props.map do |child|
             name = child.name.join
             /^(?<vendor>-\w+(-osx)?-)?(?<property>.+)/ =~ name
             { name: name, vendor: vendor, property: "#{@nested_under}#{property}", node: child }
@@ -33,10 +33,10 @@ module SCSSLint
       yield # Continue linting children
     end
 
-    alias_method :visit_media, :check_order
-    alias_method :visit_mixin, :check_order
-    alias_method :visit_rule,  :check_order
-    alias_method :visit_prop,  :check_order
+    alias visit_media check_order
+    alias visit_mixin check_order
+    alias visit_rule check_order
+    alias visit_prop check_order
 
     def visit_prop(node, &block)
       # Handle nested properties by appending the parent property they are
@@ -76,8 +76,8 @@ module SCSSLint
     end
 
     def check_sort_order(sortable_prop_info)
-      sorted_props = sortable_prop_info
-        .sort { |a, b| compare_properties(a, b) }
+      sortable_prop_info = sortable_prop_info.uniq { |item| item[:name] }
+      sorted_props = sortable_prop_info.sort { |a, b| compare_properties(a, b) }
 
       sorted_props.each_with_index do |prop, index|
         # Once we reach the portion of the list with unspecified properties, we
@@ -128,12 +128,10 @@ module SCSSLint
     def compare_properties(a, b)
       if a[:property] == b[:property]
         compare_by_vendor(a, b)
+      elsif @preferred_order
+        compare_by_order(a, b, @preferred_order)
       else
-        if @preferred_order
-          compare_by_order(a, b, @preferred_order)
-        else
-          a[:property] <=> b[:property]
-        end
+        a[:property] <=> b[:property]
       end
     end
 

data/lib/scss_lint/linter/selector_depth.rb

@@ -49,14 +49,15 @@ module SCSSLint
       depth = simple_sequences.size -
         separators.count { |item| item == '~' || item == '+' }
 
-      if parent_selectors > 0
-        # If parent selectors are present, add the current depth for each
-        # additional parent selector.
-        depth += parent_selectors * (current_depth - 1)
-      else
-        # Otherwise this just descends from the containing selector
-        depth += current_depth
-      end
+      depth +=
+        if parent_selectors > 0
+          # If parent selectors are present, add the current depth for each
+          # additional parent selector.
+          parent_selectors * (current_depth - 1)
+        else
+          # Otherwise this just descends from the containing selector
+          current_depth
+        end
 
       depth
     end

data/lib/scss_lint/linter/selector_format.rb

@@ -67,7 +67,7 @@ module SCSSLint
           /x
         end,
       },
-    }
+    }.freeze
 
     # Checks the given name and returns the violated convention if it failed.
     def violated_convention(name_string, type)

data/lib/scss_lint/linter/shorthand.rb

@@ -27,7 +27,7 @@ module SCSSLint
       border-width
       margin
       padding
-    ]
+    ].freeze
 
     # @param prop [String]
     # @param list [Sass::Script::Tree::ListLiteral]

data/lib/scss_lint/linter/single_line_per_selector.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SCSSLint
   # Checks that selector sequences are split over multiple lines by comma.
   class Linter::SingleLinePerSelector < Linter
     include LinterRegistry
 
-    MESSAGE = 'Each selector in a comma sequence should be on its own single line'
+    MESSAGE = 'Each selector in a comma sequence should be on its own single line'.freeze
 
     def visit_comma_sequence(node)
       return unless node.members.count > 1

data/lib/scss_lint/linter/space_around_operator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SCSSLint
   # Checks for space around operators on values.
   class Linter::SpaceAroundOperator < Linter
@@ -109,10 +111,10 @@ module SCSSLint
     private
 
       SPACE_MSG = '`%s` should be written with a single space on each side of ' \
-                  'the operator: `%s %s %s`'
+                  'the operator: `%s %s %s`'.freeze
 
       NO_SPACE_MSG = '`%s` should be written without spaces around the ' \
-                     'operator: `%s%s%s`'
+                     'operator: `%s%s%s`'.freeze
 
       def calculate_operator_source
         # We don't want to add 1 to range1.end_pos.offset for the same reason as