haml_lint 0.73.0 → 0.75.0

data/lib/haml_lint/tree/node.rb

@@ -3,13 +3,13 @@
 require_relative '../comment_configuration'
 
 module HamlLint::Tree
-  # Decorator class that provides a convenient set of helpers for HAML's
+  # Decorator class that provides a convenient set of helpers for Haml's
   # {Haml::Parser::ParseNode} struct.
   #
   # The goal is to abstract away the details of the underlying struct and
   # provide a cleaner and more uniform interface for getting information about a
   # node, as there are a number of weird/special cases in the struct returned by
-  # the HAML parser.
+  # the Haml parser.
   #
   # @abstract
   class Node
@@ -21,7 +21,7 @@ module HamlLint::Tree
     # Creates a node wrapping the given {Haml::Parser::ParseNode} struct.
     #
     # @param document [HamlLint::Document] Haml document that created this node
-    # @param parse_node [Haml::Parser::ParseNode] parse node created by HAML's parser
+    # @param parse_node [Haml::Parser::ParseNode] parse node created by Haml's parser
     def initialize(document, parse_node)
       @line = parse_node.line
       @document = document

data/lib/haml_lint/tree/root_node.rb

@@ -3,7 +3,7 @@
 require_relative 'null_node'
 
 module HamlLint::Tree
-  # Represents the root node of a HAML document that contains all other nodes.
+  # Represents the root node of a Haml document that contains all other nodes.
   class RootNode < Node
     # The name of the file parsed to build this tree.
     #
@@ -21,7 +21,7 @@ module HamlLint::Tree
         return node if node.line_numbers.cover?(line) && node != self
       end
 
-      # Because HAML doesn't leave any trace in the nodes when it merges lines that
+      # Because Haml doesn't leave any trace in the nodes when it merges lines that
       # end with a comma, it's harder to assign a node to the second line here:
       # = some_call user,
       #             foo, bar

data/lib/haml_lint/tree/silent_script_node.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module HamlLint::Tree
-  # Represents a HAML silent script node (`- some_expression`) which executes
+  # Represents a Haml silent script node (`- some_expression`) which executes
   # code without producing output.
   class SilentScriptNode < Node
     # The Ruby script contents parsed into a syntax tree.

data/lib/haml_lint/tree/tag_node.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module HamlLint::Tree
-  # Represents a tag node in a HAML document.
+  # Represents a tag node in a Haml document.
   class TagNode < Node
     # Computed set of attribute hashes code.
     #
@@ -33,10 +33,20 @@ module HamlLint::Tree
       @value[:parse] && !@value[:value].strip.empty?
     end
 
+    # Whether this tag outputs unescaped HTML via a `!` marker, e.g. `%tag!=` or
+    # `%tag!~`.
+    #
+    # @return [true,false]
+    def unescape_html?
+      return false unless contains_script?
+
+      /\A\s*[<>]*\s*!/.match?(inline_marker_source)
+    end
+
     # Returns whether this tag has a specified attribute.
     #
     # @return [true,false]
-    def has_hash_attribute?(attribute)
+    def has_hash_attribute?(attribute) # rubocop:disable Naming
       hash_attributes? && existing_attributes.include?(attribute)
     end
 
@@ -94,30 +104,18 @@ module HamlLint::Tree
     #
     # @return [Hash]
     def attributes_source
-      @attributes_source ||=
-        begin
-          _explicit_tag, static_attrs, rest =
-            source_code.scan(/\A\s*(%[-:\w]+)?([-:\w.\#]*)(.*)/m)[0]
-
-          attr_types = {
-            '{' => [:hash, %w[{ }]],
-            '(' => [:html, %w[( )]],
-            '[' => [:object_ref, %w[[ ]]],
-          }
-
-          attr_source = { static: static_attrs }
-          while rest
-            type, chars = attr_types[rest[0]]
-            break unless type # Not an attribute opening character, so we're done
-
-            # Can't define multiple of the same attribute type (e.g. two {...})
-            break if attr_source[type]
-
-            attr_source[type], rest = Haml::Util.balance(rest, *chars)
-          end
+      parsed_attributes_source[:attributes]
+    end
 
-          attr_source
-        end
+    # Source that follows the tag name and attributes. It begins with the
+    # content marker (e.g. `=`, `!=`, `~`, `!~`, or plain text).
+    #
+    # @example For `%tag.class!= foo`, this returns:
+    #   '!= foo'
+    #
+    # @return [String]
+    def inline_marker_source
+      parsed_attributes_source[:marker]
     end
 
     # Whether this tag node has a set of hash attributes defined via the
@@ -229,6 +227,40 @@ module HamlLint::Tree
 
     private
 
+    # Parses the source code following the tag name once into its attribute
+    # sources and the remaining inline content marker.
+    #
+    # @return [Hash{Symbol => Object}] `:attributes` source hash (keyed by
+    #   `:static`/`:hash`/`:html`/`:object_ref`) and the `:marker` string
+    def parsed_attributes_source
+      @parsed_attributes_source ||=
+        begin
+          _explicit_tag, static_attrs, rest =
+            source_code.scan(/\A\s*(%[-:\w]+)?([-:\w.\#]*)(.*)/m)[0]
+
+          attr_types = {
+            '{' => [:hash, %w[{ }]],
+            '(' => [:html, %w[( )]],
+            '[' => [:object_ref, %w[[ ]]],
+          }
+
+          attr_source = { static: static_attrs }
+          while rest
+            type, chars = attr_types[rest[0]]
+            break unless type # Not an attribute opening character, so we're done
+
+            # Can't define multiple of the same attribute type (e.g. two {...})
+            break if attr_source[type]
+
+            attr_source[type], rest = Haml::Util.balance(rest, *chars)
+          end
+
+          # Whatever remains after the tag name and attributes begins with the
+          # content marker (e.g. `=`, `!=`, `~`, `!~`, or plain text).
+          { attributes: attr_source, marker: rest.to_s }
+        end
+    end
+
     def existing_attributes
       parsed_attrs = parsed_attributes
       return {} unless parsed_attrs.respond_to?(:children)

data/lib/haml_lint/utils.rb

@@ -233,7 +233,7 @@ module HamlLint
 
     # Returns true if line is only whitespace.
     # Note, this is not like blank? is rails. For nil, this returns false.
-    def is_blank_line?(line)
+    def is_blank_line?(line) # rubocop:disable Naming
       line && line.index(/\S/).nil?
     end
 

data/lib/haml_lint/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module HamlLint
-  VERSION = '0.73.0'
+  VERSION = '0.75.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.73.0
+  version: 0.75.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -138,6 +138,7 @@ files:
 - lib/haml_lint/linter/tag_name.rb
 - lib/haml_lint/linter/trailing_empty_lines.rb
 - lib/haml_lint/linter/trailing_whitespace.rb
+- lib/haml_lint/linter/unescaped_html.rb
 - lib/haml_lint/linter/unnecessary_interpolation.rb
 - lib/haml_lint/linter/unnecessary_string_output.rb
 - lib/haml_lint/linter/view_length.rb
@@ -218,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: HAML lint tool
 test_files: []