prism_ext 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31a1629de1d522e1386ac118d889cc603de8ab381b53cd80d4b0b867d7a3eaf3
-  data.tar.gz: f15b3859b932611dc9d68e7a9d8afd130bfa10fe482632c5b5952d90b2aba05b
+  metadata.gz: 7df9da0b75b3d011611ad94a92d532045d97df11a5d5fd00e6e753b4e35a4a5b
+  data.tar.gz: e9c72ce6abea12442381bdec345170c0ea7fea3796b547ae47bd6cae193f3e3c
 SHA512:
-  metadata.gz: f328951405aee3ba268388b3154a163bcd565c2739a47cba45ad91bfa07b0774dd080b1b36a9db5bbf50f2748342e8d87fb7b4016020ba647379b2ae7c4b6a54
-  data.tar.gz: b49c81171e69e0891615d3df6d61f3ebb9cad37d9702e6c7a6a1d9b4731377deadfacaae925191418460a228ebfcf7849debd6db9f6d530876f85aa442edc247
+  metadata.gz: ab250d2c6f24ab15d30f56e28252ed3263c24f47f4cca9f15ba1759fda589053e5e21d6c61f88c6d484d9bb7c1703b1e25808b1cdf17b5222455dbc406183641
+  data.tar.gz: 9aa4fd52106103ef276308793f1980fa2bc7426443b0cec77ad378d64411c610c7c73ae3e06ed365b73653df9a5a024b4f30f582eb0c0f8c5c7f2b2947b0d1e5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.3.7 (2024-07-06)
+
+* Fix call node with block_argument_node `to_source`
+* Use `character_offset` instead of `offset`
+
 ## 0.3.6 (2024-07-03)
 
 * Check `arguments` is an `ArgumetnsNode`

data/Gemfile

@@ -5,6 +5,9 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in prism_ext.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
+gem "rake"
+gem "rspec"
 
-gem "rspec", "~> 3.0"
+gem 'guard'
+gem 'guard-bundler'
+gem 'guard-rspec'

data/Gemfile.lock

@@ -1,15 +1,52 @@
 PATH
   remote: .
   specs:
-    prism_ext (0.3.6)
+    prism_ext (0.3.7)
       prism
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.3)
     diff-lcs (1.5.0)
+    ffi (1.17.0)
+    ffi (1.17.0-x86_64-darwin)
+    formatador (1.1.0)
+    guard (2.18.1)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.13.0)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-bundler (3.0.1)
+      bundler (>= 2.1, < 3)
+      guard (~> 2.2)
+      guard-compat (~> 1.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.10)
+    method_source (1.1.0)
+    nenv (0.3.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     prism (0.30.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (13.1.0)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -23,15 +60,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
+    shellany (0.0.1)
+    thor (1.3.1)
 
 PLATFORMS
   ruby
   x86_64-darwin-23
 
 DEPENDENCIES
+  guard
+  guard-bundler
+  guard-rspec
   prism_ext!
-  rake (~> 13.0)
-  rspec (~> 3.0)
+  rake
+  rspec
 
 BUNDLED WITH
    2.5.3

data/Guardfile

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { 'spec' }
+end
+
+guard :bundler do
+  require 'guard/bundler'
+  require 'guard/bundler/verify'
+  helper = Guard::Bundler::Verify.new
+
+  files = ['Gemfile']
+  files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
+
+  # Assume files are symlinked from somewhere
+  files.each { |file| watch(helper.real_path(file)) }
+end

data/lib/prism_ext/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PrismExt
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/lib/prism_ext.rb

@@ -84,22 +84,24 @@ module Prism
     end
 
     def to_source
-      # node.slice doesn't work for InterpolatedStringNode
-      if interpolated_string?
-        range = opening_loc.start_offset...closing_loc.end_offset
-      elsif is_a?(CallNode) && arguments.is_a?(ArgumentsNode) && arguments.arguments.any?(&:interpolated_string?)
-        last_interpolated_string_argument = arguments.arguments.select(&:interpolated_string?).last
-        range = location.start_offset...last_interpolated_string_argument.closing_loc.end_offset
-      else
-        range = location.start_offset...location.end_offset
+      case self
+      when InterpolatedStringNode, StringNode
+        if opening.start_with?('<<')
+          range = opening_loc.start_character_offset...closing_loc.end_character_offset
+        end
+      when CallNode
+        if arguments.is_a?(ArgumentsNode) && arguments.arguments.any?(&:interpolated_string?)
+          last_interpolated_string_argument = arguments.arguments.select(&:interpolated_string?).last
+          range = location.start_character_offset...last_interpolated_string_argument.closing_loc.end_character_offset
+        elsif block.is_a?(BlockArgumentNode)
+          range = location.start_character_offset...closing_loc.end_character_offset
+        end
       end
-      location.send(:source).source[range]
+      range ? location.send(:source).source[range] : slice
     end
 
     def interpolated_string?
-      respond_to?(:opening_loc) && respond_to?(:closing_loc) &&
-      opening_loc && closing_loc &&
-      (opening == "<<~#{closing.strip}" || opening == "<<-#{closing.strip}")
+      (is_a?(InterpolatedStringNode) || is_a?(StringNode)) && opening.start_with?('<<')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prism_ext
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
@@ -35,6 +35,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - README.md
 - Rakefile
 - lib/prism_ext.rb