sorbet_view 0.17.0 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 330016607634f904162184802a0fb8efa933da90179b192b1e3113a296ccf113
-  data.tar.gz: 1770334f364c5eae2b56ffe15ce222f157cc8eb7c53a94e371f8d4103a91a8fb
+  metadata.gz: 858b6bd700e41b846fc44258e8a702bb8f32f25d952a3c64c1468500619c92f0
+  data.tar.gz: 4bbe6e97e5726844fd6135fcb148d486d01c196e33e4c1ef200f088fb79ed1a0
 SHA512:
-  metadata.gz: f2381a372dc8ebb770e7e73e978a2af499d1e83ea2664a55d4e9657b0a7296118edbaa5150867a72caa667d0121a21a9da153266377f0f93d1d167a0409efefc
-  data.tar.gz: 185f3fed2527ddc2a7011550c0d1a2b7a21872164949ddbd5a74fee9627fa7fc1397e7bf80ba4477e1b20626cbd320c123dc83a5e5a6e6a0848c32f41319538c
+  metadata.gz: 48c1d98ade67fdb02c84c7650c985fe97ba35e38bdd7973fdb2586bfc4cd89e4fd654435cf5d3e9f8d6b07129cf2573ac76b10c4a857db3f919e92333a6b6b79
+  data.tar.gz: fb8bd91ca32e0473c1a533adbf3211d4c75ddbd8283bfc980ac9497c24acb3548efd7007d13d8ae771667753fbaec1951a4215a0cf94592a959c56770288710e

data/lib/sorbet_view/compiler/adapters/erb_adapter.rb

@@ -97,13 +97,14 @@ module SorbetView
           return unless node.respond_to?(:content) && node.content
 
           content_token = node.content
-          code = content_token.value.to_s.strip
+          raw_value = content_token.value.to_s
+          code = raw_value.strip
           return if code.empty?
 
-          # Herb lines are 1-based, we use 0-based
+          # Herb lines are 1-based, we use 0-based; raw content begins right after
+          # the opening tag, so advance past leading whitespace stripped from `code`.
           loc = content_token.location
-          line = loc.start.line - 1
-          column = loc.start.column
+          line, column = advance_past_leading_whitespace(raw_value, loc.start.line - 1, loc.start.column)
 
           tag = node.respond_to?(:tag_opening) ? node.tag_opening.value.to_s : '<%'
           type = case tag
@@ -120,10 +121,12 @@ module SorbetView
           return unless node.respond_to?(:content) && node.content
 
           loc = node.content.location
+          raw_value = node.content.value.to_s
+          line, column = advance_past_leading_whitespace(raw_value, loc.start.line - 1, loc.start.column)
           segments << RubySegment.new(
             code: 'end',
-            line: loc.start.line - 1,
-            column: loc.start.column,
+            line: line,
+            column: column,
             type: :statement
           )
         end
@@ -137,14 +140,16 @@ module SorbetView
           source.scan(INDICATOR_PATTERN) do
             match = T.must(Regexp.last_match)
             indicator = match[1] || ''
-            code = (match[2] || '').strip
+            raw_code = match[2] || ''
+            code = raw_code.strip
             offset = T.must(match.begin(0))
 
             next if code.empty?
 
             line, column = offset_to_line_column(line_offsets, offset)
             tag_prefix_len = 2 + indicator.length
-            code_column = column + tag_prefix_len
+            content_column = column + tag_prefix_len
+            code_line, code_column = advance_past_leading_whitespace(raw_code, line, content_column)
 
             type = case indicator
             when '#' then :comment
@@ -152,7 +157,7 @@ module SorbetView
             else :statement
             end
 
-            segments << RubySegment.new(code: code, line: line, column: code_column, type: type)
+            segments << RubySegment.new(code: code, line: code_line, column: code_column, type: type)
           end
 
           segments
@@ -173,6 +178,23 @@ module SorbetView
           column = offset - (line_offsets[line] || 0)
           [line, column]
         end
+
+        # Returns the (line, column) of the first non-whitespace char in raw_value,
+        # given the position where raw_value begins. Used so that stripping leading
+        # whitespace from ERB content does not desync the segment's start position.
+        sig { params(raw_value: String, line: Integer, column: Integer).returns([Integer, Integer]) }
+        def advance_past_leading_whitespace(raw_value, line, column)
+          leading = raw_value[/\A\s*/] || ''
+          return [line, column] if leading.empty?
+
+          newlines = leading.count("\n")
+          if newlines == 0
+            [line, column + leading.length]
+          else
+            last_nl = T.must(leading.rindex("\n"))
+            [line + newlines, leading.length - last_nl - 1]
+          end
+        end
       end
     end
   end

data/lib/sorbet_view/compiler/ruby_generator.rb

@@ -117,17 +117,19 @@ module SorbetView
 
             lines << "    #{stripped}"
 
-            # Build mapping entry
+            # Build mapping entry — for the first line we already advanced past
+            # leading whitespace in the adapter; for subsequent lines, use the
+            # actual indent of the source line so the template column matches.
             template_start_col = if i == 0
               seg.column
             else
-              0
+              code_line.length - code_line.lstrip.length
             end
 
             mapping_entries << SourceMap::MappingEntry.new(
               template_range: SourceMap::Range.new(
                 start: SourceMap::Position.new(line: seg.line + i, column: template_start_col),
-                end_: SourceMap::Position.new(line: seg.line + i, column: template_start_col + code_line.strip.length)
+                end_: SourceMap::Position.new(line: seg.line + i, column: template_start_col + stripped.length)
               ),
               ruby_range: SourceMap::Range.new(
                 start: SourceMap::Position.new(line: ruby_line, column: 4),

data/lib/sorbet_view/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module SorbetView
-  VERSION = '0.17.0'
+  VERSION = '0.17.2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sorbet_view
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.2
 platform: ruby
 authors:
 - kazuma
 bindir: exe
 cert_chain: []
-date: 2026-04-04 00:00:00.000000000 Z
+date: 2026-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: herb
@@ -118,7 +118,6 @@ files:
 - lib/sorbet_view/source_map/source_map.rb
 - lib/sorbet_view/version.rb
 - lib/tapioca/dsl/compilers/sorbet_view.rb
-- sorbet_view.gemspec
 - vscode/.gitignore
 - vscode/.vscode/launch.json
 - vscode/.vscodeignore

data/sorbet_view.gemspec

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lib/sorbet_view/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'sorbet_view'
-  spec.version = SorbetView::VERSION
-  spec.authors = ['kazuma']
-  spec.summary = 'Sorbet type-checking for Rails view templates'
-  spec.description = 'Extracts Ruby code from view templates (ERB, etc.) for Sorbet type-checking, with LSP support'
-  spec.homepage = 'https://github.com/kazzix14/sorbet_view'
-  spec.license = 'MIT'
-  spec.required_ruby_version = '>= 3.2'
-
-  spec.metadata['rubygems_mfa_required'] = 'true'
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = spec.homepage
-
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w[bin/ test/ spec/ features/ .git .github Gemfile])
-    end
-  end
-  spec.bindir = 'exe'
-  spec.executables = ['sv']
-  spec.require_paths = ['lib']
-
-  spec.add_dependency 'herb'
-  spec.add_dependency 'listen', '~> 3.0'
-  spec.add_dependency 'psych'
-  spec.add_dependency 'sorbet-runtime'
-  spec.add_dependency 'srb_lens', '~> 0.5.1'
-end