From 661506c10338027c761c2ac29eb77bd4c1470fff Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Thu, 24 Sep 2020 15:20:07 -0400 Subject: [PATCH] Add callback for `rubocop/ast` Loading the version first also gives an opportunity for `rubocop/ast` to react. Removing handling of rubocop-ast <1.0 in gemspec no longer needed --- lib/rubocop.rb | 6 ++++-- rubocop.gemspec | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/rubocop.rb b/lib/rubocop.rb index a2fb0120853..005bf21be7d 100644 --- a/lib/rubocop.rb +++ b/lib/rubocop.rb @@ -8,12 +8,13 @@ require 'forwardable' require 'regexp_parser' require 'unicode/display_width/no_string_ext' + +require_relative 'rubocop/version' require 'rubocop-ast' + require_relative 'rubocop/ast_aliases' require_relative 'rubocop/ext/regexp_node' -require_relative 'rubocop/version' - require_relative 'rubocop/core_ext/string' require_relative 'rubocop/ext/processed_source' @@ -636,3 +637,4 @@ unless File.exist?("#{__dir__}/../rubocop.gemspec") # Check if we are a gem RuboCop::ResultCache.rubocop_required_features = $LOADED_FEATURES - before_us end +RuboCop::AST.rubocop_loaded if RuboCop::AST.respond_to?(:rubocop_loaded) diff --git a/rubocop.gemspec b/rubocop.gemspec index 693b034133a..f124b343d33 100644 --- a/rubocop.gemspec +++ b/rubocop.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency('rainbow', '>= 2.2.2', '< 4.0') s.add_runtime_dependency('regexp_parser', '>= 1.7') s.add_runtime_dependency('rexml') - s.add_runtime_dependency('rubocop-ast', '>= 0.5.0', '< 1.0') + s.add_runtime_dependency('rubocop-ast', '>= 0.5.0') s.add_runtime_dependency('ruby-progressbar', '~> 1.7') s.add_runtime_dependency('unicode-display_width', '>= 1.4.0', '< 2.0')