solargraph 0.32.1 → 0.32.2

data/lib/solargraph/diagnostics/rubocop_helpers.rb

@@ -1,46 +1,46 @@
-module Solargraph
-  module Diagnostics
-    module RubocopHelpers
-      module_function
-
-      # 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']
-        rubocop_file = find_rubocop_file(filename)
-        args.push('-c', fix_drive_letter(rubocop_file)) unless rubocop_file.nil?
-        args.push filename
-        options, paths = RuboCop::Options.new.parse(args)
-        options[:stdin] = code
-        [options, paths]
-      end
-
-      # Find a RuboCop configuration file in a file's directory tree.
-      #
-      # @param filename [String]
-      # @return [String, nil]
-      def find_rubocop_file filename
-        dir = File.dirname(filename)
-        until File.dirname(dir) == dir
-          here = File.join(dir, '.rubocop.yml')
-          return here if File.exist?(here)
-          dir = File.dirname(dir)
-        end
-        nil
-      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
-    end
-  end
-end
+module Solargraph
+  module Diagnostics
+    module RubocopHelpers
+      module_function
+
+      # 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']
+        rubocop_file = find_rubocop_file(filename)
+        args.push('-c', fix_drive_letter(rubocop_file)) unless rubocop_file.nil?
+        args.push filename
+        options, paths = RuboCop::Options.new.parse(args)
+        options[:stdin] = code
+        [options, paths]
+      end
+
+      # Find a RuboCop configuration file in a file's directory tree.
+      #
+      # @param filename [String]
+      # @return [String, nil]
+      def find_rubocop_file filename
+        dir = File.dirname(filename)
+        until File.dirname(dir) == dir
+          here = File.join(dir, '.rubocop.yml')
+          return here if File.exist?(here)
+          dir = File.dirname(dir)
+        end
+        nil
+      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
+    end
+  end
+end

data/lib/solargraph/diagnostics/type_not_defined.rb

@@ -1,108 +1,108 @@
-module Solargraph
-  module Diagnostics
-    # TypeNotDefined reports methods with undefined return types, untagged
-    # parameters, and invalid param tags.
-    #
-    class TypeNotDefined < Base
-      def diagnose source, api_map
-        result = []
-        api_map.document_symbols(source.filename).each do |pin|
-          next unless pin.kind == Pin::METHOD or pin.kind == Pin::ATTRIBUTE
-          result.concat check_return_type(pin, api_map, source)
-          result.concat check_param_types(pin, api_map, source)
-          result.concat check_param_tags(pin, api_map, source)
-        end
-        result
-      end
-
-      private
-
-      def check_return_type pin, api_map, source
-        return [] if (pin.name == 'initialize' && pin.scope == :instance) || (pin.name == 'new' && pin.scope == :class)
-        result = []
-        unless defined_return_type?(pin, api_map)
-          result.push(
-            range: extract_first_line(pin, source),
-            severity: Diagnostics::Severities::WARNING,
-            source: 'Solargraph',
-            message: "Method `#{pin.name}` has undefined return type."
-          )
-        end
-        result
-      end
-
-      def check_param_types pin, api_map, source
-        return [] if pin.name == 'new' and pin.scope == :class
-        result = []
-        pin.parameter_names.each do |par|
-          next if defined_param_type?(pin, par, api_map)
-          result.push(
-            range: extract_first_line(pin, source),
-            severity: Diagnostics::Severities::WARNING,
-            source: 'Solargraph',
-            message: "Method `#{pin.name}` has undefined param `#{par}`."
-          )
-        end
-        result
-      end
-
-      def check_param_tags pin, api_map, source
-        result = []
-        pin.docstring.tags(:param).each do |par|
-          next if pin.parameter_names.include?(par.name)
-          result.push(
-            range: extract_first_line(pin, source),
-            severity: Diagnostics::Severities::WARNING,
-            source: 'Solargraph',
-            message: "Method `#{pin.name}` has mistagged param `#{par.name}`."
-          )
-        end
-        result
-      end
-
-      def extract_first_line pin, source
-        {
-          start: {
-            line: pin.location.range.start.line,
-            character: pin.location.range.start.character
-          },
-          end: {
-            line: pin.location.range.start.line,
-            character: last_character(pin.location.range.start, source)
-          }
-        }
-      end
-
-      def defined_return_type? pin, api_map
-        return true unless pin.return_complex_type.undefined?
-        matches = api_map.get_method_stack(pin.namespace, pin.name, scope: pin.scope)
-        matches.shift
-        matches.any?{|m| !m.return_complex_type.undefined?}
-      end
-
-      def defined_param_type? pin, param, api_map
-        return true if param_in_docstring?(param, pin.docstring)
-        matches = api_map.get_method_stack(pin.namespace, pin.name, scope: pin.scope)
-        matches.shift
-        matches.each do |m|
-          next unless pin.parameter_names == m.parameter_names
-          return true if param_in_docstring?(param, m.docstring)
-        end
-        false
-      end
-
-      def param_in_docstring? param, docstring
-        tags = docstring.tags(:param)
-        tags.any?{|t| t.name == param}
-      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
+module Solargraph
+  module Diagnostics
+    # TypeNotDefined reports methods with undefined return types, untagged
+    # parameters, and invalid param tags.
+    #
+    class TypeNotDefined < Base
+      def diagnose source, api_map
+        result = []
+        api_map.document_symbols(source.filename).each do |pin|
+          next unless pin.kind == Pin::METHOD or pin.kind == Pin::ATTRIBUTE
+          result.concat check_return_type(pin, api_map, source)
+          result.concat check_param_types(pin, api_map, source)
+          result.concat check_param_tags(pin, api_map, source)
+        end
+        result
+      end
+
+      private
+
+      def check_return_type pin, api_map, source
+        return [] if (pin.name == 'initialize' && pin.scope == :instance) || (pin.name == 'new' && pin.scope == :class)
+        result = []
+        unless defined_return_type?(pin, api_map)
+          result.push(
+            range: extract_first_line(pin, source),
+            severity: Diagnostics::Severities::WARNING,
+            source: 'Solargraph',
+            message: "Method `#{pin.name}` has undefined return type."
+          )
+        end
+        result
+      end
+
+      def check_param_types pin, api_map, source
+        return [] if pin.name == 'new' and pin.scope == :class
+        result = []
+        pin.parameter_names.each do |par|
+          next if defined_param_type?(pin, par, api_map)
+          result.push(
+            range: extract_first_line(pin, source),
+            severity: Diagnostics::Severities::WARNING,
+            source: 'Solargraph',
+            message: "Method `#{pin.name}` has undefined param `#{par}`."
+          )
+        end
+        result
+      end
+
+      def check_param_tags pin, api_map, source
+        result = []
+        pin.docstring.tags(:param).each do |par|
+          next if pin.parameter_names.include?(par.name)
+          result.push(
+            range: extract_first_line(pin, source),
+            severity: Diagnostics::Severities::WARNING,
+            source: 'Solargraph',
+            message: "Method `#{pin.name}` has mistagged param `#{par.name}`."
+          )
+        end
+        result
+      end
+
+      def extract_first_line pin, source
+        {
+          start: {
+            line: pin.location.range.start.line,
+            character: pin.location.range.start.character
+          },
+          end: {
+            line: pin.location.range.start.line,
+            character: last_character(pin.location.range.start, source)
+          }
+        }
+      end
+
+      def defined_return_type? pin, api_map
+        return true unless pin.return_complex_type.undefined?
+        matches = api_map.get_method_stack(pin.namespace, pin.name, scope: pin.scope)
+        matches.shift
+        matches.any?{|m| !m.return_complex_type.undefined?}
+      end
+
+      def defined_param_type? pin, param, api_map
+        return true if param_in_docstring?(param, pin.docstring)
+        matches = api_map.get_method_stack(pin.namespace, pin.name, scope: pin.scope)
+        matches.shift
+        matches.each do |m|
+          next unless pin.parameter_names == m.parameter_names
+          return true if param_in_docstring?(param, m.docstring)
+        end
+        false
+      end
+
+      def param_in_docstring? param, docstring
+        tags = docstring.tags(:param)
+        tags.any?{|t| t.name == param}
+      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,38 +1,38 @@
-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 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
+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 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

data/lib/solargraph/language_server/completion_item_kinds.rb

@@ -1,33 +1,33 @@
-module Solargraph
-  module LanguageServer
-    # The CompletionItemKind constants for the language server protocol.
-    #
-    module CompletionItemKinds
-      TEXT = 1
-      METHOD = 2
-      FUNCTION = 3
-      CONSTRUCTOR = 4
-      FIELD = 5
-      VARIABLE = 6
-      CLASS = 7
-      INTERFACE = 8
-      MODULE = 9
-      PROPERTY = 10
-      UNIT = 11
-      VALUE = 12
-      ENUM = 13
-      KEYWORD = 14
-      SNIPPET = 15
-      COLOR = 16
-      FILE = 17
-      REFERENCE = 18
-      FOLDER = 19
-      ENUM_MEMBER = 20
-      CONSTANT = 21
-      STRUCT = 22
-      EVENT = 23
-      OPERATOR = 24
-      TYPE_PARAMETER = 25
-    end
-  end
-end
+module Solargraph
+  module LanguageServer
+    # The CompletionItemKind constants for the language server protocol.
+    #
+    module CompletionItemKinds
+      TEXT = 1
+      METHOD = 2
+      FUNCTION = 3
+      CONSTRUCTOR = 4
+      FIELD = 5
+      VARIABLE = 6
+      CLASS = 7
+      INTERFACE = 8
+      MODULE = 9
+      PROPERTY = 10
+      UNIT = 11
+      VALUE = 12
+      ENUM = 13
+      KEYWORD = 14
+      SNIPPET = 15
+      COLOR = 16
+      FILE = 17
+      REFERENCE = 18
+      FOLDER = 19
+      ENUM_MEMBER = 20
+      CONSTANT = 21
+      STRUCT = 22
+      EVENT = 23
+      OPERATOR = 24
+      TYPE_PARAMETER = 25
+    end
+  end
+end