solargraph 0.57.0 → 0.58.3

data/lib/solargraph/diagnostics/rubocop_helpers.rb

@@ -1,66 +1,68 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Diagnostics
-    # Utility methods for the RuboCop diagnostics reporter.
-    #
-    module RubocopHelpers
-      module_function
-
-      # Requires a specific version of rubocop, or the latest installed version
-      # if _version_ is `nil`.
-      #
-      # @param version [String, nil]
-      # @raise [InvalidRubocopVersionError] if _version_ is not installed
-      # @return [void]
-      def require_rubocop(version = nil)
-        begin
-          # @type [String]
-          gem_path = Gem::Specification.find_by_name('rubocop', version).full_gem_path
-          gem_lib_path = File.join(gem_path, 'lib')
-          $LOAD_PATH.unshift(gem_lib_path) unless $LOAD_PATH.include?(gem_lib_path)
-        # @sg-ignore
-        rescue Gem::MissingSpecVersionError => e
-          raise InvalidRubocopVersionError,
-                "could not find '#{e.name}' (#{e.requirement}) - "\
-                "did find: [#{e.specs.map { |s| s.version.version }.join(', ')}]"
-        end
-        require 'rubocop'
-      end
-
-      # Generate command-line options for the specified filename and code.
-      #
-      # @param filename [String]
-      # @param code [String]
-      # @return [Array(Array<String>, Array<String>)]
-      def generate_options filename, code
-        args = ['-f', 'j', '--force-exclusion', filename]
-        base_options = RuboCop::Options.new
-        options, paths = base_options.parse(args)
-        options[:stdin] = code
-        [options, paths]
-      end
-
-      # RuboCop internally uses capitalized drive letters for Windows paths,
-      # so we need to convert the paths provided to the command.
-      #
-      # @param path [String]
-      # @return [String]
-      def fix_drive_letter path
-        return path unless path.match(/^[a-z]:/)
-        path[0].upcase + path[1..-1]
-      end
-
-      # @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
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Diagnostics
+    # Utility methods for the RuboCop diagnostics reporter.
+    #
+    module RubocopHelpers
+      module_function
+
+      # Requires a specific version of rubocop, or the latest installed version
+      # if _version_ is `nil`.
+      #
+      # @param version [String, nil]
+      # @raise [InvalidRubocopVersionError] if _version_ is not installed
+      # @return [void]
+      def require_rubocop(version = nil)
+        begin
+          # @type [String]
+          gem_path = Gem::Specification.find_by_name('rubocop', version).full_gem_path
+          gem_lib_path = File.join(gem_path, 'lib')
+          $LOAD_PATH.unshift(gem_lib_path) unless $LOAD_PATH.include?(gem_lib_path)
+        rescue Gem::MissingSpecVersionError => e
+          # @type [Array<Gem::Specification>]
+          specs = e.specs
+          raise InvalidRubocopVersionError,
+                "could not find '#{e.name}' (#{e.requirement}) - "\
+                "did find: [#{specs.map { |s| s.version.version }.join(', ')}]"
+        end
+        require 'rubocop'
+      end
+
+      # Generate command-line options for the specified filename and code.
+      #
+      # @param filename [String]
+      # @param code [String]
+      # @return [Array(Array<String>, Array<String>)]
+      def generate_options filename, code
+        args = ['-f', 'j', '--force-exclusion', filename]
+        base_options = RuboCop::Options.new
+        options, paths = base_options.parse(args)
+        # @sg-ignore
+        options[:stdin] = code
+        [options, paths]
+      end
+
+      # RuboCop internally uses capitalized drive letters for Windows paths,
+      # so we need to convert the paths provided to the command.
+      #
+      # @param path [String]
+      # @return [String]
+      def fix_drive_letter path
+        return path unless path.match(/^[a-z]:/)
+        path[0].upcase + path[1..-1]
+      end
+
+      # @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
+    end
+  end
+end

data/lib/solargraph/diagnostics/type_check.rb

@@ -1,55 +1,55 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Diagnostics
-    # TypeCheck reports methods with undefined return types, untagged
-    # parameters, and invalid param tags.
-    #
-    class TypeCheck < Base
-      # @return [Array<Hash>]
-      def diagnose source, api_map
-        # return [] unless args.include?('always') || api_map.workspaced?(source.filename)
-        severity = Diagnostics::Severities::ERROR
-        level = (args.reverse.find { |a| ['normal', 'typed', 'strict', 'strong'].include?(a) }) || :normal
-        checker = Solargraph::TypeChecker.new(source.filename, api_map: api_map, level: level.to_sym)
-        checker.problems
-          .sort { |a, b| a.location.range.start.line <=> b.location.range.start.line }
-          .map do |problem|
-            {
-              range: extract_first_line(problem.location, source),
-              severity: severity,
-              source: 'Typecheck',
-              message: problem.message
-            }
-          end
-      end
-
-      private
-
-      # @param location [Location]
-      # @param source [Source]
-      # @return [Hash]
-      def extract_first_line location, source
-        return location.range.to_hash if location.range.start.line == location.range.ending.line
-        {
-          start: {
-            line: location.range.start.line,
-            character: location.range.start.character
-          },
-          end: {
-            line: location.range.start.line,
-            character: last_character(location.range.start, source)
-          }
-        }
-      end
-
-      # @param position [Solargraph::Position]
-      # @param source [Solargraph::Source]
-      # @return [Integer]
-      def last_character position, source
-        cursor = Position.to_offset(source.code, position)
-        source.code.index(/[\r\n]/, cursor) || source.code.length
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Diagnostics
+    # TypeCheck reports methods with undefined return types, untagged
+    # parameters, and invalid param tags.
+    #
+    class TypeCheck < Base
+      # @return [Array<Hash>]
+      def diagnose source, api_map
+        # return [] unless args.include?('always') || api_map.workspaced?(source.filename)
+        severity = Diagnostics::Severities::ERROR
+        level = (args.reverse.find { |a| ['normal', 'typed', 'strict', 'strong'].include?(a) }) || :normal
+        checker = Solargraph::TypeChecker.new(source.filename, api_map: api_map, level: level.to_sym)
+        checker.problems
+          .sort { |a, b| a.location.range.start.line <=> b.location.range.start.line }
+          .map do |problem|
+            {
+              range: extract_first_line(problem.location, source),
+              severity: severity,
+              source: 'Typecheck',
+              message: problem.message
+            }
+          end
+      end
+
+      private
+
+      # @param location [Location]
+      # @param source [Source]
+      # @return [Hash]
+      def extract_first_line location, source
+        return location.range.to_hash if location.range.start.line == location.range.ending.line
+        {
+          start: {
+            line: location.range.start.line,
+            character: location.range.start.character
+          },
+          end: {
+            line: location.range.start.line,
+            character: last_character(location.range.start, source)
+          }
+        }
+      end
+
+      # @param position [Solargraph::Position]
+      # @param source [Solargraph::Source]
+      # @return [Integer]
+      def last_character position, source
+        cursor = Position.to_offset(source.code, position)
+        source.code.index(/[\r\n]/, cursor) || source.code.length
+      end
+    end
+  end
+end

data/lib/solargraph/diagnostics/update_errors.rb

@@ -1,41 +1,41 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Diagnostics
-    class UpdateErrors < Base
-      def diagnose source, api_map
-        result = []
-        combine_ranges(source.code, source.error_ranges).each do |range|
-          result.push(
-            range: range.to_hash,
-            severity: Diagnostics::Severities::ERROR,
-            source: 'Solargraph',
-            message: 'Syntax error'
-          )
-        end
-        result
-      end
-
-      private
-
-      # Combine an array of ranges by their starting lines.
-      #
-      # @param code [String]
-      # @param ranges [Array<Range>]
-      # @return [Array<Range>]
-      def combine_ranges code, ranges
-        result = []
-        lines = []
-        ranges.sort{|a, b| a.start.line <=> b.start.line}.each do |rng|
-          next if rng.nil? || lines.include?(rng.start.line)
-          lines.push rng.start.line
-          next if rng.start.line >= code.lines.length
-          scol = code.lines[rng.start.line].index(/[^\s]/) || 0
-          ecol = code.lines[rng.start.line].length
-          result.push Range.from_to(rng.start.line, scol, rng.start.line, ecol)
-        end
-        result
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Diagnostics
+    class UpdateErrors < Base
+      def diagnose source, api_map
+        result = []
+        combine_ranges(source.code, source.error_ranges).each do |range|
+          result.push(
+            range: range.to_hash,
+            severity: Diagnostics::Severities::ERROR,
+            source: 'Solargraph',
+            message: 'Syntax error'
+          )
+        end
+        result
+      end
+
+      private
+
+      # Combine an array of ranges by their starting lines.
+      #
+      # @param code [String]
+      # @param ranges [Array<Range>]
+      # @return [Array<Range>]
+      def combine_ranges code, ranges
+        result = []
+        lines = []
+        ranges.sort{|a, b| a.start.line <=> b.start.line}.each do |rng|
+          next if rng.nil? || lines.include?(rng.start.line)
+          lines.push rng.start.line
+          next if rng.start.line >= code.lines.length
+          scol = code.lines[rng.start.line].index(/[^\s]/) || 0
+          ecol = code.lines[rng.start.line].length
+          result.push Range.from_to(rng.start.line, scol, rng.start.line, ecol)
+        end
+        result
+      end
+    end
+  end
+end