diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-10-24 15:29:03 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-10-24 15:31:00 +0800 |
| commit | 3a9271f17914858879221a141989bb04076c0b0c (patch) | |
| tree | 9d5b093b0b508850d1ffd10d578684c358e6b545 | |
| parent | 0cbefe85ed2823d2201fd9d30120ecf7535e88a0 (diff) | |
| download | gitlab-ce-sh-bump-ruby-2.4.5.tar.gz | |
Convert parser warnings to stdout in haml_lintsh-bump-ruby-2.4.5
This was used in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16648
and this could happen from time to time, so let's just keep it.
| -rw-r--r-- | config/initializers/parser_patch.rb | 15 | ||||
| -rw-r--r-- | lib/tasks/haml-lint.rake | 11 |
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 |