Add offset as column in SpaceAfterComma linter message

printercu · Aug 18, 2016 · a229ca1 · a229ca1
1 parent 21d2444
commit a229ca1
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 2 deletions.
diff --git a/lib/scss_lint/linter.rb b/lib/scss_lint/linter.rb
@@ -52,7 +52,8 @@ def name
 
     # Helper for creating lint from a parse tree node
     #
-    # @param node_or_line_or_location [Sass::Script::Tree::Node, Fixnum, SCSSLint::Location]
+    # @param node_or_line_or_location [Sass::Script::Tree::Node, Fixnum,
+    #                                  SCSSLint::Location, Sass::Source::Position]
     # @param message [String]
     def add_lint(node_or_line_or_location, message)
       @lints << Lint.new(self,
@@ -165,6 +166,8 @@ def visit_comment(_node)
     def extract_location(node_or_line_or_location)
       if node_or_line_or_location.is_a?(Location)
         node_or_line_or_location
+      elsif node_or_line_or_location.is_a?(Sass::Source::Position)
+        Location.new(node_or_line_or_location.line, node_or_line_or_location.offset)
       elsif node_or_line_or_location.respond_to?(:source_range) &&
             node_or_line_or_location.source_range
         location_from_range(node_or_line_or_location.source_range)

diff --git a/lib/scss_lint/linter/space_after_comma.rb b/lib/scss_lint/linter/space_after_comma.rb
@@ -89,7 +89,8 @@ def check_commas_after_args(args, arg_type)
         next if char == "\n" || # Ignore trailing spaces
                 valid_spaces_after_comma?(spaces)
 
-        add_lint comma_position, "Commas in #{arg_type} should be followed by a single space"
+        style_message = config['style'].tr('_', ' ')
+        add_lint comma_position, "Commas in #{arg_type} should be followed by #{style_message}"
       end
     end
 

diff --git a/spec/scss_lint/linter/space_after_comma_spec.rb b/spec/scss_lint/linter/space_after_comma_spec.rb
@@ -346,6 +346,30 @@
 
       it { should report_lint line: 4 }
     end
+
+    context 'column number' do
+      let(:scss) { <<-SCSS }
+      p {
+        property: $a,$b;
+      }
+      SCSS
+
+      it 'is the correct column' do
+        subject.lints.first.location.column.should == 15
+      end
+    end
+
+    context 'linter message' do
+      let(:scss) { <<-SCSS }
+      p {
+        property: $a,$b;
+      }
+      SCSS
+
+      it 'specifies the style' do
+        subject.lints.first.description.should == 'Commas in lists should be followed by one space'
+      end
+    end
   end
 
   context 'when more than one space is preferred' do
@@ -745,6 +769,19 @@
         it { should_not report_lint }
       end
     end
+
+    context 'linter message' do
+      let(:scss) { <<-SCSS }
+      p {
+        property: $a,$b;
+      }
+      SCSS
+
+      it 'specifies the style' do
+        subject.lints.first.description.should ==
+          'Commas in lists should be followed by at least one space'
+      end
+    end
   end
 
   context 'when no space is preferred' do
@@ -1078,5 +1115,17 @@
         it { should_not report_lint }
       end
     end
+
+    context 'linter message' do
+      let(:scss) { <<-SCSS }
+      p {
+        property: $a, $b;
+      }
+      SCSS
+
+      it 'specifies the style' do
+        subject.lints.first.description.should == 'Commas in lists should be followed by no space'
+      end
+    end
   end
 end