synvert-core 1.2.1 → 1.4.0

data/lib/synvert/core/rewriter/action/remove_action.rb

@@ -6,8 +6,11 @@ module Synvert::Core
     # Initialize a RemoveAction.
     #
     # @param instance [Synvert::Core::Rewriter::RemoveAction]
-    def initialize(instance)
+    # @param options [Hash] options.
+    # @option and_comma [Boolean] delete extra comma.
+    def initialize(instance, and_comma: false)
       super(instance, nil)
+      @and_comma = and_comma
     end
 
     # The rewritten code, always empty string.
@@ -27,7 +30,7 @@ module Synvert::Core
         @begin_pos = @node.loc.expression.begin_pos
         @end_pos = @node.loc.expression.end_pos
         squeeze_spaces
-        remove_comma
+        remove_comma if @and_command
       end
     end
 

data/lib/synvert/core/rewriter/instance.rb

@@ -333,8 +333,10 @@ module Synvert::Core
     #   with_node type: 'send', message: { in: %w[puts p] } do
     #     remove
     #   end
-    def remove
-      @actions << Rewriter::RemoveAction.new(self).process
+    # @param options [Hash] options.
+    # @option and_comma [Boolean] delete extra comma.
+    def remove(**options)
+      @actions << Rewriter::RemoveAction.new(self, **options).process
     end
 
     # Parse +delete+ dsl, it creates a {Synvert::Core::Rewriter::DeleteAction} to delete child nodes.
@@ -346,8 +348,10 @@ module Synvert::Core
     #     delete :receiver, :dot
     #   end
     # @param selectors [Array<Symbol>] selector names of child node.
-    def delete(*selectors)
-      @actions << Rewriter::DeleteAction.new(self, *selectors).process
+    # @param options [Hash]
+    # @option and_comma [Boolean] delete extra comma.
+    def delete(*selectors, **options)
+      @actions << Rewriter::DeleteAction.new(self, *selectors, **options).process
     end
 
     # Parse +wrap+ dsl, it creates a {Synvert::Core::Rewriter::WrapAction} to

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.2.1'
+    VERSION = '1.4.0'
   end
 end

data/spec/synvert/core/node_query/lexer_spec.rb

@@ -29,7 +29,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "create"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -42,7 +42,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "receiver"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tNIL, nil],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -55,7 +55,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSTRING, "create"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -68,7 +68,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSTRING, "[]"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -81,7 +81,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -93,7 +93,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -106,7 +106,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tFLOAT, 1.1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -119,7 +119,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tBOOLEAN, true],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -132,7 +132,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "create!"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -145,7 +145,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "empty?"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -158,7 +158,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "<"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -169,7 +169,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "="],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -180,7 +180,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, ">"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -193,7 +193,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments.first"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSTRING, ""],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -206,7 +206,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "[]"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -219,7 +219,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :[]=],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -232,7 +232,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tIDENTIFIER_VALUE, "nil?"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -245,7 +245,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "pair"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "key"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tOPEN_DYNAMIC_ATTRIBUTE, "{{"],
           [:tDYNAMIC_ATTRIBUTE, "value"],
           [:tCLOSE_DYNAMIC_ATTRIBUTE, "}}"],
@@ -265,11 +265,11 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "receiver"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tCLOSE_ATTRIBUTE, "]"]
@@ -287,20 +287,20 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "size"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tINTEGER, 2],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "first"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tNODE_TYPE, "str"],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "last"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tNODE_TYPE, "str"],
           [:tCLOSE_ATTRIBUTE, "]"],
           [:tCLOSE_ATTRIBUTE, "]"]
@@ -316,7 +316,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tNOT_EQUAL, "!="],
+          [:tOPERATOR, "!="],
           [:tIDENTIFIER_VALUE, "create"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -328,7 +328,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tGREATER_THAN, ">"],
+          [:tOPERATOR, ">"],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -340,7 +340,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tLESS_THAN, "<"],
+          [:tOPERATOR, "<"],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -352,7 +352,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tGREATER_THAN_OR_EQUAL, ">="],
+          [:tOPERATOR, ">="],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -364,7 +364,7 @@ module Synvert::Core::NodeQuery
         expected_tokens = [
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "value"],
-          [:tLESS_THAN_OR_EQUAL, "<="],
+          [:tOPERATOR, "<="],
           [:tINTEGER, 1],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -377,7 +377,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tMATCH, "=~"],
+          [:tOPERATOR, "=~"],
           [:tREGEXP, /create/i],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -390,7 +390,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tNOT_MATCH, "!~"],
+          [:tOPERATOR, "!~"],
           [:tREGEXP, /create/i],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -403,7 +403,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tOPEN_ARRAY, "("],
           [:tCLOSE_ARRAY, ")"],
           [:tCLOSE_ATTRIBUTE, "]"]
@@ -417,7 +417,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tOPEN_ARRAY, "("],
           [:tSYMBOL, :create],
           [:tCLOSE_ARRAY, ")"],
@@ -432,7 +432,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tNOT_EQUAL, "!="],
+          [:tOPERATOR, "!="],
           [:tOPEN_ARRAY, "("],
           [:tSYMBOL, :create],
           [:tCLOSE_ARRAY, ")"],
@@ -447,7 +447,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tIN, "IN"],
+          [:tOPERATOR, "in"],
           [:tOPEN_ARRAY, "("],
           [:tIDENTIFIER_VALUE, "create"],
           [:tIDENTIFIER_VALUE, "build"],
@@ -463,7 +463,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "message"],
-          [:tNOT_IN, "NOT IN"],
+          [:tOPERATOR, "not_in"],
           [:tOPEN_ARRAY, "("],
           [:tIDENTIFIER_VALUE, "create"],
           [:tIDENTIFIER_VALUE, "build"],
@@ -479,7 +479,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "arguments"],
-          [:tINCLUDES, "INCLUDES"],
+          [:tOPERATOR, "includes"],
           [:tIDENTIFIER_VALUE, "&block"],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -494,7 +494,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "send"],
           [:tOPEN_ATTRIBUTE, "["],
           [:tKEY, "receiver.message"],
-          [:tEQUAL, "="],
+          [:tOPERATOR, "=="],
           [:tSYMBOL, :create],
           [:tCLOSE_ATTRIBUTE, "]"]
         ]
@@ -502,64 +502,6 @@ module Synvert::Core::NodeQuery
       end
     end
 
-    context 'position' do
-      it 'matches :first-child' do
-        source = '.send[arguments=:create]:first-child'
-        expected_tokens = [
-          [:tNODE_TYPE, "send"],
-          [:tOPEN_ATTRIBUTE, "["],
-          [:tKEY, "arguments"],
-          [:tEQUAL, "="],
-          [:tSYMBOL, :create],
-          [:tCLOSE_ATTRIBUTE, "]"],
-          [:tINDEX, 0]
-        ]
-        assert_tokens source, expected_tokens
-      end
-
-      it 'matches :last-child' do
-        source = '.send[arguments=:create]:last-child'
-        expected_tokens = [
-          [:tNODE_TYPE, "send"],
-          [:tOPEN_ATTRIBUTE, "["],
-          [:tKEY, "arguments"],
-          [:tEQUAL, "="],
-          [:tSYMBOL, :create],
-          [:tCLOSE_ATTRIBUTE, "]"],
-          [:tINDEX, -1]
-        ]
-        assert_tokens source, expected_tokens
-      end
-
-      it 'matches :nth-child(1)' do
-        source = '.send[arguments=:create]:nth-child(1)'
-        expected_tokens = [
-          [:tNODE_TYPE, "send"],
-          [:tOPEN_ATTRIBUTE, "["],
-          [:tKEY, "arguments"],
-          [:tEQUAL, "="],
-          [:tSYMBOL, :create],
-          [:tCLOSE_ATTRIBUTE, "]"],
-          [:tINDEX, 0]
-        ]
-        assert_tokens source, expected_tokens
-      end
-
-      it 'matches :nth-last-child(1)' do
-        source = '.send[arguments=:create]:nth-last-child(1)'
-        expected_tokens = [
-          [:tNODE_TYPE, "send"],
-          [:tOPEN_ATTRIBUTE, "["],
-          [:tKEY, "arguments"],
-          [:tEQUAL, "="],
-          [:tSYMBOL, :create],
-          [:tCLOSE_ATTRIBUTE, "]"],
-          [:tINDEX, -1]
-        ]
-        assert_tokens source, expected_tokens
-      end
-    end
-
     context 'descendant' do
       it 'matches' do
         source = '.class .send'
@@ -571,7 +513,7 @@ module Synvert::Core::NodeQuery
     context 'child' do
       it 'matches' do
         source = '.def > .send'
-        expected_tokens = [[:tNODE_TYPE, "def"], [:tCHILD, ">"], [:tNODE_TYPE, "send"]]
+        expected_tokens = [[:tNODE_TYPE, "def"], [:tRELATIONSHIP, ">"], [:tNODE_TYPE, "send"]]
         assert_tokens source, expected_tokens
       end
     end
@@ -579,7 +521,7 @@ module Synvert::Core::NodeQuery
     context 'subsequent sibling' do
       it 'matches' do
         source = '.send ~ .send'
-        expected_tokens = [[:tNODE_TYPE, "send"], [:tSUBSEQUENT_SIBLING, "~"], [:tNODE_TYPE, "send"]]
+        expected_tokens = [[:tNODE_TYPE, "send"], [:tRELATIONSHIP, "~"], [:tNODE_TYPE, "send"]]
         assert_tokens source, expected_tokens
       end
     end
@@ -587,7 +529,7 @@ module Synvert::Core::NodeQuery
     context 'next sibling' do
       it 'matches' do
         source = '.send + .send'
-        expected_tokens = [[:tNODE_TYPE, "send"], [:tNEXT_SIBLING, "+"], [:tNODE_TYPE, "send"]]
+        expected_tokens = [[:tNODE_TYPE, "send"], [:tRELATIONSHIP, "+"], [:tNODE_TYPE, "send"]]
         assert_tokens source, expected_tokens
       end
     end
@@ -599,7 +541,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "class"],
           [:tPSEUDO_CLASS, "has"],
           [:tOPEN_SELECTOR, "("],
-          [:tCHILD, ">"],
+          [:tRELATIONSHIP, ">"],
           [:tNODE_TYPE, "def"],
           [:tCLOSE_SELECTOR, ")"]
         ]
@@ -614,7 +556,7 @@ module Synvert::Core::NodeQuery
           [:tNODE_TYPE, "class"],
           [:tPSEUDO_CLASS, "not_has"],
           [:tOPEN_SELECTOR, "("],
-          [:tCHILD, ">"],
+          [:tRELATIONSHIP, ">"],
           [:tNODE_TYPE, "def"],
           [:tCLOSE_SELECTOR, ")"]
         ]
@@ -624,13 +566,11 @@ module Synvert::Core::NodeQuery
 
     context 'goto_scope' do
       it 'matches' do
-        source = '.block <body> > .def'
+        source = '.block body > .def'
         expected_tokens = [
           [:tNODE_TYPE, "block"],
-          [:tOPEN_GOTO_SCOPE, "<"],
-          [:tIDENTIFIER, "body"],
-          [:tCLOSE_GOTO_SCOPE, ">"],
-          [:tCHILD, ">"],
+          [:tGOTO_SCOPE, "body"],
+          [:tRELATIONSHIP, ">"],
           [:tNODE_TYPE, "def"]
         ]
         assert_tokens source, expected_tokens