Bump rubocop from 1.63.0 to 1.63.4 #622
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?s=60&v=4){kind=small}
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.0 to 1.63.4. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](rubocop/rubocop@v1.63.0...v1.63.4) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
gem compare parser 3.3.0.5 3.3.1.0Compared versions: ["3.3.0.5", "3.3.1.0"]
DIFFERENT date:
3.3.0.5: 2024-01-21 00:00:00 UTC
3.3.1.0: 2024-04-26 00:00:00 UTC
DIFFERENT metadata:
3.3.0.5: {"bug_tracker_uri"=>"https://github.com/whitequark/parser/issues", "changelog_uri"=>"https://github.com/whitequark/parser/blob/v3.3.0.5/CHANGELOG.md", "documentation_uri"=>"https://www.rubydoc.info/gems/parser/3.3.0.5", "source_code_uri"=>"https://github.com/whitequark/parser/tree/v3.3.0.5"}
3.3.1.0: {"bug_tracker_uri"=>"https://github.com/whitequark/parser/issues", "changelog_uri"=>"https://github.com/whitequark/parser/blob/v3.3.1.0/CHANGELOG.md", "documentation_uri"=>"https://www.rubydoc.info/gems/parser/3.3.1.0", "source_code_uri"=>"https://github.com/whitequark/parser/tree/v3.3.1.0"}
DIFFERENT version:
3.3.0.5: 3.3.0.5
3.3.1.0: 3.3.1.0
DIFFERENT files:
3.3.0.5->3.3.1.0:
* Added:
lib/parser/unknown_encoding_in_magic_comment_error.rb +15/-0
* Changed:
lib/gauntlet_parser.rb +1/-1
lib/parser.rb +52/-51
lib/parser/all.rb +15/-15
lib/parser/ast/processor.rb +3/-1
lib/parser/current.rb +18/-18
lib/parser/macruby.rb +1/-1
lib/parser/ruby18.rb +1/-1
lib/parser/ruby19.rb +1/-1
lib/parser/ruby20.rb +1/-1
lib/parser/ruby21.rb +1/-1
lib/parser/ruby22.rb +1/-1
lib/parser/ruby23.rb +1/-1
lib/parser/ruby24.rb +1/-1
lib/parser/ruby25.rb +1/-1
lib/parser/ruby26.rb +1/-1
lib/parser/ruby27.rb +1/-1
lib/parser/ruby30.rb +1/-1
lib/parser/ruby31.rb +1/-1
lib/parser/ruby32.rb +1/-1
lib/parser/ruby33.rb +5/-5
lib/parser/ruby34.rb +4/-4
lib/parser/rubymotion.rb +1/-1
lib/parser/runner.rb +19/-19
lib/parser/runner/ruby_parse.rb +3/-3
lib/parser/runner/ruby_rewrite.rb +1/-1
lib/parser/source/buffer.rb +6/-1
lib/parser/source/tree_rewriter/action.rb +5/-4
lib/parser/static_environment.rb +47/-12
lib/parser/version.rb +1/-1 |
gem compare --diff parser 3.3.0.5 3.3.1.0Compared versions: ["3.3.0.5", "3.3.1.0"]
DIFFERENT files:
3.3.0.5->3.3.1.0:
* Added:
lib/parser/unknown_encoding_in_magic_comment_error.rb
--- /tmp/20240429-1899-chm994 2024-04-29 02:51:53.817508476 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/unknown_encoding_in_magic_comment_error.rb 2024-04-29 02:51:53.817508476 +0000
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Parser
+ ##
+ # {Parser::UnknownEncodingInMagicComment} is raised when a magic encoding
+ # comment is encountered that the currently running Ruby version doesn't
+ # recognize. It inherits from {ArgumentError} since that is the exception
+ # Ruby itself raises when trying to execute a file with an unknown encoding.
+ # As such, it is also not a {Parser::SyntaxError}.
+ #
+ # @api public
+ #
+ class UnknownEncodingInMagicComment < ArgumentError
+ end
+end
* Changed:
lib/gauntlet_parser.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/gauntlet_parser.rb 2024-04-29 02:51:53.629508462 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/gauntlet_parser.rb 2024-04-29 02:51:53.773508472 +0000
@@ -4 +4 @@
-require 'parser/all'
+require_relative 'parser/all'
lib/parser.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser.rb 2024-04-29 02:51:53.629508462 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser.rb 2024-04-29 02:51:53.773508472 +0000
@@ -4 +4 @@
- require 'parser/version'
+ require_relative 'parser/version'
@@ -20,3 +20,3 @@
- require 'parser/version'
- require 'parser/messages'
- require 'parser/deprecation'
+ require_relative 'parser/version'
+ require_relative 'parser/messages'
+ require_relative 'parser/deprecation'
@@ -25,3 +25,3 @@
- require 'parser/ast/node'
- require 'parser/ast/processor'
- require 'parser/meta'
+ require_relative 'parser/ast/node'
+ require_relative 'parser/ast/processor'
+ require_relative 'parser/meta'
@@ -31,2 +31,2 @@
- require 'parser/source/buffer'
- require 'parser/source/range'
+ require_relative 'parser/source/buffer'
+ require_relative 'parser/source/range'
@@ -34,2 +34,2 @@
- require 'parser/source/comment'
- require 'parser/source/comment/associator'
+ require_relative 'parser/source/comment'
+ require_relative 'parser/source/comment/associator'
@@ -37,21 +37,21 @@
- require 'parser/source/rewriter'
- require 'parser/source/rewriter/action'
- require 'parser/source/tree_rewriter'
- require 'parser/source/tree_rewriter/action'
-
- require 'parser/source/map'
- require 'parser/source/map/operator'
- require 'parser/source/map/collection'
- require 'parser/source/map/constant'
- require 'parser/source/map/variable'
- require 'parser/source/map/keyword'
- require 'parser/source/map/definition'
- require 'parser/source/map/method_definition'
- require 'parser/source/map/send'
- require 'parser/source/map/index'
- require 'parser/source/map/condition'
- require 'parser/source/map/ternary'
- require 'parser/source/map/for'
- require 'parser/source/map/rescue_body'
- require 'parser/source/map/heredoc'
- require 'parser/source/map/objc_kwarg'
+ require_relative 'parser/source/rewriter'
+ require_relative 'parser/source/rewriter/action'
+ require_relative 'parser/source/tree_rewriter'
+ require_relative 'parser/source/tree_rewriter/action'
+
+ require_relative 'parser/source/map'
+ require_relative 'parser/source/map/operator'
+ require_relative 'parser/source/map/collection'
+ require_relative 'parser/source/map/constant'
+ require_relative 'parser/source/map/variable'
+ require_relative 'parser/source/map/keyword'
+ require_relative 'parser/source/map/definition'
+ require_relative 'parser/source/map/method_definition'
+ require_relative 'parser/source/map/send'
+ require_relative 'parser/source/map/index'
+ require_relative 'parser/source/map/condition'
+ require_relative 'parser/source/map/ternary'
+ require_relative 'parser/source/map/for'
+ require_relative 'parser/source/map/rescue_body'
+ require_relative 'parser/source/map/heredoc'
+ require_relative 'parser/source/map/objc_kwarg'
@@ -60,4 +60,5 @@
- require 'parser/syntax_error'
- require 'parser/clobbering_error'
- require 'parser/diagnostic'
- require 'parser/diagnostic/engine'
+ require_relative 'parser/syntax_error'
+ require_relative 'parser/clobbering_error'
+ require_relative 'parser/unknown_encoding_in_magic_comment_error'
+ require_relative 'parser/diagnostic'
+ require_relative 'parser/diagnostic/engine'
@@ -65 +66 @@
- require 'parser/static_environment'
+ require_relative 'parser/static_environment'
@@ -68 +69 @@
- require 'parser/lexer-F0'
+ require_relative 'parser/lexer-F0'
@@ -70 +71 @@
- require 'parser/lexer-F1'
+ require_relative 'parser/lexer-F1'
@@ -72,4 +73,4 @@
- require 'parser/lexer-strings'
- require 'parser/lexer/literal'
- require 'parser/lexer/stack_state'
- require 'parser/lexer/dedenter'
+ require_relative 'parser/lexer-strings'
+ require_relative 'parser/lexer/literal'
+ require_relative 'parser/lexer/stack_state'
+ require_relative 'parser/lexer/dedenter'
@@ -78 +79 @@
- require 'parser/builders/default'
+ require_relative 'parser/builders/default'
@@ -81,4 +82,4 @@
- require 'parser/context'
- require 'parser/max_numparam_stack'
- require 'parser/current_arg_stack'
- require 'parser/variables_stack'
+ require_relative 'parser/context'
+ require_relative 'parser/max_numparam_stack'
+ require_relative 'parser/current_arg_stack'
+ require_relative 'parser/variables_stack'
@@ -86 +87 @@
- require 'parser/base'
+ require_relative 'parser/base'
@@ -88,2 +89,2 @@
- require 'parser/rewriter'
- require 'parser/tree_rewriter'
+ require_relative 'parser/rewriter'
+ require_relative 'parser/tree_rewriter'
lib/parser/all.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/all.rb 2024-04-29 02:51:53.629508462 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/all.rb 2024-04-29 02:51:53.773508472 +0000
@@ -3,15 +3,15 @@
-require 'parser/ruby18'
-require 'parser/ruby19'
-require 'parser/ruby20'
-require 'parser/ruby21'
-require 'parser/ruby22'
-require 'parser/ruby23'
-require 'parser/ruby24'
-require 'parser/ruby25'
-require 'parser/ruby26'
-require 'parser/ruby27'
-require 'parser/ruby30'
-require 'parser/ruby31'
-require 'parser/ruby32'
-require 'parser/ruby33'
-require 'parser/ruby34'
+require_relative 'ruby18'
+require_relative 'ruby19'
+require_relative 'ruby20'
+require_relative 'ruby21'
+require_relative 'ruby22'
+require_relative 'ruby23'
+require_relative 'ruby24'
+require_relative 'ruby25'
+require_relative 'ruby26'
+require_relative 'ruby27'
+require_relative 'ruby30'
+require_relative 'ruby31'
+require_relative 'ruby32'
+require_relative 'ruby33'
+require_relative 'ruby34'
lib/parser/ast/processor.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ast/processor.rb 2024-04-29 02:51:53.629508462 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ast/processor.rb 2024-04-29 02:51:53.777508473 +0000
@@ -9 +9,3 @@
- class Processor < ::AST::Processor
+ class Processor
+ include ::AST::Processor::Mixin
+
lib/parser/current.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/current.rb 2024-04-29 02:51:53.633508463 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/current.rb 2024-04-29 02:51:53.777508473 +0000
@@ -20 +20 @@
- require 'parser/ruby20'
+ require_relative 'ruby20'
@@ -29 +29 @@
- require 'parser/ruby21'
+ require_relative 'ruby21'
@@ -38 +38 @@
- require 'parser/ruby22'
+ require_relative 'ruby22'
@@ -47 +47 @@
- require 'parser/ruby23'
+ require_relative 'ruby23'
@@ -56 +56 @@
- require 'parser/ruby24'
+ require_relative 'ruby24'
@@ -65 +65 @@
- require 'parser/ruby25'
+ require_relative 'ruby25'
@@ -74 +74 @@
- require 'parser/ruby26'
+ require_relative 'ruby26'
@@ -83 +83 @@
- require 'parser/ruby27'
+ require_relative 'ruby27'
@@ -87 +87 @@
- current_version = '3.0.6'
+ current_version = '3.0.7'
@@ -92 +92 @@
- require 'parser/ruby30'
+ require_relative 'ruby30'
@@ -96 +96 @@
- current_version = '3.1.4'
+ current_version = '3.1.5'
@@ -101 +101 @@
- require 'parser/ruby31'
+ require_relative 'ruby31'
@@ -105 +105 @@
- current_version = '3.2.3'
+ current_version = '3.2.4'
@@ -110 +110 @@
- require 'parser/ruby32'
+ require_relative 'ruby32'
@@ -114 +114 @@
- current_version = '3.3.0'
+ current_version = '3.3.1'
@@ -119 +119 @@
- require 'parser/ruby33'
+ require_relative 'ruby33'
@@ -128 +128 @@
- require 'parser/ruby34'
+ require_relative 'ruby34'
@@ -134 +134 @@
- require 'parser/ruby33'
+ require_relative 'ruby33'
lib/parser/macruby.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/macruby.rb 2024-04-29 02:51:53.637508462 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/macruby.rb 2024-04-29 02:51:53.781508473 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby18.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby18.rb 2024-04-29 02:51:53.641508463 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby18.rb 2024-04-29 02:51:53.785508474 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby19.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby19.rb 2024-04-29 02:51:53.641508463 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby19.rb 2024-04-29 02:51:53.785508474 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby20.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby20.rb 2024-04-29 02:51:53.645508464 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby20.rb 2024-04-29 02:51:53.789508474 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby21.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby21.rb 2024-04-29 02:51:53.645508464 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby21.rb 2024-04-29 02:51:53.789508474 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby22.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby22.rb 2024-04-29 02:51:53.649508463 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby22.rb 2024-04-29 02:51:53.793508474 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby23.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby23.rb 2024-04-29 02:51:53.649508463 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby23.rb 2024-04-29 02:51:53.793508474 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby24.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby24.rb 2024-04-29 02:51:53.653508464 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby24.rb 2024-04-29 02:51:53.793508474 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby25.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby25.rb 2024-04-29 02:51:53.653508464 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby25.rb 2024-04-29 02:51:53.797508475 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby26.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby26.rb 2024-04-29 02:51:53.653508464 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby26.rb 2024-04-29 02:51:53.797508475 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby27.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby27.rb 2024-04-29 02:51:53.657508464 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby27.rb 2024-04-29 02:51:53.801508475 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby30.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby30.rb 2024-04-29 02:51:53.661508465 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby30.rb 2024-04-29 02:51:53.801508475 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby31.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby31.rb 2024-04-29 02:51:53.661508465 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby31.rb 2024-04-29 02:51:53.805508476 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby32.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby32.rb 2024-04-29 02:51:53.665508464 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby32.rb 2024-04-29 02:51:53.805508476 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/ruby33.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby33.rb 2024-04-29 02:51:53.665508464 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby33.rb 2024-04-29 02:51:53.809508475 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
@@ -9908 +9908 @@
- @static_env.declared_anonymous_blockarg? && @static_env.parent_has_anonymous_blockarg?
+ @static_env.declared_anonymous_blockarg_in_current_scpe? && @static_env.parent_has_anonymous_blockarg?
@@ -9961 +9961 @@
- @static_env.declared_anonymous_restarg? && @static_env.parent_has_anonymous_restarg?
+ @static_env.declared_anonymous_restarg_in_current_scope? && @static_env.parent_has_anonymous_restarg?
@@ -10980 +10980 @@
-
+
@@ -12495 +12495 @@
- @static_env.declared_anonymous_kwrestarg? && @static_env.parent_has_anonymous_kwrestarg?
+ @static_env.declared_anonymous_kwrestarg_in_current_scope? && @static_env.parent_has_anonymous_kwrestarg?
lib/parser/ruby34.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/ruby34.rb 2024-04-29 02:51:53.669508465 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/ruby34.rb 2024-04-29 02:51:53.813508476 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
@@ -9908 +9908 @@
- @static_env.declared_anonymous_blockarg? && @static_env.parent_has_anonymous_blockarg?
+ @static_env.declared_anonymous_blockarg_in_current_scpe? && @static_env.parent_has_anonymous_blockarg?
@@ -9961 +9961 @@
- @static_env.declared_anonymous_restarg? && @static_env.parent_has_anonymous_restarg?
+ @static_env.declared_anonymous_restarg_in_current_scope? && @static_env.parent_has_anonymous_restarg?
@@ -12495 +12495 @@
- @static_env.declared_anonymous_kwrestarg? && @static_env.parent_has_anonymous_kwrestarg?
+ @static_env.declared_anonymous_kwrestarg_in_current_scope? && @static_env.parent_has_anonymous_kwrestarg?
lib/parser/rubymotion.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/rubymotion.rb 2024-04-29 02:51:53.669508465 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/rubymotion.rb 2024-04-29 02:51:53.813508476 +0000
@@ -11 +11 @@
-require 'parser'
+require_relative '../parser'
lib/parser/runner.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/runner.rb 2024-04-29 02:51:53.669508465 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/runner.rb 2024-04-29 02:51:53.813508476 +0000
@@ -7 +7 @@
-require 'parser'
+require_relative '../parser'
@@ -67 +67 @@
- require 'parser/ruby18'
+ require_relative 'ruby18'
@@ -72 +72 @@
- require 'parser/ruby19'
+ require_relative 'ruby19'
@@ -77 +77 @@
- require 'parser/ruby20'
+ require_relative 'ruby20'
@@ -82 +82 @@
- require 'parser/ruby21'
+ require_relative 'ruby21'
@@ -87 +87 @@
- require 'parser/ruby22'
+ require_relative 'ruby22'
@@ -92 +92 @@
- require 'parser/ruby23'
+ require_relative 'ruby23'
@@ -97 +97 @@
- require 'parser/ruby24'
+ require_relative 'ruby24'
@@ -102 +102 @@
- require 'parser/ruby25'
+ require_relative 'ruby25'
@@ -107 +107 @@
- require 'parser/ruby26'
+ require_relative 'ruby26'
@@ -112 +112 @@
- require 'parser/ruby27'
+ require_relative 'ruby27'
@@ -117 +117 @@
- require 'parser/ruby30'
+ require_relative 'ruby30'
@@ -122 +122 @@
- require 'parser/ruby31'
+ require_relative 'ruby31'
@@ -127 +127 @@
- require 'parser/ruby32'
+ require_relative 'ruby32'
@@ -132 +132 @@
- require 'parser/ruby33'
+ require_relative 'ruby33'
@@ -137 +137 @@
- require 'parser/ruby34'
+ require_relative 'ruby34'
@@ -142 +142 @@
- require 'parser/macruby'
+ require_relative 'macruby'
@@ -147 +147 @@
- require 'parser/rubymotion'
+ require_relative 'rubymotion'
@@ -196 +196 @@
- require 'parser/current'
+ require_relative 'current'
lib/parser/runner/ruby_parse.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/runner/ruby_parse.rb 2024-04-29 02:51:53.669508465 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/runner/ruby_parse.rb 2024-04-29 02:51:53.813508476 +0000
@@ -3,3 +3,3 @@
-require 'parser/runner'
-require 'parser/color'
-require 'parser/lexer/explanation'
+require_relative '../runner'
+require_relative '../color'
+require_relative '../lexer/explanation'
lib/parser/runner/ruby_rewrite.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/runner/ruby_rewrite.rb 2024-04-29 02:51:53.669508465 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/runner/ruby_rewrite.rb 2024-04-29 02:51:53.813508476 +0000
@@ -3 +3 @@
-require 'parser/runner'
+require_relative '../runner'
lib/parser/source/buffer.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/source/buffer.rb 2024-04-29 02:51:53.673508465 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/source/buffer.rb 2024-04-29 02:51:53.813508476 +0000
@@ -48,0 +49 @@
+ # @raise [Parser::UnknownEncodingInMagicComment] if the encoding is not recognized
@@ -69 +70,5 @@
- Encoding.find(result[3] || result[4] || result[6])
+ begin
+ Encoding.find(result[3] || result[4] || result[6])
+ rescue ArgumentError => e
+ raise Parser::UnknownEncodingInMagicComment, e.message
+ end
lib/parser/source/tree_rewriter/action.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/source/tree_rewriter/action.rb 2024-04-29 02:51:53.773508472 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/source/tree_rewriter/action.rb 2024-04-29 02:51:53.817508476 +0000
@@ -9,3 +9,4 @@
- # children are strictly contained by their parent
- # sibblings all disjoint from one another and ordered
- # only actions with replacement==nil may have children
+ #
+ # * Children are strictly contained by their parent
+ # * Siblings are all disjointed from one another and ordered
+ # * Only actions with `replacement == nil` may have children
@@ -63 +64 @@
- # though it typically do not act on that range.
+ # though it typically does not act on that range.
lib/parser/static_environment.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/static_environment.rb 2024-04-29 02:51:53.773508472 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/static_environment.rb 2024-04-29 02:51:53.817508476 +0000
@@ -7,3 +7,9 @@
- ANONYMOUS_BLOCKARG = :ANONYMOUS_BLOCKARG
- ANONYMOUS_RESTARG = :ANONYMOUS_RESTARG
- ANONYMOUS_KWRESTARG = :ANONYMOUS_KWRESTARG
+
+ ANONYMOUS_RESTARG_IN_CURRENT_SCOPE = :ANONYMOUS_RESTARG_IN_CURRENT_SCOPE
+ ANONYMOUS_RESTARG_INHERITED = :ANONYMOUS_RESTARG_INHERITED
+
+ ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE = :ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE
+ ANONYMOUS_KWRESTARG_INHERITED = :ANONYMOUS_KWRESTARG_INHERITED
+
+ ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE = :ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE
+ ANONYMOUS_BLOCKARG_INHERITED = :ANONYMOUS_BLOCKARG_INHERITED
@@ -29,0 +36,9 @@
+ if @variables.delete(ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE)
+ @variables.add(ANONYMOUS_BLOCKARG_INHERITED)
+ end
+ if @variables.delete(ANONYMOUS_RESTARG_IN_CURRENT_SCOPE)
+ @variables.add(ANONYMOUS_RESTARG_INHERITED)
+ end
+ if @variables.delete(ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE)
+ @variables.add(ANONYMOUS_KWRESTARG_INHERITED)
+ end
@@ -49,0 +65,2 @@
+ # Forward args
+
@@ -57,0 +75,2 @@
+ # Anonymous blockarg
+
@@ -59 +78 @@
- declare(ANONYMOUS_BLOCKARG)
+ declare(ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE)
@@ -63 +82,5 @@
- declared?(ANONYMOUS_BLOCKARG)
+ declared?(ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE) || declared?(ANONYMOUS_BLOCKARG_INHERITED)
+ end
+
+ def declared_anonymous_blockarg_in_current_scpe?
+ declared?(ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE)
@@ -67 +90 @@
- @stack.any? { |variables| variables.include?(ANONYMOUS_BLOCKARG) }
+ @stack.any? { |variables| variables.include?(ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE) }
@@ -69,0 +93,2 @@
+ # Anonymous restarg
+
@@ -71 +96 @@
- declare(ANONYMOUS_RESTARG)
+ declare(ANONYMOUS_RESTARG_IN_CURRENT_SCOPE)
@@ -75 +100,5 @@
- declared?(ANONYMOUS_RESTARG)
+ declared?(ANONYMOUS_RESTARG_IN_CURRENT_SCOPE) || declared?(ANONYMOUS_RESTARG_INHERITED)
+ end
+
+ def declared_anonymous_restarg_in_current_scope?
+ declared?(ANONYMOUS_RESTARG_IN_CURRENT_SCOPE)
@@ -79 +108 @@
- @stack.any? { |variables| variables.include?(ANONYMOUS_RESTARG) }
+ @stack.any? { |variables| variables.include?(ANONYMOUS_RESTARG_IN_CURRENT_SCOPE) }
@@ -81,0 +111,2 @@
+ # Anonymous kwresarg
+
@@ -83 +114 @@
- declare(ANONYMOUS_KWRESTARG)
+ declare(ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE)
@@ -87 +118,5 @@
- declared?(ANONYMOUS_KWRESTARG)
+ declared?(ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE) || declared?(ANONYMOUS_KWRESTARG_INHERITED)
+ end
+
+ def declared_anonymous_kwrestarg_in_current_scope?
+ declared?(ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE)
@@ -91 +126 @@
- @stack.any? { |variables| variables.include?(ANONYMOUS_KWRESTARG) }
+ @stack.any? { |variables| variables.include?(ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE) }
lib/parser/version.rb
--- /tmp/d20240429-1899-8d0q8w/parser-3.3.0.5/lib/parser/version.rb 2024-04-29 02:51:53.773508472 +0000
+++ /tmp/d20240429-1899-8d0q8w/parser-3.3.1.0/lib/parser/version.rb 2024-04-29 02:51:53.817508476 +0000
@@ -4 +4 @@
- VERSION = '3.3.0.5'
+ VERSION = '3.3.1.0' |
gem compare rubocop 1.63.0 1.63.4Compared versions: ["1.63.0", "1.63.4"]
DIFFERENT date:
1.63.0: 2024-04-08 00:00:00 UTC
1.63.4: 2024-04-28 00:00:00 UTC
DIFFERENT metadata:
1.63.0: {"homepage_uri"=>"https://rubocop.org/", "changelog_uri"=>"https://github.com/rubocop/rubocop/releases/tag/v1.63.0", "source_code_uri"=>"https://github.com/rubocop/rubocop/", "documentation_uri"=>"https://docs.rubocop.org/rubocop/1.63/", "bug_tracker_uri"=>"https://github.com/rubocop/rubocop/issues", "rubygems_mfa_required"=>"true"}
1.63.4: {"homepage_uri"=>"https://rubocop.org/", "changelog_uri"=>"https://github.com/rubocop/rubocop/releases/tag/v1.63.4", "source_code_uri"=>"https://github.com/rubocop/rubocop/", "documentation_uri"=>"https://docs.rubocop.org/rubocop/1.63/", "bug_tracker_uri"=>"https://github.com/rubocop/rubocop/issues", "rubygems_mfa_required"=>"true"}
DIFFERENT version:
1.63.0: 1.63.0
1.63.4: 1.63.4
DIFFERENT files:
1.63.0->1.63.4:
* Changed:
config/default.yml +0/-1
lib/rubocop/cached_data.rb +11/-3
lib/rubocop/cop/base.rb +3/-1
lib/rubocop/cop/internal_affairs/example_description.rb +1/-1
lib/rubocop/cop/lint/assignment_in_condition.rb +3/-1
lib/rubocop/cop/lint/deprecated_class_methods.rb +1/-1
lib/rubocop/cop/lint/empty_conditional_body.rb +1/-1
lib/rubocop/cop/lint/mixed_case_range.rb +9/-4
lib/rubocop/cop/lint/non_deterministic_require_order.rb +1/-1
lib/rubocop/cop/lint/unreachable_code.rb +4/-2
lib/rubocop/cop/lint/unreachable_loop.rb +8/-2
lib/rubocop/cop/style/arguments_forwarding.rb +2/-1
lib/rubocop/cop/style/eval_with_location.rb +1/-1
lib/rubocop/cop/style/map_into_array.rb +2/-2
lib/rubocop/cop/style/redundant_line_continuation.rb +3/-1
lib/rubocop/cop/style/require_order.rb +1/-1
lib/rubocop/cop/style/send.rb +4/-4
lib/rubocop/cop/style/top_level_method_definition.rb +1/-1
lib/rubocop/lockfile.rb +25/-6
(!) New permissions: 100644 -> 100755
(!) File is now executable!
lib/rubocop/lsp/routes.rb +1/-3
lib/rubocop/lsp/server.rb +2/-0
lib/rubocop/options.rb +3/-3
lib/rubocop/runner.rb +5/-4
lib/rubocop/version.rb +4/-4 |
gem compare --diff rubocop 1.63.0 1.63.4Compared versions: ["1.63.0", "1.63.4"]
DIFFERENT files:
1.63.0->1.63.4:
* Changed:
(!) New permissions: 100644 -> 100755
(!) File is now executable!
config/default.yml
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/config/default.yml 2024-04-29 02:52:01.105506986 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/config/default.yml 2024-04-29 02:52:01.277506930 +0000
@@ -1706 +1705,0 @@
- - debug/open_nonstop
lib/rubocop/cached_data.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cached_data.rb 2024-04-29 02:52:01.105506986 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cached_data.rb 2024-04-29 02:52:01.277506930 +0000
@@ -51,3 +51 @@
- location = Parser::Source::Range.new(source_buffer,
- o['location']['begin_pos'],
- o['location']['end_pos'])
+ location = location_from_source_buffer(o, source_buffer)
@@ -54,0 +53,10 @@
+ end
+ end
+
+ def location_from_source_buffer(offense, source_buffer)
+ begin_pos = offense['location']['begin_pos']
+ end_pos = offense['location']['end_pos']
+ if begin_pos.zero? && end_pos.zero?
+ Cop::Offense::NO_LOCATION
+ else
+ Parser::Source::Range.new(source_buffer, begin_pos, end_pos)
lib/rubocop/cop/base.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/base.rb 2024-04-29 02:52:01.113506983 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/base.rb 2024-04-29 02:52:01.281506929 +0000
@@ -189 +189,3 @@
- current_offenses << Offense.new(severity, Offense::NO_LOCATION, message, name, :unsupported)
+ range = Offense::NO_LOCATION
+ status = enabled_line?(range.line) ? :unsupported : :disabled
+ current_offenses << Offense.new(severity, range, message, name, status)
lib/rubocop/cop/internal_affairs/example_description.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/internal_affairs/example_description.rb 2024-04-29 02:52:01.117506981 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/internal_affairs/example_description.rb 2024-04-29 02:52:01.349506907 +0000
@@ -49 +49 @@
- /\Aaccepts\b/ => 'registers'
+ /\A(accepts|register)\b/ => 'registers'
lib/rubocop/cop/lint/assignment_in_condition.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/lint/assignment_in_condition.rb 2024-04-29 02:52:01.137506975 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/lint/assignment_in_condition.rb 2024-04-29 02:52:01.405506888 +0000
@@ -91 +91,3 @@
- empty_condition?(asgn_node) || (safe_assignment_allowed? && safe_assignment?(asgn_node))
+ (asgn_node.call_type? && !asgn_node.assignment_method?) ||
+ empty_condition?(asgn_node) ||
+ (safe_assignment_allowed? && safe_assignment?(asgn_node))
lib/rubocop/cop/lint/deprecated_class_methods.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/lint/deprecated_class_methods.rb 2024-04-29 02:52:01.137506975 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/lint/deprecated_class_methods.rb 2024-04-29 02:52:01.405506888 +0000
@@ -55 +55 @@
- (send (const {cbase nil?} {:ENV}) {:clone :dup :freeze})
+ (send (const {cbase nil?} :ENV) {:clone :dup :freeze})
lib/rubocop/cop/lint/empty_conditional_body.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/lint/empty_conditional_body.rb 2024-04-29 02:52:01.141506974 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/lint/empty_conditional_body.rb 2024-04-29 02:52:01.409506887 +0000
@@ -149 +149 @@
- node.source_range.with(end_pos: if_node.loc.end.end_pos)
+ node.source_range.join(if_node.loc.end.end)
lib/rubocop/cop/lint/mixed_case_range.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/lint/mixed_case_range.rb 2024-04-29 02:52:01.145506972 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/lint/mixed_case_range.rb 2024-04-29 02:52:01.413506886 +0000
@@ -49,0 +50,2 @@
+ next unless (replacement = regexp_range(loc.source))
+
@@ -51 +53 @@
- corrector.replace(loc, rewrite_regexp_range(loc.source))
+ corrector.replace(loc, replacement)
@@ -102 +104 @@
- def rewrite_regexp_range(source)
+ def regexp_range(source)
@@ -104,2 +106,5 @@
- first = [open, range_for(open).end]
- second = [range_for(close).begin, close]
+ return unless (open_range = range_for(open))
+ return unless (close_range = range_for(close))
+
+ first = [open, open_range.end]
+ second = [close_range.begin, close]
lib/rubocop/cop/lint/non_deterministic_require_order.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/lint/non_deterministic_require_order.rb 2024-04-29 02:52:01.145506972 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/lint/non_deterministic_require_order.rb 2024-04-29 02:52:01.413506886 +0000
@@ -133 +133 @@
- node.last_argument.source_range.with(begin_pos: node.arguments[-2].source_range.end_pos)
+ node.last_argument.source_range.join(node.arguments[-2].source_range.end)
lib/rubocop/cop/lint/unreachable_code.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/lint/unreachable_code.rb 2024-04-29 02:52:01.153506969 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/lint/unreachable_code.rb 2024-04-29 02:52:01.421506883 +0000
@@ -74 +74 @@
- when :case
+ when :case, :case_match
@@ -92 +92,3 @@
- node.when_branches.all? { |branch| branch.body && flow_expression?(branch.body) }
+ branches = node.case_type? ? node.when_branches : node.in_pattern_branches
+
+ branches.all? { |branch| branch.body && flow_expression?(branch.body) }
lib/rubocop/cop/lint/unreachable_loop.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/lint/unreachable_loop.rb 2024-04-29 02:52:01.153506969 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/lint/unreachable_loop.rb 2024-04-29 02:52:01.421506883 +0000
@@ -163 +163 @@
- when :case
+ when :case, :case_match
@@ -181 +181,7 @@
- node.when_branches.all? { |branch| branch.body && break_statement?(branch.body) }
+ branches = if node.case_type?
+ node.when_branches
+ else
+ node.in_pattern_branches
+ end
+
+ branches.all? { |branch| branch.body && break_statement?(branch.body) }
lib/rubocop/cop/style/arguments_forwarding.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/style/arguments_forwarding.rb 2024-04-29 02:52:01.221506947 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/style/arguments_forwarding.rb 2024-04-29 02:52:01.437506878 +0000
@@ -315 +315,2 @@
- return if target_ruby_version <= 3.0 || block_arg.source == '&' || explicit_block_name?
+ return if target_ruby_version <= 3.0 ||
+ block_arg.nil? || block_arg.source == '&' || explicit_block_name?
lib/rubocop/cop/style/eval_with_location.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/style/eval_with_location.rb 2024-04-29 02:52:01.229506945 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/style/eval_with_location.rb 2024-04-29 02:52:01.445506875 +0000
@@ -144 +144 @@
- return true if special_file_keyword?(file_node)
+ return if special_file_keyword?(file_node)
lib/rubocop/cop/style/map_into_array.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/style/map_into_array.rb 2024-04-29 02:52:01.237506943 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/style/map_into_array.rb 2024-04-29 02:52:01.453506873 +0000
@@ -23,2 +23,2 @@
- # @dest = []
- # src.each { |e| @dest << e * 2 } # `src` method may mutate `@dest`
+ # ret = []
+ # src.each { |e| ret << e * 2 } # `<<` method may mutate `ret`
lib/rubocop/cop/style/redundant_line_continuation.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/style/redundant_line_continuation.rb 2024-04-29 02:52:01.249506939 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/style/redundant_line_continuation.rb 2024-04-29 02:52:01.465506868 +0000
@@ -140 +140,3 @@
- current_token.type == :tIDENTIFIER && ARGUMENT_TYPES.include?(next_token.type)
+ return false if current_token.type != :tIDENTIFIER && current_token.type != :kRETURN
+
+ ARGUMENT_TYPES.include?(next_token.type)
lib/rubocop/cop/style/require_order.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/style/require_order.rb 2024-04-29 02:52:01.253506937 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/style/require_order.rb 2024-04-29 02:52:01.465506868 +0000
@@ -134 +134 @@
- !node1.source_range.with(end_pos: node2.source_range.end_pos).source.include?("\n\n")
+ !node1.source_range.join(node2.source_range.end).source.include?("\n\n")
lib/rubocop/cop/style/send.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/style/send.rb 2024-04-29 02:52:01.253506937 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/style/send.rb 2024-04-29 02:52:01.469506867 +0000
@@ -10,2 +10,2 @@
- # Foo.send(:bar)
- # quuz.send(:fred)
+ # Foo.send(bar)
+ # quuz.send(fred)
@@ -14,2 +14,2 @@
- # Foo.__send__(:bar)
- # quuz.public_send(:fred)
+ # Foo.__send__(bar)
+ # quuz.public_send(fred)
lib/rubocop/cop/style/top_level_method_definition.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/cop/style/top_level_method_definition.rb 2024-04-29 02:52:01.257506936 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/cop/style/top_level_method_definition.rb 2024-04-29 02:52:01.473506866 +0000
@@ -80 +80 @@
- ({block numblock} (send _ {:define_method} _) ...)
+ ({block numblock} (send _ :define_method _) ...)
lib/rubocop/lockfile.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/lockfile.rb 2024-04-29 02:52:01.265506933 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/lockfile.rb 2024-04-29 02:52:01.481506864 +0000
@@ -2,0 +3,8 @@
+begin
+ # We might not be running with `bundle exec`, so we need to pull in Bundler ourselves,
+ # in order to use `Bundler::LockfileParser`.
+ require 'bundler'
+rescue LoadError
+ nil
+end
+
@@ -10 +18,5 @@
- lockfile_path ||= defined?(Bundler) ? Bundler.default_lockfile : nil
+ lockfile_path ||= begin
+ ::Bundler.default_lockfile if bundler_lock_parser_defined?
+ rescue ::Bundler::GemfileNotFound
+ nil # We might not be a folder with a Gemfile, but that's okay.
+ end
@@ -62 +73,0 @@
- return unless @lockfile_path
@@ -64,4 +75,12 @@
- lockfile = Bundler.read_file(@lockfile_path)
- @parser = lockfile ? Bundler::LockfileParser.new(lockfile) : nil
- rescue Bundler::BundlerError
- nil
+ @parser = if @lockfile_path && bundler_lock_parser_defined?
+ begin
+ lockfile = ::Bundler.read_file(@lockfile_path)
+ ::Bundler::LockfileParser.new(lockfile) if lockfile
+ rescue ::Bundler::BundlerError
+ nil
+ end
+ end
+ end
+
+ def bundler_lock_parser_defined?
+ Object.const_defined?(:Bundler) && Bundler.const_defined?(:LockfileParser)
lib/rubocop/lsp/routes.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/lsp/routes.rb 2024-04-29 02:52:01.265506933 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/lsp/routes.rb 2024-04-29 02:52:01.481506864 +0000
@@ -76,3 +76 @@
- doc = request[:params][:textDocument]
- result = diagnostic(doc[:uri], doc[:text])
- @server.write(result)
+ # no-op, diagnostics are handled in textDocument/didChange
lib/rubocop/lsp/server.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/lsp/server.rb 2024-04-29 02:52:01.269506932 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/lsp/server.rb 2024-04-29 02:52:01.481506864 +0000
@@ -23,0 +24,2 @@
+ $PROGRAM_NAME = "rubocop --lsp #{ConfigFinder.project_root}"
+
lib/rubocop/options.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/options.rb 2024-04-29 02:52:01.269506932 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/options.rb 2024-04-29 02:52:01.481506864 +0000
@@ -576 +576 @@
- 'the specified --fail-level or above'],
+ 'the specified --fail-level or above.'],
@@ -639,2 +639,2 @@
- profile: 'Profile rubocop',
- memory: 'Profile rubocop memory usage'
+ profile: 'Profile rubocop.',
+ memory: 'Profile rubocop memory usage.'
lib/rubocop/runner.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/runner.rb 2024-04-29 02:52:01.269506932 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/runner.rb 2024-04-29 02:52:01.485506862 +0000
@@ -23,4 +23,5 @@
- message += ' Hint: Please update to the latest RuboCop version if not already in use,'
- message += ' and report a bug if the issue still occurs on this version.'
- message += ' Please check the latest version at https://rubygems.org/gems/rubocop'
- super(message)
+ message += "\n"
+ hint = 'Hint: Please update to the latest RuboCop version if not already in use, ' \
+ "and report a bug if the issue still occurs on this version.\n" \
+ 'Please check the latest version at https://rubygems.org/gems/rubocop.'
+ super(Rainbow(message).red + Rainbow(hint).yellow)
lib/rubocop/version.rb
--- /tmp/d20240429-2848-lb8ht1/rubocop-1.63.0/lib/rubocop/version.rb 2024-04-29 02:52:01.273506931 +0000
+++ /tmp/d20240429-2848-lb8ht1/rubocop-1.63.4/lib/rubocop/version.rb 2024-04-29 02:52:01.489506861 +0000
@@ -6 +6 @@
- STRING = '1.63.0'
+ STRING = '1.63.4'
@@ -45,3 +45,3 @@
- yaml = YAML.safe_load(
- File.read(config_path), permitted_classes: [Regexp, Symbol], aliases: true
- )
+ yaml = Util.silence_warnings do
+ ConfigLoader.load_yaml_configuration(config_path)
+ end |
|
Superseded by #628. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps rubocop from 1.63.0 to 1.63.4.
Release notes
Sourced from rubocop's releases.
... (truncated)
Changelog
Sourced from rubocop's changelog.
Commits
941d21bCut 1.63.4feb6022Update Changelog81adab5Fix an error forrubocop -Vwhen.rubocop.ymlcontains ERB02aebffMerge pull request #12866 from amomchilov/rescue-GemfileNotFounda8ef19cMerge pull request #12867 from koic/fix_false_positive_for_style_redundant_li...45bbf67[Fix #12865]require 'bundler'if possible, but…2821564[Fix #12862] Fix a false positive forStyle/RedundantLineContinuation84877a3Merge pull request #12664 from muxcmux/master5f4bbaaMerge pull request #12863 from Uaitt/cli-options-missing-periods9e4bc4aAdd missing periods on CLI options descriptionsDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)