Merge pull request #2588 from ruby/fix-locator

soutaro · web-flow · commit 96225dc64459 · 2025-07-06T05:28:12.000Z
Fix locator
diff --git a/lib/rbs/locator.rb b/lib/rbs/locator.rb
@@ -238,7 +238,7 @@ def find_in_loc(pos, location:, array:)
 
     def test_loc(pos, location:)
       if location
-        location.range === pos
+        location.start_pos <= pos && pos <= location.end_pos
       else
         false
       end
diff --git a/sig/locator.rbs b/sig/locator.rbs
@@ -37,8 +37,6 @@ module RBS
     #
     def find2: (line: Integer, column: Integer) -> [Symbol?, Array[component]]?
 
-    private
-
     def find_in_directive: (Integer pos, AST::Directives::t, Array[component]) -> bool
 
     def find_in_decl: (Integer pos, decl: AST::Declarations::t, array: Array[component]) -> bool

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,6 @@ module RBS`
`37`	`37`	`#`
`38`	`38`	`def find2: (line: Integer, column: Integer) -> [Symbol?, Array[component]]?`
`39`	`39`
`40`		`- private`
`41`		`-`
`42`	`40`	`def find_in_directive: (Integer pos, AST::Directives::t, Array[component]) -> bool`
`43`	`41`
`44`	`42`	`def find_in_decl: (Integer pos, decl: AST::Declarations::t, array: Array[component]) -> bool`