lib/scss_lint/config.rb in scss_lint-0.49.0 vs lib/scss_lint/config.rb in scss_lint-0.50.0

@@ -268,13 +268,13 @@
         linter_config['enabled'] = false
       end
     end
 
     def linter_options(linter)
-      { 'severity' => @options['severity'] }.merge(
-        @options['linters'].fetch(self.class.linter_name(linter), {})
-      )
+      options = @options['linters'].fetch(self.class.linter_name(linter), {})
+      options['severity'] ||= @options['severity']
+      options
     end
 
     def excluded_file?(file_path)
       abs_path = File.expand_path(file_path)
 
@@ -302,11 +302,11 @@
       @options['exclude'] << abs_path
     end
 
     # @return Array
     def scss_files
-      if path = @options['scss_files']
-        Dir[path]
+      if path = @options['scss_files'] && Array(path).any?
+        Array(path).map { |p| Dir[p] }.flatten.uniq
       else
         []
       end
     end