slim_lint 0.25.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58c99ab50012a0f3475e6518e69bade743b55e6ed5eb4f5dd25a98ea1b7a617e
-  data.tar.gz: 4593348af814f4bce1bd240d4982eec2acd9d4c7bbda5f5ccc231a3a51b8c148
+  metadata.gz: b4318d25d9325fb30a43a2db83a14aca0002c83960dc7edb0e8a5c87eaa59e64
+  data.tar.gz: 7ae359e3575cdae4293216064fc6a4bc0a07bd9d6ebb5b5688949634ae1ccbf1
 SHA512:
-  metadata.gz: 53ea008e7e03d7261af22c33e098be489096299117b9ec103406382568af8b8b3c10e0a77a3e97e9848c88a57d04d2f5a6b7998b48555d7ea205ceb136f95cdb
-  data.tar.gz: 1e5e98f7d7e6eacc805a85451b8428f2f746b91b5b3433ce5262779d6bd9285b6db00e463c3d1b79912e9b93b677b5f12f0bf0e50613f284b8b482732fc7e552
+  metadata.gz: 6a03e56f04fefa1fc83f95356bcb2bbe5b13db122140aa34afda23809cfd1af6469bed95c681436f4ec7230deebf3b7f932cbbff21423eba88b61bd107006029
+  data.tar.gz: d59790c900df3af0486a8c4b636bf970ef9b35932e67342b3d9fb3b8a8dee779016fb0ab8d65ebcd1f9fadb26fa14149da771499159686bc665b0a56608b1774

data/config/default.yml

@@ -32,6 +32,12 @@ linters:
     enabled: false
     max: 300
 
+  InstanceVariables:
+    enabled: false
+    include:
+      # Include only partial templates by default
+      - app/views/**/_*.html.slim
+
   LineLength:
     enabled: true
     max: 80
@@ -83,6 +89,12 @@ linters:
       - Style/WhileUntilDo
       - Style/WhileUntilModifier
 
+  StrictLocalsMissing:
+    enabled: false
+    include:
+      # Include only Rails partial templates by default
+      - app/views/**/_*.html.slim
+
   Tab:
     enabled: true
 

data/lib/slim_lint/linter/control_statement_spacing.rb

@@ -9,14 +9,8 @@ module SlimLint
 
     on [:html, :tag, anything, [],
          [:slim, :output, anything, capture(:ruby, anything)]] do |sexp|
-      # Process original slim code so that multi-line attributes become single line.
-      # And store the correction line count
-      source = merge_multiline_attributes(document.source_lines)
-
-      # Fetch processed Slim code that contains an element with a control statement.
-      line = source[sexp.line - 1][:line]
-      # Apply correction to the line count.
-      sexp.line += source[sexp.line - 1][:line_count]
+      # Fetch original Slim code that contains an element with a control statement.
+      line = document.source_lines[sexp.line - 1]
 
       # Remove any Ruby code, because our regexp below must not match inside Ruby.
       ruby = captures[:ruby]
@@ -26,29 +20,5 @@ module SlimLint
 
       report_lint(sexp, MESSAGE)
     end
-
-    private
-
-    def merge_multiline_attributes(source_lines)
-      result = []
-      memo = ''
-      correction_line_count = 0
-
-      source_lines.each do |line|
-        memo += line.chomp('\\')
-
-        # Lines ending in a backslash are concatenated with the next line
-        # And count the number of lines to correct the sexp line count.
-        if line.match?(/\\$/)
-          correction_line_count += 1
-          next
-        end
-
-        # Add merged rows and correction line count to the result and reset the memo
-        result << { line: memo, line_count: correction_line_count }
-        memo = ''
-      end
-      result
-    end
   end
 end

data/lib/slim_lint/linter/embedded_engines.rb

@@ -12,7 +12,7 @@ module SlimLint
       dummy_node = Struct.new(:line)
       document.source_lines.each_with_index do |line, index|
         forbidden_engines.each do |forbidden_engine|
-          next unless line =~ /^#{forbidden_engine}.*:\s*$/
+          next unless line =~ /^\s*#{forbidden_engine}.*:\s*$/
 
           report_lint(dummy_node.new(index + 1), MESSAGE % forbidden_engine)
         end

data/lib/slim_lint/linter/instance_variables.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module SlimLint
+  # Searches for instance variables in partial or other templates.
+  class Linter::InstanceVariables < Linter
+    include LinterRegistry
+
+    on_start do |_sexp|
+      processed_sexp = SlimLint::RubyExtractEngine.new.call(document.source)
+
+      extractor = SlimLint::RubyExtractor.new
+      extracted_source = extractor.extract(processed_sexp)
+      next if extracted_source.source.empty?
+
+      parsed_ruby = parse_ruby(extracted_source.source)
+      next unless parsed_ruby
+
+      report_instance_variables(parsed_ruby, extracted_source.source_map)
+    end
+
+    private
+
+    def report_instance_variables(parsed_ruby, source_map)
+      parsed_ruby.each_node do |node|
+        next unless node.ivar_type?
+
+        dummy_node = Struct.new(:line)
+        report_lint(dummy_node.new(source_map[node.loc.line]),
+                    'Avoid instance variables in the configured ' \
+                    "view templates (found `#{node.source}`)")
+      end
+    end
+  end
+end

data/lib/slim_lint/linter/strict_locals_missing.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module SlimLint
+  # Reports on missing strict locals magic line in Slim templates.
+  class Linter::StrictLocalsMissing < Linter
+    include LinterRegistry
+
+    on_start do |_sexp|
+      unless document.source =~ %r{/#\s+locals:\s+\(.*\)}
+        dummy_node = Struct.new(:line)
+        report_lint(dummy_node.new(1), 'Strict locals magic line is missing')
+      end
+    end
+  end
+end

data/lib/slim_lint/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module SlimLint
-  VERSION = '0.25.0'
+  VERSION = '0.27.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_lint
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -114,9 +114,11 @@ files:
 - lib/slim_lint/linter/empty_control_statement.rb
 - lib/slim_lint/linter/empty_lines.rb
 - lib/slim_lint/linter/file_length.rb
+- lib/slim_lint/linter/instance_variables.rb
 - lib/slim_lint/linter/line_length.rb
 - lib/slim_lint/linter/redundant_div.rb
 - lib/slim_lint/linter/rubocop.rb
+- lib/slim_lint/linter/strict_locals_missing.rb
 - lib/slim_lint/linter/tab.rb
 - lib/slim_lint/linter/tag_case.rb
 - lib/slim_lint/linter/trailing_blank_lines.rb