solargraph 0.45.0 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99cf1c663bb1a93324ff9c860b82e60d47988a4c48e9c0e977176cb94852f29c
-  data.tar.gz: 9b10324bcf7493f9ed5f8a67a8d47e4f0a379b76ed2aeb31514d1fa06b88dbf6
+  metadata.gz: b0b66abd5cf5a0376d5521532dda16db328592eb38bac6acd84f997b19cb328c
+  data.tar.gz: 51e038df27bae1457393c7ff023c9951b0f8919267678e29aab2e21efeb2b1a8
 SHA512:
-  metadata.gz: a981e45a500d2469972d0fab1e4bcfdbde99dc46de7ef7b377d486a9a027ce617b8806790ed3565a673fbf3d3fd206d246408b5ce744a0b575e02ee3a3a9b699
-  data.tar.gz: 0bcb7a9957581cac9c066076938dbbdcbcc596bf7ddc8f4cd4539d71dadabab68cfdbc18f59df8daedd02dcff8f45b671a0a742c6ec1afbd39ede15fb3db381b
+  metadata.gz: 9b8310748d4754c27fd62763ce1bd8759fc43fc825b1b40353d4537130f2b6143cdb59101da679a8b4a7fb0778430eeac2eccbb845f7a9a5ac11f402b3a71461
+  data.tar.gz: 1b2f79f5396a3c056d0b2acbcb49d6c1385b02a49b33edbe1a3e452a7b451b9b87547b8b8d5974a17e25ea2f5c21db8dd315d2b3d856fb3c7ce2d300a4595c70

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+patreon: castwide

data/.github/workflows/rspec.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.4', '2.5', '2.6', '2.7', '3.0']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
 
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,3 +1,44 @@
+## 0.49.0 - April 9, 2023
+- Better union type handling
+- First version of RBS support
+- Dependency updates
+- Update RuboCop config options
+- RBS core and stdlib mapping
+- Anonymous splats and multisig arity
+- Infinite loop when checking if a class is a superclass (#641)
+
+## 0.48.0 - December 19, 2022
+- Add Sublime Text to README (#604)
+- Map nested constant assignments
+- Handle rest/kwrest modifiers on overload arguments (#601)
+- Make rubocop info severity Severity::HINT (#576)
+- Process non-self singleton classes (#581)
+- Fix nest gemspec dependency (#599)
+- Strip 'file ' prefix from all filenames in RdocToYard (#585)
+- Show why rubocop fails (#605)
+- Link solargraph-rails (#611)
+
+## 0.47.2 - September 30, 2022
+- Fix complex type inference (#578)
+- Off-by-one diagnostic (#595)
+
+## 0.47.1 - September 27, 2022
+- Remove debug code from release (#600)
+
+## 0.47.0 - September 25, 2022
+- Completion candidates for union types (#507)
+- Nullify Hover object instead of contents value (#583)
+- Mapping workspace stuck in 0 (#587)
+- Fix parsing of nested subtypes (#589)
+- Update YARD tags on Pin::Block methods (#588)
+- @!visibility directive support (#566)
+
+## 0.46.0 - August 22, 2022
+- Ignore typecheck errors with @sg-ignore tag (#419)
+- Strict checks report undefined method calls on variables (#553)
+- Infer type from method arguments (#554)
+- Return nil value for empty hover contents (#543)
+
 ## 0.45.0 - May 23, 2022
 - Basic support for RSpec #describe and #it
 - fix: domain can complete private method (#490)

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2019 by Fred Snyder for Castwide Technologies
+Copyright (c) 2017-2023 by Fred Snyder for Castwide Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -32,6 +32,11 @@ Plug-ins and extensions are available for the following editors:
     * Package: https://atom.io/packages/ruby-solargraph
     * GitHub: https://github.com/castwide/atom-solargraph
 
+* **Sublime Text**
+    * Extension: https://packagecontrol.io/packages/LSP
+    * GitHub: https://github.com/sublimelsp/LSP
+    * Instructions: https://lsp.sublimetext.io/language_servers/#solargraph
+
 * **Vim**
     * GitHub: `LanguageClient-neovim`, https://github.com/autozimu/LanguageClient-neovim
     * GitHub: `coc`, https://github.com/neoclide/coc-solargraph
@@ -49,6 +54,9 @@ Plug-ins and extensions are available for the following editors:
 
 Solargraph's behavior can be controlled via optional [configuration](https://solargraph.org/guides/configuration) files. The highest priority file is a `.solargraph.yml` file at the root of the project. If not present, any global configuration at `~/.config/solargraph/config.yml` will apply. The path to the global configuration can be overridden with the `SOLARGRAPH_GLOBAL_CONFIG` environment variable.
 
+### Rails Support
+For better Rails support, please consider using [solargraph-rails](https://github.com/iftheshoefritz/solargraph-rails/)
+
 ### Gem Support
 
 Solargraph is capable of providing code completion and documentation for gems that have YARD documentation. You can make sure your gems are documented by running `yard gems` from the command line. (YARD is included as one of Solargraph's gem dependencies. The first time you run it might take a while if you have a lot of gems installed).

data/SPONSORS.md

@@ -10,8 +10,6 @@ The following people and organizations provide funding or other resources. [Beco
 
 ## Named Sponsors
 
-- Emily Strickland
-- Tom de Grunt
 - Akira Yamada
-- Erlend Finvåg
-- Matt Massicotte
+- Joel Drapper
+- Yutaka Tachibana

data/lib/solargraph/api_map/store.rb

@@ -247,10 +247,22 @@ module Solargraph
           end
           ovr.tags.each do |tag|
             pin.docstring.add_tag(tag)
-            new_pin.docstring.add_tag(tag) if new_pin
+            redefine_return_type pin, tag
+            if new_pin
+              new_pin.docstring.add_tag(tag)
+              redefine_return_type new_pin, tag
+            end
           end
         end
       end
+
+      def redefine_return_type pin, tag
+        return unless pin && tag.tag_name == 'return'
+        pin.instance_variable_set(:@return_type, ComplexType.try_parse(tag.type))
+        pin.signatures.each do |sig|
+          sig.instance_variable_set(:@return_type, ComplexType.try_parse(tag.type))
+        end
+      end
     end
   end
 end

data/lib/solargraph/api_map.rb

@@ -21,6 +21,11 @@ module Solargraph
     # @return [Array<String>]
     attr_reader :unresolved_requires
 
+    @@core_map = RbsMap::CoreMap.new
+
+    # @return [Array<String>]
+    attr_reader :missing_docs
+
     # @param pins [Array<Solargraph::Pin::Base>]
     def initialize pins: []
       @source_map_hash = {}
@@ -37,7 +42,7 @@ module Solargraph
       @source_map_hash = {}
       implicit.clear
       cache.clear
-      @store = Store.new(yard_map.pins + pins)
+      @store = Store.new(@@core_map.pins + pins)
       self
     end
 
@@ -65,14 +70,25 @@ module Solargraph
       end
       external_requires.merge implicit.requires
       external_requires.merge bench.workspace.config.required
-      yard_map.change(external_requires, bench.workspace.directory, bench.workspace.source_gems)
-      @store = Store.new(yard_map.pins + implicit.pins + pins)
+      @rbs_maps = external_requires.map { |r| load_rbs_map(r) }
+      unresolved_requires = @rbs_maps.reject(&:resolved?).map(&:library)
+      yard_map.change(unresolved_requires, bench.workspace.directory, bench.workspace.source_gems)
+      @store = Store.new(@@core_map.pins + @rbs_maps.flat_map(&:pins) + yard_map.pins + implicit.pins + pins)
       @unresolved_requires = yard_map.unresolved_requires
+      @missing_docs = yard_map.missing_docs
       @rebindable_method_names = nil
       store.block_pins.each { |blk| blk.rebind(self) }
       self
     end
 
+    def core_pins
+      @@core_map.pins
+    end
+
+    def yard_map
+      @yard_map ||= YardMap.new
+    end
+
     # @param name [String]
     # @return [YARD::Tags::MacroDirective, nil]
     def named_macro name
@@ -128,7 +144,8 @@ module Solargraph
 
     def rebindable_method_names
       @rebindable_method_names ||= begin
-        result = yard_map.rebindable_method_names
+        # result = yard_map.rebindable_method_names
+        result = ['instance_eval', 'instance_exec', 'class_eval', 'class_exec', 'module_eval', 'module_exec', 'define_method'].to_set
         source_maps.each do |map|
           result.merge map.rebindable_method_names
         end
@@ -187,7 +204,7 @@ module Solargraph
     #
     # @param namespace [String, nil] The namespace to match
     # @param context [String] The context to search
-    # @return [String]
+    # @return [String, nil]
     def qualify namespace, context = ''
       return namespace if ['self', nil].include?(namespace)
       cached = cache.get_qualified_namespace(namespace, context)
@@ -281,33 +298,33 @@ module Solargraph
     #   type = Solargraph::ComplexType.parse('String')
     #   api_map.get_complex_type_methods(type)
     #
-    # @param type [Solargraph::ComplexType] The complex type of the namespace
+    # @param complex_type [Solargraph::ComplexType] The complex type of the namespace
     # @param context [String] The context from which the type is referenced
     # @param internal [Boolean] True to include private methods
     # @return [Array<Solargraph::Pin::Base>]
-    def get_complex_type_methods type, context = '', internal = false
+    def get_complex_type_methods complex_type, context = '', internal = false
       # This method does not qualify the complex type's namespace because
       # it can cause conflicts between similar names, e.g., `Foo` vs.
       # `Other::Foo`. It still takes a context argument to determine whether
       # protected and private methods are visible.
-      return [] if type.undefined? || type.void?
-      result = []
-      if type.duck_type?
-        type.select(&:duck_type?).each do |t|
-          result.push Pin::DuckMethod.new(name: t.tag[1..-1])
-        end
-        result.concat get_methods('Object')
-      else
-        unless type.nil? || type.name == 'void'
-          visibility = [:public]
-          if type.namespace == context || super_and_sub?(type.namespace, context)
-            visibility.push :protected
-            visibility.push :private if internal
+      return [] if complex_type.undefined? || complex_type.void?
+      result = Set.new
+      complex_type.each do |type|
+        if type.duck_type?
+          result.add Pin::DuckMethod.new(name: type.to_s[1..-1])
+          result.merge get_methods('Object')
+        else
+          unless type.nil? || type.name == 'void'
+            visibility = [:public]
+            if type.namespace == context || super_and_sub?(type.namespace, context)
+              visibility.push :protected
+              visibility.push :private if internal
+            end
+            result.merge get_methods(type.namespace, scope: type.scope, visibility: visibility)
           end
-          result.concat get_methods(type.namespace, scope: type.scope, visibility: visibility)
         end
       end
-      result
+      result.to_a
     end
 
     # Get a stack of method pins for a method name in a namespace. The order
@@ -383,9 +400,10 @@ module Solargraph
     # @param query [String]
     # @return [Array<Pin::Base>]
     def query_symbols query
-      result = []
-      source_map_hash.each_value { |s| result.concat s.query_symbols(query) }
-      result
+      Pin::Search.new(
+        source_map_hash.values.flat_map(&:document_symbols),
+        query
+      ).results
     end
 
     # @param location [Solargraph::Location]
@@ -442,18 +460,15 @@ module Solargraph
     def super_and_sub?(sup, sub)
       fqsup = qualify(sup)
       cls = qualify(sub)
-      until fqsup.nil? || cls.nil?
+      tested = []
+      until fqsup.nil? || cls.nil? || tested.include?(cls)
         return true if cls == fqsup
+        tested.push cls
         cls = qualify_superclass(cls)
       end
       false
     end
 
-    # @return [YardMap]
-    def yard_map
-      @yard_map ||= YardMap.new
-    end
-
     # Check if the host class includes the specified module.
     #
     # @param host [String] The class
@@ -470,6 +485,14 @@ module Solargraph
     # @return [Hash{String => SourceMap}]
     attr_reader :source_map_hash
 
+    # @param library [String]
+    # @return [RbsMap]
+    def load_rbs_map library
+      # map = RbsMap.load(library)
+      # return map if map.resolved?
+      RbsMap::StdlibMap.load(library)
+    end
+
     # @return [ApiMap::Store]
     def store
       @store ||= Store.new
@@ -672,7 +695,7 @@ module Solargraph
         comments: origin.comments,
         scope: origin.scope,
         visibility: origin.visibility,
-        parameters: origin.parameters,
+        signatures: origin.signatures,
         attribute: origin.attribute?
       }
       Pin::Method.new **args

data/lib/solargraph/cache.rb

@@ -0,0 +1,51 @@
+require 'fileutils'
+
+module Solargraph
+  module Cache
+    class << self
+      # The base directory where cached documentation is installed.
+      #
+      # @return [String]
+      def base_dir
+        # The directory is not stored in a variable so it can be overridden
+        # in specs.
+        ENV['SOLARGRAPH_CACHE'] || File.join(Dir.home, '.solargraph', 'cache')
+      end
+
+      # The working directory for the current Ruby and Solargraph versions.
+      #
+      # @return [String]
+      def work_dir
+        # The directory is not stored in a variable so it can be overridden
+        # in specs.
+        File.join(base_dir, "ruby-#{RUBY_VERSION}", "rbs-#{RBS::VERSION}", "solargraph-#{Solargraph::VERSION}")
+      end
+
+      # @return [Array<Solargraph::Pin::Base>, nil]
+      def load *path
+        file = File.join(work_dir, *path)
+        return nil unless File.file?(file)
+        Marshal.load(File.read(file, mode: 'rb'))
+      rescue StandardError => e
+        Solargraph.logger.warn "Failed to load cached file #{file}: [#{e.class}] #{e.message}"
+        FileUtils.rm_f file
+        nil
+      end
+
+      # @return [Boolean]
+      def save *path, pins
+        return false if pins.empty?
+        file = File.join(work_dir, *path)
+        base = File.dirname(file)
+        FileUtils.mkdir_p base unless File.directory?(base)
+        ser = Marshal.dump(pins)
+        File.write file, ser, mode: 'wb'
+        true
+      end
+
+      def clear
+        FileUtils.rm_rf base_dir, secure: true
+      end
+    end
+  end
+end

data/lib/solargraph/complex_type/type_methods.rb

@@ -101,6 +101,7 @@ module Solargraph
       # @param context [String] The namespace from which to resolve names
       # @return [ComplexType] The generated ComplexType
       def qualify api_map, context = ''
+        return self if name == 'param'
         return ComplexType.new([self]) if duck_type? || void? || undefined?
         recon = (rooted? ? '' : context)
         fqns = api_map.qualify(name, recon)
@@ -109,12 +110,8 @@ module Solargraph
           return UniqueType::UNDEFINED
         end
         fqns = "::#{fqns}" # Ensure the resulting complex type is rooted
-        ltypes = key_types.map do |t|
-          t.qualify api_map, context
-        end
-        rtypes = value_types.map do |t|
-          t.qualify api_map, context
-        end
+        ltypes = key_types.map { |t| t.qualify api_map, context }.uniq
+        rtypes = value_types.map { |t| t.qualify api_map, context }.uniq
         if list_parameters?
           Solargraph::ComplexType.parse("#{fqns}<#{rtypes.map(&:tag).join(', ')}>")
         elsif fixed_parameters?
@@ -125,6 +122,13 @@ module Solargraph
           Solargraph::ComplexType.parse(fqns)
         end
       end
+
+      # @yieldparam [UniqueType]
+      # @return [Enumerator<UniqueType>]
+      def each_unique_type &block
+        return enum_for(__method__) unless block_given?
+        yield self
+      end
     end
   end
 end

data/lib/solargraph/complex_type/unique_type.rb

@@ -8,6 +8,8 @@ module Solargraph
     class UniqueType
       include TypeMethods
 
+      attr_reader :all_params
+
       # Create a UniqueType with the specified name and an optional substring.
       # The substring is the parameter section of a parametrized type, e.g.,
       # for the type `Array<String>`, the name is `Array` and the substring is
@@ -27,6 +29,7 @@ module Solargraph
         @tag = @name + substring
         @key_types = []
         @subtypes = []
+        @all_params = []
         return unless parameters?
         if @substring.start_with?('<(') && @substring.end_with?(')>')
           subs = ComplexType.parse(substring[2..-3], partial: true)
@@ -40,12 +43,66 @@ module Solargraph
         else
           @subtypes.concat subs
         end
+        @all_params.concat @key_types
+        @all_params.concat @subtypes
       end
 
       def to_s
         tag
       end
 
+      def to_rbs
+        "#{namespace}#{parameters? ? "[#{subtypes.map { |s| s.to_rbs }.join(', ')}]" : ''}"
+      end
+  
+      def parameterized?
+        name == 'param' || all_params.any?(&:parameterized?)
+      end
+
+      def resolve_parameters definitions, context
+        new_name = if name == 'param'
+          idx = definitions.parameters.index(subtypes.first.name)
+          return ComplexType::UNDEFINED if idx.nil?
+          param_type = context.return_type.all_params[idx]
+          return ComplexType::UNDEFINED unless param_type
+          param_type.to_s
+        else
+          name
+        end
+        new_key_types = if name != 'param'
+          @key_types.map { |t| t.resolve_parameters(definitions, context) }.select(&:defined?)
+        else
+          []
+        end
+        new_subtypes = if name != 'param'
+          @subtypes.map { |t| t.resolve_parameters(definitions, context) }.select(&:defined?)
+        else
+          []
+        end
+        if name != 'param' && !(new_key_types.empty? && new_subtypes.empty?)
+          if hash_parameters?
+            UniqueType.new(new_name, "{#{new_key_types.join(', ')} => #{new_subtypes.join(', ')}}")
+          elsif parameters?
+            if @substring.start_with?'<('
+              UniqueType.new(new_name, "<(#{new_subtypes.join(', ')})>")
+            else
+              UniqueType.new(new_name, "<#{new_subtypes.join(', ')}>")
+            end
+          else
+            UniqueType.new(new_name)
+          end
+        else
+          UniqueType.new(new_name)
+        end
+
+        # idx = definitions.parameters.index(subtypes.first.name)
+        # STDERR.puts "Index: #{idx}"
+        # return ComplexType::UNDEFINED if idx.nil?
+        # param_type = context.return_type.all_params[idx]
+        # return ComplexType::UNDEFINED unless param_type
+        # ComplexType.try_parse(param_type.to_s)
+      end
+
       def self_to dst
         return self unless selfy?
         new_name = (@name == 'self' ? dst : @name)

data/lib/solargraph/complex_type.rb

@@ -30,6 +30,12 @@ module Solargraph
       @items.first
     end
 
+    def to_rbs
+      ((@items.length > 1 ? '(' : '') + @items.map do |item|
+        "#{item.namespace}#{item.parameters? ? "[#{item.subtypes.map { |s| s.to_rbs }.join(', ')}]" : ''}"
+      end.join(' | ') + (@items.length > 1 ? ')' : '')).gsub(/undefined/, 'untyped')
+    end
+
     def map &block
       @items.map &block
     end
@@ -40,6 +46,16 @@ module Solargraph
       @items.each &block
     end
 
+    # @yieldparam [UniqueType]
+    # @return [Enumerator<UniqueType>]
+    def each_unique_type &block
+      return enum_for(__method__) unless block_given?
+
+      @items.each do |item|
+        item.each_unique_type &block
+      end
+    end
+
     def length
       @items.length
     end
@@ -74,10 +90,23 @@ module Solargraph
       @items.all? &block
     end
 
+    def any? &block
+      @items.compact.any? &block
+    end
+
     def selfy?
       @items.any?(&:selfy?)
     end
 
+    def parameterized?
+      any?(&:parameterized?)
+    end
+
+    def resolve_parameters definitions, context
+      result = @items.map { |i| i.resolve_parameters(definitions, context) }
+      ComplexType.parse(*result.map(&:tag))
+    end
+
     # @param dst [String]
     # @return [ComplexType]
     def self_to dst
@@ -91,6 +120,10 @@ module Solargraph
       @items.any?(&:nil_type?)
     end
 
+    def all_params
+      @items.first.all_params || []
+    end
+
     private
 
     # @todo This is a quick and dirty hack that forces `self` keywords
@@ -154,9 +187,9 @@ module Solargraph
                 subtype_string.clear
                 next
               else
+                raise ComplexTypeError, "Invalid close in type #{type_string}" if point_stack == 0
                 point_stack -= 1
-                subtype_string += char if point_stack == 0
-                raise ComplexTypeError, "Invalid close in type #{type_string}" if point_stack < 0
+                subtype_string += char
               end
               next
             elsif char == '{'

data/lib/solargraph/convention/rakefile.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Convention
+    class Rakefile < Base
+      def local source_map
+        basename = File.basename(source_map.filename)
+        return EMPTY_ENVIRON unless basename.end_with?('.rake') || basename == 'Rakefile'
+
+        @environ ||= Environ.new(
+          requires: ['rake'],
+          domains: ['Rake::DSL']
+        )
+      end
+    end
+  end
+end

data/lib/solargraph/convention.rb

@@ -11,6 +11,7 @@ module Solargraph
     autoload :Gemfile, 'solargraph/convention/gemfile'
     autoload :Rspec,   'solargraph/convention/rspec'
     autoload :Gemspec, 'solargraph/convention/gemspec'
+    autoload :Rakefile, 'solargraph/convention/rakefile'
 
     @@conventions = Set.new
 
@@ -43,5 +44,6 @@ module Solargraph
     register Gemfile
     register Gemspec
     register Rspec
+    register Rakefile
   end
 end

data/lib/solargraph/diagnostics/require_not_found.rb

@@ -12,6 +12,10 @@ module Solargraph
         refs = {}
         map = api_map.source_map(source.filename)
         map.requires.each { |ref| refs[ref.name] = ref }
+        api_map.missing_docs.each do |r|
+          next unless refs.key?(r)
+          result.push docs_error(r, refs[r].location)
+        end
         api_map.unresolved_requires.each do |r|
           next unless refs.key?(r)
           result.push require_error(r, refs[r].location)
@@ -21,6 +25,18 @@ module Solargraph
 
       private
 
+      # @param path [String]
+      # @param location [Location]
+      # @return [Hash]
+      def docs_error path, location
+        {
+          range: location.range.to_hash,
+          severity: Diagnostics::Severities::WARNING,
+          source: 'RequireNotFound',
+          message: "YARD docs not found for #{path}"
+        }
+      end
+
       # @param path [String]
       # @param location [Location]
       # @return [Hash]

data/lib/solargraph/diagnostics/rubocop.rb

@@ -11,6 +11,7 @@ module Solargraph
 
       # Conversion of RuboCop severity names to LSP constants
       SEVERITIES = {
+        'info' => Severities::HINT,
         'refactor' => Severities::HINT,
         'convention' => Severities::INFORMATION,
         'warning' => Severities::WARNING,
@@ -22,16 +23,20 @@ module Solargraph
       # @param _api_map [Solargraph::ApiMap]
       # @return [Array<Hash>]
       def diagnose source, _api_map
+        @source = source
         require_rubocop(rubocop_version)
         options, paths = generate_options(source.filename, source.code)
         store = RuboCop::ConfigStore.new
         runner = RuboCop::Runner.new(options, store)
         result = redirect_stdout{ runner.run(paths) }
+        
+        return [] if result.empty?
+        
         make_array JSON.parse(result)
       rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
         raise DiagnosticsError, "Error in RuboCop configuration: #{e.message}"
-      rescue JSON::ParserError
-        raise DiagnosticsError, 'RuboCop returned invalid data'
+      rescue JSON::ParserError => e
+        raise DiagnosticsError, "RuboCop returned invalid data: #{e.message}"
       end
 
       private
@@ -88,8 +93,17 @@ module Solargraph
         if off['location']['start_line'] != off['location']['last_line']
           Position.new(off['location']['start_line'], 0)
         else
+          start_line = off['location']['start_line'] - 1
+          last_column = off['location']['last_column']
+          line = @source.code.lines[start_line]
+          col_off = if line.nil? || line.empty?
+            1
+          else
+            0
+          end
+
           Position.new(
-            off['location']['start_line'] - 1, off['location']['last_column']
+            start_line, last_column - col_off
           )
         end
       end