solargraph 0.46.0 → 0.47.1

data/lib/solargraph/bench.rb

@@ -1,27 +1,27 @@
-# frozen_string_literal: true
-
-require 'set'
-
-module Solargraph
-  # A container of source maps and workspace data to be cataloged in an ApiMap.
-  #
-  class Bench
-    # @return [Set<SourceMap>]
-    attr_reader :source_maps
-
-    # @return [Workspace]
-    attr_reader :workspace
-
-    # @return [Set<String>]
-    attr_reader :external_requires
-
-    # @param source_maps [Array<SourceMap>, Set<SourceMap>]
-    # @param workspace [Workspace]
-    # @param external_requires [Array<String>, Set<String>]
-    def initialize source_maps: [], workspace: Workspace.new, external_requires: []
-      @source_maps = source_maps.to_set
-      @workspace = workspace
-      @external_requires = external_requires.to_set
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'set'
+
+module Solargraph
+  # A container of source maps and workspace data to be cataloged in an ApiMap.
+  #
+  class Bench
+    # @return [Set<SourceMap>]
+    attr_reader :source_maps
+
+    # @return [Workspace]
+    attr_reader :workspace
+
+    # @return [Set<String>]
+    attr_reader :external_requires
+
+    # @param source_maps [Array<SourceMap>, Set<SourceMap>]
+    # @param workspace [Workspace]
+    # @param external_requires [Array<String>, Set<String>]
+    def initialize source_maps: [], workspace: Workspace.new, external_requires: []
+      @source_maps = source_maps.to_set
+      @workspace = workspace
+      @external_requires = external_requires.to_set
+    end
+  end
+end

data/lib/solargraph/compat.rb

@@ -1,37 +1,37 @@
-unless Hash.method_defined?(:transform_keys)
-  class Hash
-    def transform_keys &block
-      result = {}
-      each_pair do |k, v|
-        result[block.call(k)] = v
-      end
-      result
-    end
-  end
-end
-
-unless Hash.method_defined?(:transform_values)
-  class Hash
-    def transform_values &block
-      result = {}
-      each_pair do |k, v|
-        result[k] = block.call(v)
-      end
-      result
-    end
-  end
-end
-
-unless Array.method_defined?(:sum)
-  class Array
-    def sum &block
-      inject(0) do |s, x|
-        if block
-          s + block.call(x)
-        else
-          s + x
-        end
-      end
-    end
-  end
-end
+unless Hash.method_defined?(:transform_keys)
+  class Hash
+    def transform_keys &block
+      result = {}
+      each_pair do |k, v|
+        result[block.call(k)] = v
+      end
+      result
+    end
+  end
+end
+
+unless Hash.method_defined?(:transform_values)
+  class Hash
+    def transform_values &block
+      result = {}
+      each_pair do |k, v|
+        result[k] = block.call(v)
+      end
+      result
+    end
+  end
+end
+
+unless Array.method_defined?(:sum)
+  class Array
+    def sum &block
+      inject(0) do |s, x|
+        if block
+          s + block.call(x)
+        else
+          s + x
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/complex_type/type_methods.rb

@@ -1,130 +1,130 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class ComplexType
-    # Methods for accessing type data.
-    #
-    module TypeMethods
-      # @return [String]
-      attr_reader :name
-
-      # @return [String]
-      attr_reader :substring
-
-      # @return [String]
-      attr_reader :tag
-
-      # @return [Array<ComplexType>]
-      attr_reader :subtypes
-
-      # @return [Boolean]
-      def duck_type?
-        @duck_type ||= name.start_with?('#')
-      end
-
-      # @return [Boolean]
-      def nil_type?
-        @nil_type = (name.casecmp('nil') == 0) if @nil_type.nil?
-        @nil_type
-      end
-
-      # @return [Boolean]
-      def parameters?
-        !substring.empty?
-      end
-
-      def void?
-        name == 'void'
-      end
-
-      def defined?
-        !undefined?
-      end
-
-      def undefined?
-        name == 'undefined'
-      end
-
-      # @return [Boolean]
-      def list_parameters?
-        substring.start_with?('<')
-      end
-
-      # @return [Boolean]
-      def fixed_parameters?
-        substring.start_with?('(')
-      end
-
-      # @return [Boolean]
-      def hash_parameters?
-        substring.start_with?('{')
-      end
-
-      # @return [Array<ComplexType>]
-      def value_types
-        @subtypes
-      end
-
-      # @return [Array<ComplexType>]
-      def key_types
-        @key_types
-      end
-
-      # @return [String]
-      def namespace
-        # if priority higher than ||=, old implements cause unnecessary check
-        @namespace ||= lambda do
-          return 'Object' if duck_type?
-          return 'NilClass' if nil_type?
-          return (name == 'Class' || name == 'Module') && !subtypes.empty? ? subtypes.first.name : name
-        end.call
-      end
-
-      # @return [Symbol] :class or :instance
-      def scope
-        @scope ||= :instance if duck_type? || nil_type?
-        @scope ||= (name == 'Class' || name == 'Module') && !subtypes.empty? ? :class : :instance
-      end
-
-      def == other
-        return false unless self.class == other.class
-        tag == other.tag
-      end
-
-      def rooted?
-        @rooted
-      end
-
-      # Generate a ComplexType that fully qualifies this type's namespaces.
-      #
-      # @param api_map [ApiMap] The ApiMap that performs qualification
-      # @param context [String] The namespace from which to resolve names
-      # @return [ComplexType] The generated ComplexType
-      def qualify api_map, context = ''
-        return ComplexType.new([self]) if duck_type? || void? || undefined?
-        recon = (rooted? ? '' : context)
-        fqns = api_map.qualify(name, recon)
-        if fqns.nil?
-          return UniqueType::BOOLEAN if tag == 'Boolean'
-          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
-        if list_parameters?
-          Solargraph::ComplexType.parse("#{fqns}<#{rtypes.map(&:tag).join(', ')}>")
-        elsif fixed_parameters?
-          Solargraph::ComplexType.parse("#{fqns}(#{rtypes.map(&:tag).join(', ')})")
-        elsif hash_parameters?
-          Solargraph::ComplexType.parse("#{fqns}{#{ltypes.map(&:tag).join(', ')} => #{rtypes.map(&:tag).join(', ')}}")
-        else
-          Solargraph::ComplexType.parse(fqns)
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class ComplexType
+    # Methods for accessing type data.
+    #
+    module TypeMethods
+      # @return [String]
+      attr_reader :name
+
+      # @return [String]
+      attr_reader :substring
+
+      # @return [String]
+      attr_reader :tag
+
+      # @return [Array<ComplexType>]
+      attr_reader :subtypes
+
+      # @return [Boolean]
+      def duck_type?
+        @duck_type ||= name.start_with?('#')
+      end
+
+      # @return [Boolean]
+      def nil_type?
+        @nil_type = (name.casecmp('nil') == 0) if @nil_type.nil?
+        @nil_type
+      end
+
+      # @return [Boolean]
+      def parameters?
+        !substring.empty?
+      end
+
+      def void?
+        name == 'void'
+      end
+
+      def defined?
+        !undefined?
+      end
+
+      def undefined?
+        name == 'undefined'
+      end
+
+      # @return [Boolean]
+      def list_parameters?
+        substring.start_with?('<')
+      end
+
+      # @return [Boolean]
+      def fixed_parameters?
+        substring.start_with?('(')
+      end
+
+      # @return [Boolean]
+      def hash_parameters?
+        substring.start_with?('{')
+      end
+
+      # @return [Array<ComplexType>]
+      def value_types
+        @subtypes
+      end
+
+      # @return [Array<ComplexType>]
+      def key_types
+        @key_types
+      end
+
+      # @return [String]
+      def namespace
+        # if priority higher than ||=, old implements cause unnecessary check
+        @namespace ||= lambda do
+          return 'Object' if duck_type?
+          return 'NilClass' if nil_type?
+          return (name == 'Class' || name == 'Module') && !subtypes.empty? ? subtypes.first.name : name
+        end.call
+      end
+
+      # @return [Symbol] :class or :instance
+      def scope
+        @scope ||= :instance if duck_type? || nil_type?
+        @scope ||= (name == 'Class' || name == 'Module') && !subtypes.empty? ? :class : :instance
+      end
+
+      def == other
+        return false unless self.class == other.class
+        tag == other.tag
+      end
+
+      def rooted?
+        @rooted
+      end
+
+      # Generate a ComplexType that fully qualifies this type's namespaces.
+      #
+      # @param api_map [ApiMap] The ApiMap that performs qualification
+      # @param context [String] The namespace from which to resolve names
+      # @return [ComplexType] The generated ComplexType
+      def qualify api_map, context = ''
+        return ComplexType.new([self]) if duck_type? || void? || undefined?
+        recon = (rooted? ? '' : context)
+        fqns = api_map.qualify(name, recon)
+        if fqns.nil?
+          return UniqueType::BOOLEAN if tag == 'Boolean'
+          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
+        if list_parameters?
+          Solargraph::ComplexType.parse("#{fqns}<#{rtypes.map(&:tag).join(', ')}>")
+        elsif fixed_parameters?
+          Solargraph::ComplexType.parse("#{fqns}(#{rtypes.map(&:tag).join(', ')})")
+        elsif hash_parameters?
+          Solargraph::ComplexType.parse("#{fqns}{#{ltypes.map(&:tag).join(', ')} => #{rtypes.map(&:tag).join(', ')}}")
+        else
+          Solargraph::ComplexType.parse(fqns)
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/complex_type/unique_type.rb

@@ -1,75 +1,75 @@
-# frozen_string_literal: true
-
-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?
-        if @substring.start_with?('<(') && @substring.end_with?(')>')
-          subs = ComplexType.parse(substring[2..-3], partial: true)
-        else
-          subs = ComplexType.parse(substring[1..-2], partial: true)
-        end
-        if hash_parameters?
-          raise ComplexTypeError, "Bad hash type" unless !subs.is_a?(ComplexType) and subs.length == 2 and !subs[0].is_a?(UniqueType) and !subs[1].is_a?(UniqueType)
-          @key_types.concat subs[0].map { |u| ComplexType.new([u]) }
-          @subtypes.concat subs[1].map { |u| ComplexType.new([u]) }
-        else
-          @subtypes.concat subs
-        end
-      end
-
-      def to_s
-        tag
-      end
-
-      def self_to dst
-        return self unless selfy?
-        new_name = (@name == 'self' ? dst : @name)
-        new_key_types = @key_types.map { |t| t.self_to dst }
-        new_subtypes = @subtypes.map { |t| t.self_to dst }
-        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
-      end
-
-      def selfy?
-        @name == 'self' || @key_types.any?(&:selfy?) || @subtypes.any?(&:selfy?)
-      end
-
-      UNDEFINED = UniqueType.new('undefined')
-      BOOLEAN = UniqueType.new('Boolean')
-    end
-  end
-end
+# frozen_string_literal: true
+
+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?
+        if @substring.start_with?('<(') && @substring.end_with?(')>')
+          subs = ComplexType.parse(substring[2..-3], partial: true)
+        else
+          subs = ComplexType.parse(substring[1..-2], partial: true)
+        end
+        if hash_parameters?
+          raise ComplexTypeError, "Bad hash type" unless !subs.is_a?(ComplexType) and subs.length == 2 and !subs[0].is_a?(UniqueType) and !subs[1].is_a?(UniqueType)
+          @key_types.concat subs[0].map { |u| ComplexType.new([u]) }
+          @subtypes.concat subs[1].map { |u| ComplexType.new([u]) }
+        else
+          @subtypes.concat subs
+        end
+      end
+
+      def to_s
+        tag
+      end
+
+      def self_to dst
+        return self unless selfy?
+        new_name = (@name == 'self' ? dst : @name)
+        new_key_types = @key_types.map { |t| t.self_to dst }
+        new_subtypes = @subtypes.map { |t| t.self_to dst }
+        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
+      end
+
+      def selfy?
+        @name == 'self' || @key_types.any?(&:selfy?) || @subtypes.any?(&:selfy?)
+      end
+
+      UNDEFINED = UniqueType.new('undefined')
+      BOOLEAN = UniqueType.new('Boolean')
+    end
+  end
+end