sorbet_view 0.16.1 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90d970f9f128a630593f84d69ad5f1882b382754dbe1066a86881e73b8d02b1e
-  data.tar.gz: efd75504c02a0dcf59621011cf978e648de00157bf317bed2e52565d9d8fb56d
+  metadata.gz: 241f449c7d85bd172dd1f14e69f2dd3c3baf9a2590d932a81437bcb7256697e9
+  data.tar.gz: 486cc137199d7a8e0fbda04baf528f139abd43585870108305ca9ece45f99a6e
 SHA512:
-  metadata.gz: 1053ce748716793362dd0b66296a5710a270fb97e48ef81fc944b3e737078603bcdcc145f6d8f90ea2298df33e389847239505c8d427edf49fb89d4ec01d5b41
-  data.tar.gz: e71fab2eff5ffda2a5acb7e80b479882e3309b82b5bccb5c1e153d08896e2c1bdcd09f9c03800c9249be4fc5b9b558400453a0c69048b71543ce1eee5c2f075e
+  metadata.gz: 78b9b224b0c202d58ab0f707f9333d8972298b11b707e735efd8f8da58eb93b21c24061f5a2b6fc0ea2fb207e2840df83351b6759a4ae8372d84391a390813c7
+  data.tar.gz: faf509cd68a7f7eb35f2e826a3bdc514681afad57e8900ce079269b58ec4d5321d5cba66e1aee7199f8eeb59eec0a58cf97bcc0440e142e351a0ea846f618a22

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/version.rb

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

data/lib/tapioca/dsl/compilers/sorbet_view.rb

@@ -28,6 +28,9 @@ module Tapioca
           @module_cache = T.let({}, T::Hash[String, RBI::Scope])
           @project = T.let(SrbLens::Project.load_or_index(Dir.pwd), T.untyped)
 
+          # Ensure all controllers are loaded
+          Rails.application.eager_load! if defined?(Rails) && Rails.respond_to?(:application)
+
           controllers = ObjectSpace.each_object(Class).select do |klass|
             klass < ::ActionController::Base && !klass.abstract?
           rescue StandardError
@@ -238,27 +241,34 @@ module Tapioca
         sig { params(controller: T.untyped).void }
         def process_controller(controller)
           helper_methods = extract_helper_methods(controller)
-          return if helper_methods.empty?
+          controller_helper_modules = extract_controller_helper_modules(controller)
+          return if helper_methods.empty? && controller_helper_modules.empty?
 
           path = controller.controller_path
           parts = path.split('/').map { |p| camelize(p) }
 
-          # 1) module SorbetView::Helpers::<controller_path> with helper methods
-          helper_module_name = "SorbetView::Helpers::#{parts.join('::')}"
-          create_module_from_path(helper_module_name) do |mod|
-            helper_methods.each do |method_name, params, return_type|
-              mod.create_method(method_name, parameters: params, return_type: return_type)
+          # 1) module SorbetView::Helpers::<controller_path> with helper methods from helper_method macro
+          helper_module_name = nil
+          unless helper_methods.empty?
+            helper_module_name = "SorbetView::Helpers::#{parts.join('::')}"
+            create_module_from_path(helper_module_name) do |mod|
+              helper_methods.each do |method_name, params, return_type|
+                mod.create_method(method_name, parameters: params, return_type: return_type)
+              end
             end
           end
 
-          # 2) Each action's template class includes the helper module
+          # 2) Each action's template class includes the helper module and controller-specific helper modules
           actions = controller.action_methods.to_a
           actions.each do |action_name|
             next unless action_name.match?(/\A[a-zA-Z_][a-zA-Z0-9_]*\z/)
 
             class_name = "SorbetView::Generated::#{parts.join('::')}::#{camelize(action_name)}"
             create_class_from_path(class_name) do |klass|
-              klass.create_include(helper_module_name)
+              klass.create_include(helper_module_name) if helper_module_name
+              controller_helper_modules.each do |mod_name|
+                klass.create_include("::#{mod_name}")
+              end
             end
           end
         end
@@ -285,6 +295,30 @@ module Tapioca
           end
         end
 
+        # Returns controller-specific helper module names (modules included via `helper` that are not in ApplicationController)
+        sig { params(controller: T.untyped).returns(T::Array[String]) }
+        def extract_controller_helper_modules(controller)
+          return [] unless controller.respond_to?(:_helpers)
+
+          base_helpers = if defined?(::ApplicationController) && ::ApplicationController.respond_to?(:_helpers)
+            ::ApplicationController._helpers.ancestors
+          else
+            []
+          end
+
+          controller_helpers = controller._helpers.ancestors
+          specific_modules = controller_helpers - base_helpers
+
+          specific_modules.filter_map do |mod|
+            next unless mod.is_a?(Module) && !mod.is_a?(Class)
+            name = mod.name
+            next if name.nil? || name.empty?
+            next if name.include?('HelperMethods')
+            next if name.start_with?('ActionController::') || name.start_with?('AbstractController::')
+            name
+          end
+        end
+
         sig { params(controller: T.untyped, method_name: String).returns(T.untyped) }
         def find_method_info(controller, method_name)
           methods = @project.find_methods("#{controller.name}##{method_name}")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sorbet_view
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.1
 platform: ruby
 authors:
 - kazuma
 bindir: exe
 cert_chain: []
-date: 2026-04-02 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