haml_lint 0.58.0 → 0.59.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/haml_lint/adapter.rb +3 -3
- data/lib/haml_lint/cli.rb +2 -2
- data/lib/haml_lint/document.rb +1 -1
- data/lib/haml_lint/extensions/haml_util_unescape_interpolation_tracking.rb +1 -1
- data/lib/haml_lint/linter/rubocop.rb +1 -1
- data/lib/haml_lint/rake_task.rb +3 -2
- data/lib/haml_lint/reporter/default_reporter.rb +1 -1
- data/lib/haml_lint/reporter/disabled_config_reporter.rb +1 -1
- data/lib/haml_lint/reporter/json_reporter.rb +1 -1
- data/lib/haml_lint/reporter/progress_reporter.rb +2 -1
- data/lib/haml_lint/reporter/utils.rb +2 -2
- data/lib/haml_lint/reporter.rb +1 -1
- data/lib/haml_lint/ruby_extraction/base_chunk.rb +1 -1
- data/lib/haml_lint/ruby_extraction/chunk_extractor.rb +1 -1
- data/lib/haml_lint/runner.rb +1 -0
- data/lib/haml_lint/spec.rb +4 -4
- data/lib/haml_lint/tree/haml_comment_node.rb +1 -1
- data/lib/haml_lint/tree/node.rb +1 -1
- data/lib/haml_lint/tree/root_node.rb +2 -2
- data/lib/haml_lint/tree/script_node.rb +1 -1
- data/lib/haml_lint/utils.rb +1 -1
- data/lib/haml_lint/version.rb +1 -1
- data/lib/haml_lint.rb +23 -23
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 15d3baf951722e2a699bc903a0848affa4a05b38939c67554e0410dfb9b817bb
|
4
|
+
data.tar.gz: d143ca9d7330ff3f4d7e32fa306be4a520258627f34b0ddd7536964ebdd45c05
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 85296a42fbb76f5033401ecd2825efafe5efad954ec2e312af2133a468afe1b92f1c95269a571cbfe9cc9366ecc244a257d7e3e4b756911c921820f7d181beb1
|
7
|
+
data.tar.gz: 90309db3dbfa97deb00561fd6479d82e14519fe3ba59bcc80da456731ab3c830afe389bd958df382748b3d0906fdde4a3c7abe110b99151d1be797e4e1cde63f
|
data/lib/haml_lint/adapter.rb
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
4
|
-
|
5
|
-
|
3
|
+
require_relative 'adapter/haml_5'
|
4
|
+
require_relative 'adapter/haml_6'
|
5
|
+
require_relative 'exceptions'
|
6
6
|
|
7
7
|
module HamlLint
|
8
8
|
# Determines the adapter to use for the current Haml version
|
data/lib/haml_lint/cli.rb
CHANGED
data/lib/haml_lint/document.rb
CHANGED
@@ -14,7 +14,7 @@ module Haml::Util
|
|
14
14
|
Thread.current[:haml_lint_unescape_interpolation_to_original_cache] ||= {}
|
15
15
|
end
|
16
16
|
|
17
|
-
# As soon as a HamlLint::Document has finished processing a HAML
|
17
|
+
# As soon as a HamlLint::Document has finished processing a HAML source, this gets called to
|
18
18
|
# get a copy of this cache and clear up for the next HAML processing
|
19
19
|
def self.unescape_interpolation_to_original_cache_take_and_wipe
|
20
20
|
value = unescape_interpolation_to_original_cache.dup
|
@@ -117,7 +117,7 @@ module HamlLint
|
|
117
117
|
# so the lints will be recorded then.
|
118
118
|
@lints = []
|
119
119
|
|
120
|
-
msg = "Corrections couldn't be
|
120
|
+
msg = "Corrections couldn't be transferred: #{e.message} - Consider linting the file " \
|
121
121
|
'without auto-correct and doing the changes manually.'
|
122
122
|
if ENV['HAML_LINT_DEBUG'] == 'true'
|
123
123
|
msg = "#{msg} DEBUG: Rubocop corrected Ruby code follows:\n#{new_ruby_code}\n------"
|
data/lib/haml_lint/rake_task.rb
CHANGED
@@ -2,7 +2,8 @@
|
|
2
2
|
|
3
3
|
require 'rake'
|
4
4
|
require 'rake/tasklib'
|
5
|
-
|
5
|
+
|
6
|
+
require_relative 'constants'
|
6
7
|
|
7
8
|
module HamlLint
|
8
9
|
# Rake task interface for haml-lint command line interface.
|
@@ -93,7 +94,7 @@ module HamlLint
|
|
93
94
|
|
94
95
|
task(name, [:files]) do |_task, task_args|
|
95
96
|
# Lazy-load so task doesn't affect Rakefile load time
|
96
|
-
|
97
|
+
require_relative 'cli'
|
97
98
|
|
98
99
|
run_cli(task_args)
|
99
100
|
end
|
@@ -96,7 +96,7 @@ module HamlLint
|
|
96
96
|
# Prints a summary of the number of lints found in a report.
|
97
97
|
#
|
98
98
|
# @param report [HamlLint::Report] the report to print
|
99
|
-
# @param is_append [Boolean] if this is appending to a line. Will
|
99
|
+
# @param is_append [Boolean] if this is appending to a line. Will prefix with ", ".
|
100
100
|
# @return [void]
|
101
101
|
def print_summary_lints(report, is_append:)
|
102
102
|
log.log ', ', false if is_append
|
@@ -114,7 +114,7 @@ module HamlLint
|
|
114
114
|
# Prints a summary of the number of lints corrected in a report.
|
115
115
|
#
|
116
116
|
# @param report [HamlLint::Report] the report to print
|
117
|
-
# @param is_append [Boolean] if this is appending to a line. Will
|
117
|
+
# @param is_append [Boolean] if this is appending to a line. Will prefix with ", ".
|
118
118
|
# @return [void]
|
119
119
|
def print_summary_corrected_lints(report, is_append:)
|
120
120
|
lint_count = report.lints.count(&:corrected)
|
data/lib/haml_lint/reporter.rb
CHANGED
@@ -63,7 +63,7 @@ module HamlLint::RubyExtraction
|
|
63
63
|
transfer_correction_logic(coordinator, to_ruby_lines, haml_lines)
|
64
64
|
end
|
65
65
|
|
66
|
-
# To be
|
66
|
+
# To be overridden by subclasses.
|
67
67
|
#
|
68
68
|
# Logic to transfer the corrections that turned from_ruby_lines into to_ruby_lines.
|
69
69
|
#
|
@@ -678,7 +678,7 @@ module HamlLint::RubyExtraction
|
|
678
678
|
|
679
679
|
def self.anonymous_block?(code)
|
680
680
|
# Don't start with a comment and end with a `do`
|
681
|
-
#
|
681
|
+
# Definitely not perfect for the comment handling, but otherwise a more advanced parsing system is needed.
|
682
682
|
# Move the comment to its own line if it's annoying.
|
683
683
|
code !~ /\A\s*#/ &&
|
684
684
|
code =~ /\bdo\s*(\|[^|]*\|\s*)?(#.*)?\z/
|
data/lib/haml_lint/runner.rb
CHANGED
data/lib/haml_lint/spec.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
3
|
+
require_relative 'spec/normalize_indent'
|
4
|
+
require_relative 'spec/shared_linter_context'
|
5
|
+
require_relative 'spec/shared_rubocop_autocorrect_context'
|
6
|
+
require_relative 'spec/matchers/report_lint'
|
data/lib/haml_lint/tree/node.rb
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
3
|
+
require_relative 'null_node'
|
4
4
|
|
5
5
|
module HamlLint::Tree
|
6
6
|
# Represents the root node of a HAML document that contains all other nodes.
|
7
7
|
class RootNode < Node
|
8
|
-
# The name
|
8
|
+
# The name of the file parsed to build this tree.
|
9
9
|
#
|
10
10
|
# @return [String] a file name
|
11
11
|
def file
|
data/lib/haml_lint/utils.rb
CHANGED
@@ -116,7 +116,7 @@ module HamlLint
|
|
116
116
|
|
117
117
|
# Returns indexes of all occurrences of a substring within a string.
|
118
118
|
#
|
119
|
-
# Note, this will not return
|
119
|
+
# Note, this will not return overlapping substrings, so searching for "aa"
|
120
120
|
# in "aaa" will only find one substring, not two.
|
121
121
|
#
|
122
122
|
# @param text [String] the text to search
|
data/lib/haml_lint/version.rb
CHANGED
data/lib/haml_lint.rb
CHANGED
@@ -3,26 +3,26 @@
|
|
3
3
|
# Need to load haml before we can reference some Haml modules in our code
|
4
4
|
require 'haml'
|
5
5
|
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
6
|
+
require_relative 'haml_lint/constants'
|
7
|
+
require_relative 'haml_lint/exceptions'
|
8
|
+
require_relative 'haml_lint/configuration'
|
9
|
+
require_relative 'haml_lint/configuration_loader'
|
10
|
+
require_relative 'haml_lint/document'
|
11
|
+
require_relative 'haml_lint/haml_visitor'
|
12
|
+
require_relative 'haml_lint/lint'
|
13
|
+
require_relative 'haml_lint/linter_registry'
|
14
|
+
require_relative 'haml_lint/ruby_parser'
|
15
|
+
require_relative 'haml_lint/linter'
|
16
|
+
require_relative 'haml_lint/logger'
|
17
|
+
require_relative 'haml_lint/reporter'
|
18
|
+
require_relative 'haml_lint/report'
|
19
|
+
require_relative 'haml_lint/linter_selector'
|
20
|
+
require_relative 'haml_lint/file_finder'
|
21
|
+
require_relative 'haml_lint/runner'
|
22
|
+
require_relative 'haml_lint/utils'
|
23
|
+
require_relative 'haml_lint/version'
|
24
|
+
require_relative 'haml_lint/version_comparer'
|
25
|
+
require_relative 'haml_lint/severity'
|
26
26
|
|
27
27
|
# Lead all extensions to external source code
|
28
28
|
Dir[File.expand_path('haml_lint/extensions/*.rb', File.dirname(__FILE__))].sort.each do |file|
|
@@ -30,8 +30,8 @@ Dir[File.expand_path('haml_lint/extensions/*.rb', File.dirname(__FILE__))].sort.
|
|
30
30
|
end
|
31
31
|
|
32
32
|
# Load all parse tree node classes
|
33
|
-
|
34
|
-
|
33
|
+
require_relative 'haml_lint/tree/node'
|
34
|
+
require_relative 'haml_lint/node_transformer'
|
35
35
|
Dir[File.expand_path('haml_lint/tree/*.rb', File.dirname(__FILE__))].sort.each do |file|
|
36
36
|
require file
|
37
37
|
end
|
@@ -47,7 +47,7 @@ Dir[File.expand_path('haml_lint/reporter/*.rb', File.dirname(__FILE__))].sort.ea
|
|
47
47
|
end
|
48
48
|
|
49
49
|
# Load all the chunks for RubyExtraction
|
50
|
-
|
50
|
+
require_relative 'haml_lint/ruby_extraction/base_chunk'
|
51
51
|
Dir[File.expand_path('haml_lint/ruby_extraction/*.rb', File.dirname(__FILE__))].sort.each do |file|
|
52
52
|
require file
|
53
53
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: haml_lint
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.59.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Shane da Silva
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-
|
11
|
+
date: 2024-09-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: haml
|