ruby-next-core 0.10.0 → 0.10.5

data/lib/ruby-next/language/rewriters/right_hand_assignment.rb

@@ -11,34 +11,106 @@ module RubyNext
         def on_rasgn(node)
           context.track! self
 
+          node = super(node)
+
           val_node, asgn_node = *node
 
           remove(val_node.loc.expression.end.join(asgn_node.loc.expression))
           insert_before(val_node.loc.expression, "#{asgn_node.loc.expression.source} = ")
 
-          process(
-            asgn_node.updated(
-              nil,
-              asgn_node.children + [val_node]
-            )
+          asgn_node.updated(
+            nil,
+            asgn_node.children + [val_node]
           )
         end
 
+        def on_vasgn(node)
+          return super(node) unless rightward?(node)
+
+          context.track! self
+
+          name, val_node = *node
+
+          remove(val_node.loc.expression.end.join(node.loc.name))
+          insert_before(val_node.loc.expression, "#{name} = ")
+
+          super(node)
+        end
+
+        def on_casgn(node)
+          return super(node) unless rightward?(node)
+
+          context.track! self
+
+          scope_node, name, val_node = *node
+
+          if scope_node
+            scope = scope_node.type == :cbase ? scope_node.loc.expression.source : "#{scope_node.loc.expression.source}::"
+            name = "#{scope}#{name}"
+          end
+
+          remove(val_node.loc.expression.end.join(node.loc.name))
+          insert_before(val_node.loc.expression, "#{name} = ")
+
+          super(node)
+        end
+
         def on_mrasgn(node)
           context.track! self
 
+          node = super(node)
+
           lhs, rhs = *node
 
           replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
           insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
 
-          process(
-            node.updated(
-              :masgn,
-              [rhs, lhs]
-            )
+          node.updated(
+            :masgn,
+            [rhs, lhs]
+          )
+        end
+
+        def on_masgn(node)
+          return super(node) unless rightward?(node)
+
+          context.track! self
+
+          rhs, lhs = *node
+
+          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
+          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
+
+          node = super(node)
+
+          lhs, rhs = *node
+
+          node.updated(
+            nil,
+            [
+              lhs,
+              s(:begin, rhs)
+            ]
           )
         end
+
+        private
+
+        def rightward?(node)
+          # Location could be empty for node built by rewriters
+          return false unless node.loc&.operator
+
+          assignee_loc =
+            if node.type == :masgn
+              node.children[0].loc.expression
+            else
+              node.loc.name
+            end
+
+          return false unless assignee_loc
+
+          assignee_loc.begin_pos > node.loc.operator.end_pos
+        end
       end
     end
   end

data/lib/ruby-next/language/rewriters/safe_navigation.rb

@@ -15,13 +15,14 @@ module RubyNext
 
           receiver, *args = *node
 
-          new_node = node.updated(
-            :and,
-            [
-              process(safe_navigation(receiver)),
-              s(:send, decsendize(receiver), *args)
-            ]
-          )
+          new_node = s(:begin,
+            node.updated(
+              :and,
+              [
+                process(safe_navigation(receiver)),
+                s(:send, decsendize(receiver), *args)
+              ]
+            ))
 
           replace(node.loc.expression, new_node)
 
@@ -33,13 +34,14 @@ module RubyNext
 
           context.track!(self)
 
-          new_node = super(node.updated(
-            :and,
-            [
-              process(safe_navigation(node.children[0].children[0])),
-              process(node.updated(nil, node.children.map(&method(:decsendize))))
-            ]
-          ))
+          new_node = s(:begin,
+            super(node.updated(
+              :and,
+              [
+                process(safe_navigation(node.children[0].children[0])),
+                process(node.updated(nil, node.children.map(&method(:decsendize))))
+              ]
+            )))
 
           replace(node.loc.expression, new_node)
 
@@ -51,13 +53,14 @@ module RubyNext
 
           context.track!(self)
 
-          new_node = super(node.updated(
-            :and,
-            [
-              process(safe_navigation(node.children[0].children[0])),
-              process(node.updated(nil, node.children.map(&method(:decsendize))))
-            ]
-          ))
+          new_node = s(:begin,
+            super(node.updated(
+              :and,
+              [
+                process(safe_navigation(node.children[0].children[0])),
+                process(node.updated(nil, node.children.map(&method(:decsendize))))
+              ]
+            )))
 
           replace(node.loc.expression, new_node)
 
@@ -75,11 +78,12 @@ module RubyNext
         # Transform: x&.y -> (!x.nil? && x.y) || nil
         # This allows us to handle `false&.to_s == "false"`
         def safe_navigation(node)
-          s(:or,
-            s(:send,
-              s(:send, node, :nil?),
-              :!),
-            s(:nil))
+          s(:begin,
+            s(:or,
+              s(:send,
+                s(:send, node, :nil?),
+                :!),
+              s(:nil)))
         end
       end
     end

data/lib/ruby-next/rubocop.rb

@@ -117,5 +117,81 @@ module RuboCop
         end
       end
     end
+
+    module Layout
+      require "rubocop/cop/layout/assignment_indentation"
+      AssignmentIndentation.prepend(Module.new do
+        POTENTIAL_RIGHT_TYPES = %i[ivasgn lvasgn cvasgn gvasgn casgn masgn].freeze
+
+        def check_assignment(node, *)
+          return if rightward?(node)
+          super
+        end
+
+        private
+
+        def rightward?(node)
+          return unless POTENTIAL_RIGHT_TYPES.include?(node.type)
+
+          return unless node.loc.operator
+
+          assignee_loc =
+            if node.type == :masgn
+              node.children[0].loc.expression
+            else
+              node.loc.name
+            end
+
+          return false unless assignee_loc
+
+          assignee_loc.begin_pos > node.loc.operator.end_pos
+        end
+      end)
+
+      require "rubocop/cop/layout/empty_line_between_defs"
+      EmptyLineBetweenDefs.prepend(Module.new do
+        def def_end(node)
+          return super unless node.loc.end.nil?
+
+          node.loc.expression.line
+        end
+      end)
+    end
+
+    module Style
+      require "rubocop/cop/style/single_line_methods"
+      SingleLineMethods.prepend(Module.new do
+        def on_def(node)
+          return if node.loc.end.nil?
+          super
+        end
+
+        def on_defs(node)
+          return if node.loc.end.nil?
+          super
+        end
+      end)
+
+      require "rubocop/cop/style/def_with_parentheses"
+      DefWithParentheses.prepend(Module.new do
+        def on_def(node)
+          return if node.loc.end.nil?
+          super
+        end
+
+        def on_defs(node)
+          return if node.loc.end.nil?
+          super
+        end
+      end)
+
+      require "rubocop/cop/style/trailing_method_end_statement"
+      TrailingMethodEndStatement.prepend(Module.new do
+        def on_def(node)
+          return if node.loc.end.nil?
+          super
+        end
+      end)
+    end
   end
 end

data/lib/ruby-next/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyNext
-  VERSION = "0.10.0"
+  VERSION = "0.10.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-core
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.5
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.0
+        version: 3.0.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.0
+        version: 3.0.0.1
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: "\n    Ruby Next Core is a zero deps version of Ruby Next meant to be
   used\n    as as dependency in your gems.\n\n    It contains all the polyfills and
   utility files but doesn't require transpiler\n    dependencies to be install.\n
@@ -53,6 +59,7 @@ files:
 - LICENSE.txt
 - README.md
 - bin/parse
+- bin/reparse
 - bin/ruby-next
 - bin/transform
 - lib/.rbnext/2.3/ruby-next/commands/core_ext.rb
@@ -61,6 +68,7 @@ files:
 - lib/.rbnext/2.3/ruby-next/language/rewriters/base.rb
 - lib/.rbnext/2.3/ruby-next/language/rewriters/endless_range.rb
 - lib/.rbnext/2.3/ruby-next/language/rewriters/pattern_matching.rb
+- lib/.rbnext/2.3/ruby-next/language/rewriters/right_hand_assignment.rb
 - lib/.rbnext/2.3/ruby-next/utils.rb
 - lib/ruby-next.rb
 - lib/ruby-next/cli.rb