summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/initializers/parser_patch.rb15
-rw-r--r--lib/tasks/haml-lint.rake11
2 files changed, 11 insertions, 15 deletions
diff --git a/config/initializers/parser_patch.rb b/config/initializers/parser_patch.rb
deleted file mode 100644
index 8ebd804b94f..00000000000
--- a/config/initializers/parser_patch.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_literal_string: true
-
-# This works around unnecessary static-analysis warnings that will be
-# fixed via https://github.com/whitequark/parser/pull/528.
-module Parser
- class << self
- def warn_syntax_deviation(feature, version)
- return if ['2.3.8', '2.4.5', '2.5.3'].include?(version)
-
- warn "warning: parser/current is loading #{feature}, which recognizes"
- warn "warning: #{version}-compliant syntax, but you are running #{RUBY_VERSION}."
- warn "warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri."
- end
- end
-end
diff --git a/lib/tasks/haml-lint.rake b/lib/tasks/haml-lint.rake
index ad2d034b0b4..786efd14b1a 100644
--- a/lib/tasks/haml-lint.rake
+++ b/lib/tasks/haml-lint.rake
@@ -2,5 +2,16 @@ unless Rails.env.production?
require 'haml_lint/rake_task'
require 'haml_lint/inline_javascript'
+ # Workaround for warnings from parser/current
+ # Keep it even if it no longer emits any warnings,
+ # because we'll still see warnings in console/server anyway,
+ # and we don't need to break static-analysis for this.
+ task :haml_lint do
+ require 'parser'
+ def Parser.warn(*args)
+ puts(*args) # static-analysis ignores stdout if status is 0
+ end
+ end
+
HamlLint::RakeTask.new
end