solargraph 0.32.1 → 0.32.2

data/lib/solargraph/complex_type/unique_type.rb

@@ -1,44 +1,44 @@
-module Solargraph
-  class ComplexType
-    # An individual type signature. A complex type can consist of multiple
-    # unique types.
-    #
-    class UniqueType
-      include TypeMethods
-
-      # 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
-      # `<String>`.
-      #
-      # @param name [String] The name of the type
-      # @param substring [String] The substring of the type
-      def initialize name, substring = ''
-        if name.start_with?('::')
-          @name = name[2..-1]
-          @rooted = true
-        else
-          @name = name
-          @rooted = false
-        end
-        @substring = substring
-        @tag = @name + substring
-        @key_types = []
-        @subtypes = []
-        return unless parameters?
-        subs = ComplexType.parse(substring[1..-2], partial: true)
-        if hash_parameters?
-          raise ComplexTypeError, "Bad hash type" unless !subs.is_a?(ComplexType) and subs.length == 2 and !subs[0].is_a?(ComplexType) and !subs[1].is_a?(ComplexType)
-          @key_types.concat subs[0]
-          @subtypes.concat subs[1]
-        else
-          @subtypes.concat subs
-        end
-      end
-
-      def to_s
-        tag
-      end
-    end
-  end
-end
+module Solargraph
+  class ComplexType
+    # An individual type signature. A complex type can consist of multiple
+    # unique types.
+    #
+    class UniqueType
+      include TypeMethods
+
+      # 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
+      # `<String>`.
+      #
+      # @param name [String] The name of the type
+      # @param substring [String] The substring of the type
+      def initialize name, substring = ''
+        if name.start_with?('::')
+          @name = name[2..-1]
+          @rooted = true
+        else
+          @name = name
+          @rooted = false
+        end
+        @substring = substring
+        @tag = @name + substring
+        @key_types = []
+        @subtypes = []
+        return unless parameters?
+        subs = ComplexType.parse(substring[1..-2], partial: true)
+        if hash_parameters?
+          raise ComplexTypeError, "Bad hash type" unless !subs.is_a?(ComplexType) and subs.length == 2 and !subs[0].is_a?(ComplexType) and !subs[1].is_a?(ComplexType)
+          @key_types.concat subs[0]
+          @subtypes.concat subs[1]
+        else
+          @subtypes.concat subs
+        end
+      end
+
+      def to_s
+        tag
+      end
+    end
+  end
+end

data/lib/solargraph/core_fills.rb

@@ -1,37 +1,37 @@
-module Solargraph
-  module CoreFills
-    KEYWORDS = [
-      '__ENCODING__', '__LINE__', '__FILE__', 'BEGIN', 'END', 'alias', 'and',
-      'begin', 'break', 'case', 'class', 'def', 'defined?', 'do', 'else',
-      'elsif', 'end', 'ensure', 'false', 'for', 'if', 'in', 'module', 'next',
-      'nil', 'not', 'or', 'redo', 'rescue', 'retry', 'return', 'self', 'super',
-      'then', 'true', 'undef', 'unless', 'until', 'when', 'while', 'yield'
-    ].freeze
-
-    METHODS_RETURNING_SELF = %w[
-      Array#select Array#reject Array#keep_if Array#delete_if
-      Enumerable#select
-      Object#clone Object#dup Object#freeze Object#taint Object#untaint Object#tap
-      String#freeze
-    ].freeze
-
-    METHODS_RETURNING_SUBTYPES = %w[
-      Array#[] Array#first Array#last
-    ].freeze
-
-    METHODS_WITH_YIELDPARAM_SELF = %w[
-      Object#tap
-    ].freeze
-
-    METHODS_WITH_YIELDPARAM_SUBTYPES = %w[
-      Array#each Array#map Array#any? Array#all? Array#index
-      Enumerable#each_entry Enumerable#map Enumerable#any? Enumerable#all?
-      Set#each
-    ].freeze
-
-    CUSTOM_RETURN_TYPES = {
-      'String#split' => 'Array<String>',
-      'String#lines' => 'Array<String>'
-    }.freeze
-  end
-end
+module Solargraph
+  module CoreFills
+    KEYWORDS = [
+      '__ENCODING__', '__LINE__', '__FILE__', 'BEGIN', 'END', 'alias', 'and',
+      'begin', 'break', 'case', 'class', 'def', 'defined?', 'do', 'else',
+      'elsif', 'end', 'ensure', 'false', 'for', 'if', 'in', 'module', 'next',
+      'nil', 'not', 'or', 'redo', 'rescue', 'retry', 'return', 'self', 'super',
+      'then', 'true', 'undef', 'unless', 'until', 'when', 'while', 'yield'
+    ].freeze
+
+    METHODS_RETURNING_SELF = %w[
+      Array#select Array#reject Array#keep_if Array#delete_if
+      Enumerable#select
+      Object#clone Object#dup Object#freeze Object#taint Object#untaint Object#tap
+      String#freeze
+    ].freeze
+
+    METHODS_RETURNING_SUBTYPES = %w[
+      Array#[] Array#first Array#last
+    ].freeze
+
+    METHODS_WITH_YIELDPARAM_SELF = %w[
+      Object#tap
+    ].freeze
+
+    METHODS_WITH_YIELDPARAM_SUBTYPES = %w[
+      Array#each Array#map Array#any? Array#all? Array#index
+      Enumerable#each_entry Enumerable#map Enumerable#any? Enumerable#all?
+      Set#each
+    ].freeze
+
+    CUSTOM_RETURN_TYPES = {
+      'String#split' => 'Array<String>',
+      'String#lines' => 'Array<String>'
+    }.freeze
+  end
+end

data/lib/solargraph/diagnostics.rb

@@ -1,52 +1,52 @@
-module Solargraph
-  # The Diagnostics library provides reporters for analyzing problems in code
-  # and providing the results to language server clients.
-  #
-  module Diagnostics
-    autoload :Base,            'solargraph/diagnostics/base'
-    autoload :Severities,      'solargraph/diagnostics/severities'
-    autoload :Rubocop,         'solargraph/diagnostics/rubocop'
-    autoload :RubocopHelpers,  'solargraph/diagnostics/rubocop_helpers'
-    autoload :RequireNotFound, 'solargraph/diagnostics/require_not_found'
-    autoload :TypeNotDefined,  'solargraph/diagnostics/type_not_defined'
-    autoload :UpdateErrors,    'solargraph/diagnostics/update_errors'
-
-    class << self
-      # Add a reporter with a name to identify it in .solargraph.yml files.
-      #
-      # @param name [String] The name
-      # @param klass [Class<Solargraph::Diagnostics::Base>] The class implementation
-      # @return [void]
-      def register name, klass
-        reporter_hash[name] = klass
-      end
-
-      # Get an array of reporter names.
-      #
-      # @return [Array<String>]
-      def reporters
-        reporter_hash.keys
-      end
-
-      # Find a reporter by name.
-      #
-      # @param name [String] The name with which the reporter was registered
-      # @return [Class<Solargraph::Diagnostics::Base>]
-      def reporter name
-        reporter_hash[name]
-      end
-
-      private
-
-      # @return [Hash]
-      def reporter_hash
-        @reporter_hash ||= {}
-      end
-    end
-
-    register 'rubocop', Rubocop
-    register 'require_not_found', RequireNotFound
-    register 'type_not_defined', TypeNotDefined
-    register 'update_errors', UpdateErrors
-  end
-end
+module Solargraph
+  # The Diagnostics library provides reporters for analyzing problems in code
+  # and providing the results to language server clients.
+  #
+  module Diagnostics
+    autoload :Base,            'solargraph/diagnostics/base'
+    autoload :Severities,      'solargraph/diagnostics/severities'
+    autoload :Rubocop,         'solargraph/diagnostics/rubocop'
+    autoload :RubocopHelpers,  'solargraph/diagnostics/rubocop_helpers'
+    autoload :RequireNotFound, 'solargraph/diagnostics/require_not_found'
+    autoload :TypeNotDefined,  'solargraph/diagnostics/type_not_defined'
+    autoload :UpdateErrors,    'solargraph/diagnostics/update_errors'
+
+    class << self
+      # Add a reporter with a name to identify it in .solargraph.yml files.
+      #
+      # @param name [String] The name
+      # @param klass [Class<Solargraph::Diagnostics::Base>] The class implementation
+      # @return [void]
+      def register name, klass
+        reporter_hash[name] = klass
+      end
+
+      # Get an array of reporter names.
+      #
+      # @return [Array<String>]
+      def reporters
+        reporter_hash.keys
+      end
+
+      # Find a reporter by name.
+      #
+      # @param name [String] The name with which the reporter was registered
+      # @return [Class<Solargraph::Diagnostics::Base>]
+      def reporter name
+        reporter_hash[name]
+      end
+
+      private
+
+      # @return [Hash]
+      def reporter_hash
+        @reporter_hash ||= {}
+      end
+    end
+
+    register 'rubocop', Rubocop
+    register 'require_not_found', RequireNotFound
+    register 'type_not_defined', TypeNotDefined
+    register 'update_errors', UpdateErrors
+  end
+end

data/lib/solargraph/diagnostics/base.rb

@@ -1,20 +1,20 @@
-module Solargraph
-  module Diagnostics
-    # The base class for diagnostics reporters.
-    #
-    class Base
-      # Perform a diagnosis on a Source within the context of an ApiMap.
-      # The result is an array of hash objects that conform to the LSP's
-      # Diagnostic specification.
-      #
-      # Subclasses should override this method.
-      #
-      # @param source [Solargraph::Source]
-      # @param api_map [Solargraph::ApiMap]
-      # @return [Array<Hash>]
-      def diagnose source, api_map
-        []
-      end
-    end
-  end
-end
+module Solargraph
+  module Diagnostics
+    # The base class for diagnostics reporters.
+    #
+    class Base
+      # Perform a diagnosis on a Source within the context of an ApiMap.
+      # The result is an array of hash objects that conform to the LSP's
+      # Diagnostic specification.
+      #
+      # Subclasses should override this method.
+      #
+      # @param source [Solargraph::Source]
+      # @param api_map [Solargraph::ApiMap]
+      # @return [Array<Hash>]
+      def diagnose source, api_map
+        []
+      end
+    end
+  end
+end

data/lib/solargraph/diagnostics/require_not_found.rb

@@ -1,28 +1,28 @@
-module Solargraph
-  module Diagnostics
-    # RequireNotFound reports required paths that could not be resolved to
-    # either a file in the workspace or a gem.
-    #
-    class RequireNotFound < Base
-      def diagnose source, api_map
-        return [] unless source.parsed? && source.synchronized?
-        result = []
-        refs = {}
-        map = api_map.source_map(source.filename)
-        map.requires.each do |ref|
-          refs[ref.name] = ref
-        end
-        api_map.unresolved_requires.each do |r|
-          next unless refs.has_key?(r)
-          result.push(
-            range: refs[r].location.range.to_hash,
-            severity: Diagnostics::Severities::WARNING,
-            source: 'Solargraph',
-            message: "Required path #{r} could not be resolved."
-          )
-        end
-        result
-      end
-    end
-  end
-end
+module Solargraph
+  module Diagnostics
+    # RequireNotFound reports required paths that could not be resolved to
+    # either a file in the workspace or a gem.
+    #
+    class RequireNotFound < Base
+      def diagnose source, api_map
+        return [] unless source.parsed? && source.synchronized?
+        result = []
+        refs = {}
+        map = api_map.source_map(source.filename)
+        map.requires.each do |ref|
+          refs[ref.name] = ref
+        end
+        api_map.unresolved_requires.each do |r|
+          next unless refs.has_key?(r)
+          result.push(
+            range: refs[r].location.range.to_hash,
+            severity: Diagnostics::Severities::WARNING,
+            source: 'Solargraph',
+            message: "Required path #{r} could not be resolved."
+          )
+        end
+        result
+      end
+    end
+  end
+end

data/lib/solargraph/diagnostics/rubocop.rb

@@ -1,98 +1,98 @@
-require 'rubocop'
-require 'stringio'
-
-module Solargraph
-  module Diagnostics
-    # This reporter provides linting through RuboCop.
-    #
-    class Rubocop < Base
-      include RubocopHelpers
-
-      # Conversion of RuboCop severity names to LSP constants
-      SEVERITIES = {
-        'refactor' => Severities::HINT,
-        'convention' => Severities::INFORMATION,
-        'warning' => Severities::WARNING,
-        'error' => Severities::ERROR,
-        'fatal' => Severities::ERROR
-      }
-
-      # @param source [Solargraph::Source]
-      # @param _api_map [Solargraph::ApiMap]
-      # @return [Array<Hash>]
-      def diagnose source, _api_map
-        options, paths = generate_options(source.filename, source.code)
-        runner = RuboCop::Runner.new(options, RuboCop::ConfigStore.new)
-        result = redirect_stdout{ runner.run(paths) }
-        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'
-      end
-
-      private
-
-      # @todo This is a smelly way to redirect output, but the RuboCop specs do
-      #   the same thing.
-      # @return [String]
-      def redirect_stdout
-        redir = StringIO.new
-        $stdout = redir
-        yield if block_given?
-        $stdout = STDOUT
-        redir.string
-      end
-
-      # @param resp [Hash]
-      # @return [Array<Hash>]
-      def make_array resp
-        diagnostics = []
-        resp['files'].each do |file|
-          file['offenses'].each do |off|
-            diagnostics.push offense_to_diagnostic(off)
-          end
-        end
-        diagnostics
-      end
-
-      # Convert a RuboCop offense to an LSP diagnostic
-      #
-      # @param off [Hash] Offense received from Rubocop
-      # @return [Hash] LSP diagnostic
-      def offense_to_diagnostic off
-        {
-          range: offense_range(off).to_hash,
-          # 1 = Error, 2 = Warning, 3 = Information, 4 = Hint
-          severity: SEVERITIES[off['severity']],
-          source: off['cop_name'],
-          message: off['message'].gsub(/^#{off['cop_name']}\:/, '')
-        }
-      end
-
-      # @param off [Hash]
-      # @return [Range]
-      def offense_range off
-        Range.new(offense_start_position(off), offense_ending_position(off))
-      end
-
-      # @param off [Hash]
-      # @return [Position]
-      def offense_start_position off
-        Position.new(off['location']['start_line'] - 1, off['location']['start_column'] - 1)
-      end
-
-      # @param off [Hash]
-      # @return [Position]
-      def offense_ending_position off
-        if off['location']['start_line'] != off['location']['last_line']
-          Position.new(off['location']['start_line'], 0)
-        else
-          Position.new(
-            off['location']['start_line'] - 1, off['location']['last_column']
-          )
-        end
-      end
-    end
-  end
-end
+require 'rubocop'
+require 'stringio'
+
+module Solargraph
+  module Diagnostics
+    # This reporter provides linting through RuboCop.
+    #
+    class Rubocop < Base
+      include RubocopHelpers
+
+      # Conversion of RuboCop severity names to LSP constants
+      SEVERITIES = {
+        'refactor' => Severities::HINT,
+        'convention' => Severities::INFORMATION,
+        'warning' => Severities::WARNING,
+        'error' => Severities::ERROR,
+        'fatal' => Severities::ERROR
+      }
+
+      # @param source [Solargraph::Source]
+      # @param _api_map [Solargraph::ApiMap]
+      # @return [Array<Hash>]
+      def diagnose source, _api_map
+        options, paths = generate_options(source.filename, source.code)
+        runner = RuboCop::Runner.new(options, RuboCop::ConfigStore.new)
+        result = redirect_stdout{ runner.run(paths) }
+        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'
+      end
+
+      private
+
+      # @todo This is a smelly way to redirect output, but the RuboCop specs do
+      #   the same thing.
+      # @return [String]
+      def redirect_stdout
+        redir = StringIO.new
+        $stdout = redir
+        yield if block_given?
+        $stdout = STDOUT
+        redir.string
+      end
+
+      # @param resp [Hash]
+      # @return [Array<Hash>]
+      def make_array resp
+        diagnostics = []
+        resp['files'].each do |file|
+          file['offenses'].each do |off|
+            diagnostics.push offense_to_diagnostic(off)
+          end
+        end
+        diagnostics
+      end
+
+      # Convert a RuboCop offense to an LSP diagnostic
+      #
+      # @param off [Hash] Offense received from Rubocop
+      # @return [Hash] LSP diagnostic
+      def offense_to_diagnostic off
+        {
+          range: offense_range(off).to_hash,
+          # 1 = Error, 2 = Warning, 3 = Information, 4 = Hint
+          severity: SEVERITIES[off['severity']],
+          source: off['cop_name'],
+          message: off['message'].gsub(/^#{off['cop_name']}\:/, '')
+        }
+      end
+
+      # @param off [Hash]
+      # @return [Range]
+      def offense_range off
+        Range.new(offense_start_position(off), offense_ending_position(off))
+      end
+
+      # @param off [Hash]
+      # @return [Position]
+      def offense_start_position off
+        Position.new(off['location']['start_line'] - 1, off['location']['start_column'] - 1)
+      end
+
+      # @param off [Hash]
+      # @return [Position]
+      def offense_ending_position off
+        if off['location']['start_line'] != off['location']['last_line']
+          Position.new(off['location']['start_line'], 0)
+        else
+          Position.new(
+            off['location']['start_line'] - 1, off['location']['last_column']
+          )
+        end
+      end
+    end
+  end
+end