haml_lint 0.23.1 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e58b8dc5ec0023cca7778fb8b23f4427d652dc34
-  data.tar.gz: 7a8856c5bb83a40e5e3b0533d23d4c7fcbe47405
+  metadata.gz: 5e1e7727e9ee3dadac7fe5fbc6ba6e4a42e482b5
+  data.tar.gz: 7176808267f479eeb56757133e8c0015c4841b77
 SHA512:
-  metadata.gz: 5f73d54e14c88415a11459229b6b3e5400e6fd7ffe166c24c74baabfbad4219016117bc675b98cb351a46b46d996f6976892c867f0352c25b80e332f6dad9240
-  data.tar.gz: ad18b07001c9a25283777c3f6048d991cbe9604b7dc034e1ad57e323c3c9f1a56828e6a279a9b810374fed4440b301b6e7c7eb249a794c40a99b2ff41b36d417
+  metadata.gz: c944db1432ca3b9133769fde9173b0dee6ec253f0ac1d16d5d194fce086bfce9952ae49603a196b3d9fc30dbd93572d067169490483ee01b14c36433cdb49c32
+  data.tar.gz: e533c56866c2ad9702be3461068cb2aab5fe73c1a39eaf059bfae0850628a1145c67e832eae29f663f6b336d96bff8851d0dcafd8feebb1972767af8c89c6e67

data/lib/haml_lint/document.rb

@@ -43,7 +43,7 @@ module HamlLint
     def process_source(source)
       @source = process_encoding(source)
       @source = strip_frontmatter(source)
-      @source_lines = @source.split("\n")
+      @source_lines = @source.split(/\r\n|\r|\n/)
 
       @tree = process_tree(HamlLint::Adapter.detect_class.new(@source).parse)
     rescue Haml::Error => ex

data/lib/haml_lint/linter/line_length.rb

@@ -5,6 +5,11 @@ module HamlLint
   class Linter::LineLength < Linter
     include LinterRegistry
 
+    # A marker for a line within a multiline node.
+    #
+    # @api private
+    DummyNode = Struct.new(:line)
+
     MSG = 'Line is too long. [%d/%d]'.freeze
 
     def visit_root(root)
@@ -15,7 +20,7 @@ module HamlLint
 
         node = root.node_for_line(index + 1)
         unless node.disabled?(self)
-          record_lint(node, format(MSG, line.length, max_length))
+          record_lint(DummyNode.new(index + 1), format(MSG, line.length, max_length))
         end
       end
     end

data/lib/haml_lint/tree/node.rb

@@ -85,6 +85,26 @@ module HamlLint::Tree
       "#<#{self.class.name}>"
     end
 
+    # The lines of text, if any, that are contained in the node.
+    #
+    # @api public
+    # @return [Array<String>]
+    def lines
+      return [] unless @value && text
+
+      text.split(/\r\n|\r|\n/)
+    end
+
+    # The line numbers that are contained within the node.
+    #
+    # @api public
+    # @return [Range]
+    def line_numbers
+      return (line..line) unless @value && text
+
+      (line..line + lines.count)
+    end
+
     # The previous node to be traversed in the tree.
     #
     # @return [HamlLint::Tree::Node, nil]

data/lib/haml_lint/tree/root_node.rb

@@ -15,7 +15,7 @@ module HamlLint::Tree
     # @param line [Integer] the line number of the node
     # @return [HamlLint::Node]
     def node_for_line(line)
-      find(-> { HamlLint::Tree::NullNode.new }) { |node| node.line == line }
+      find(-> { HamlLint::Tree::NullNode.new }) { |node| node.line_numbers.cover?(line) }
     end
   end
 end

data/lib/haml_lint/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module HamlLint
-  VERSION = '0.23.1'.freeze
+  VERSION = '0.23.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.23.2
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml