solargraph 0.29.4 → 0.29.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60d754493bfc4ef0b40c6fd5b7c872b67e9ee5caa83930f9ede99389bb4b9007
-  data.tar.gz: '077452469bb99c0b6b7fede9bcadf8fb115d1b9889733c52170800f4b2a953f3'
+  metadata.gz: ef270f7fed3e6a6b8cae0214c0bcdd41e239bfe151951875895a5b6fa76b46f7
+  data.tar.gz: 5be38dd7aaee4533e5c60abe980176f30225e63393fb1858913c8fb4d9938802
 SHA512:
-  metadata.gz: 066a7d0a1b04ba6c9cba7cac8cbb8339a2c2b5a47bd387ab8fdc11b40a6b9ec3cd076c8f2672efb08be8d90db5df32575fea5cf3516e0d0d9e844a169b778580
-  data.tar.gz: 16a58b9ffc792406b3c95b4ab7d0b5835334a8851c6bb9ab89657606bde490c5184ca7bc5228dc122d39d70a71cb94d459d8a868bde0501c0ebba3cf6804c906
+  metadata.gz: 67036eaaafe01c834b8ce7ca20b7ec00cf302653b4dcc45221d15e64121477c938f36027990d2eed1e206f1d037a69aa835c84882753b55fec43dab402ead4e5
+  data.tar.gz: d30834378eab843bee9b637dcfe0809189100bedce3c9c71f575da5a9a361153eedb9a1b15b48b4907d4b3776b67e3da12b12c9777ff75ac0ee46a7d147dd3d2

data/lib/solargraph/api_map.rb

@@ -117,9 +117,10 @@ module Solargraph
     end
 
     # @param filename [String]
-    # @param position [Position]
+    # @param position [Position, Array(Integer, Integer)]
     # @return [Source::Cursor]
     def cursor_at filename, position
+      position = Position.normalize(position)
       raise "File not found: #{filename}" unless source_map_hash.has_key?(filename)
       source_map_hash[filename].cursor_at(position)
     end
@@ -127,9 +128,10 @@ module Solargraph
     # Get a clip by filename and position.
     #
     # @param filename [String]
-    # @param position [Position]
+    # @param position [Position, Array(Integer, Integer)]
     # @return [SourceMap::Clip]
     def clip_at filename, position
+      position = Position.normalize(position)
       SourceMap::Clip.new(self, cursor_at(filename, position))
     end
 
@@ -509,6 +511,7 @@ module Solargraph
             result.concat inner_get_methods(fqim, scope, visibility, deep, skip, true) unless fqim.nil?
           end
           result.concat inner_get_methods('Object', :instance, [:public], deep, skip, no_core)
+          result.concat inner_get_methods('BasicObject', :instance, [:public], deep, skip, no_core)
         else
           store.get_extends(fqns).reverse.each do |em|
             fqem = qualify(em, fqns)

data/lib/solargraph/api_map/source_to_yard.rb

@@ -4,58 +4,61 @@ module Solargraph
 
       # Get the YARD CodeObject at the specified path.
       #
+      # @param path [String]
       # @return [YARD::CodeObjects::Base]
       def code_object_at path
         code_object_map[path]
       end
 
+      # @return [Array<String>]
       def code_object_paths
         code_object_map.keys
       end
 
-      # @param sources [Array<Solargraph::Source>] Sources for code objects
+      # @param store [Array<Store>] ApiMap pin store
+      # @return [void]
       def rake_yard store
         code_object_map.clear
-        #sources.each do |s|
-          store.namespace_pins.each do |pin|
-            next if pin.path.nil? or pin.path.empty?
-            if pin.type == :class
-              code_object_map[pin.path] ||= YARD::CodeObjects::ClassObject.new(root_code_object, pin.path)
-            else
-              code_object_map[pin.path] ||= YARD::CodeObjects::ModuleObject.new(root_code_object, pin.path)
-            end
-            code_object_map[pin.path].docstring = pin.docstring
-            code_object_map[pin.path].files.push pin.location.filename unless pin.location.nil?
+        store.namespace_pins.each do |pin|
+          next if pin.path.nil? or pin.path.empty?
+          if pin.type == :class
+            code_object_map[pin.path] ||= YARD::CodeObjects::ClassObject.new(root_code_object, pin.path)
+          else
+            code_object_map[pin.path] ||= YARD::CodeObjects::ModuleObject.new(root_code_object, pin.path)
           end
-          store.namespace_pins.each do |pin|
-            # pin.include_references.each do |ref|
-            store.get_includes(pin.path).each do |ref|
-              code_object_map[pin.path].instance_mixins.push code_object_map[ref] unless code_object_map[ref].nil? or code_object_map[pin.path].nil?
-            end
+          code_object_map[pin.path].docstring = pin.docstring
+          code_object_map[pin.path].files.push pin.location.filename unless pin.location.nil?
+        end
+        store.namespace_pins.each do |pin|
+          # pin.include_references.each do |ref|
+          store.get_includes(pin.path).each do |ref|
+            code_object_map[pin.path].instance_mixins.push code_object_map[ref] unless code_object_map[ref].nil? or code_object_map[pin.path].nil?
           end
-          store.method_pins.each do |pin|
-            code_object_map[pin.path] ||= YARD::CodeObjects::MethodObject.new(code_object_at(pin.namespace), pin.name, pin.scope)
-            code_object_map[pin.path].docstring = pin.docstring
-            code_object_map[pin.path].visibility = pin.visibility || :public
-            code_object_map[pin.path].files.push pin.location.filename unless pin.location.nil?
-            code_object_map[pin.path].parameters = pin.parameters.map do |p|
-              n = p.match(/^[a-z0-9_]*:?/i)[0]
-              v = nil
-              if p.length > n.length
-                v = p[n.length..-1].gsub(/^ = /, '')
-              end
-              [n, v]
+        end
+        store.method_pins.each do |pin|
+          code_object_map[pin.path] ||= YARD::CodeObjects::MethodObject.new(code_object_at(pin.namespace), pin.name, pin.scope)
+          code_object_map[pin.path].docstring = pin.docstring
+          code_object_map[pin.path].visibility = pin.visibility || :public
+          code_object_map[pin.path].files.push pin.location.filename unless pin.location.nil?
+          code_object_map[pin.path].parameters = pin.parameters.map do |p|
+            n = p.match(/^[a-z0-9_]*:?/i)[0]
+            v = nil
+            if p.length > n.length
+              v = p[n.length..-1].gsub(/^ = /, '')
             end
+            [n, v]
           end
-        #end
+        end
       end
 
       private
 
+      # @return [Hash]
       def code_object_map
         @code_object_map ||= {}
       end
 
+      # @return [YARD::CodeObjects::RootObject]
       def root_code_object
         @root_code_object ||= YARD::CodeObjects::RootObject.new(nil, 'root')
       end

data/lib/solargraph/api_map/store.rb

@@ -53,11 +53,8 @@ module Solargraph
       # @param path [String]
       # @return [Array<Solargraph::Pin::Base>]
       def get_path_pins path
-        # return [] if path.nil? # @todo Should be '' instead?
-        path ||= ''
-        base = path.sub(/(#|\.|::)[a-z0-9_]*(\?|\!)?$/i, '')
-        base = '' if base == path
-        namespace_children(base).select{ |pin| pin.path == path }
+        return [] if path.nil? # @todo Should be '' instead?
+        pins.select { |pin| pin.path == path }
       end
 
       # @param fqns [String]
@@ -109,6 +106,7 @@ module Solargraph
         result
       end
 
+      # @return [Hash]
       def named_macros
         @named_macros ||= begin
           result = {}
@@ -157,7 +155,7 @@ module Solargraph
       end
 
       # @param name [String]
-      # @return [Array<Solargraph::Pin::Namespace>]
+      # @return [Array<Solargraph::Pin::Base>]
       def namespace_children name
         namespace_map[name] || []
       end

data/lib/solargraph/complex_type/type_methods.rb

@@ -93,7 +93,11 @@ module Solargraph
       def qualify api_map, context = ''
         return ComplexType.parse(tag) if duck_type? or void? or undefined?
         fqns = api_map.qualify(name, context)
-        return ComplexType::UNDEFINED if fqns.nil?
+        # return ComplexType::UNDEFINED if fqns.nil?
+        if fqns.nil?
+          return ComplexType.parse('Boolean') if tag == 'Boolean'
+          return ComplexType::UNDEFINED
+        end
         ltypes = key_types.map do |t|
           t.qualify api_map, context
         end

data/lib/solargraph/diagnostics/type_not_defined.rb

@@ -18,7 +18,7 @@ module Solargraph
       private
 
       def check_return_type pin, api_map, source
-        return [] if (pin.name == 'initialize' and pin.scope == :instance) or (pin.name == 'new' and pin.scope == :class)
+        return [] if (pin.name == 'initialize' && pin.scope == :instance) || (pin.name == 'new' && pin.scope == :class)
         result = []
         unless defined_return_type?(pin, api_map)
           result.push(

data/lib/solargraph/language_server/message/extended/check_gem_version.rb

@@ -9,44 +9,76 @@ module Solargraph
         # is true, notify the client when the gem is up to date.
         #
         class CheckGemVersion < Base
+          GEM_ZERO = Gem::Version.new('0.0.0')
+
+          def initialize host, request, current: Gem::Version.new(Solargraph::VERSION), available: nil
+            super(host, request)
+            @current = current
+            @available = available
+          end
+
           def process
-            begin
-              fetcher = Gem::SpecFetcher.new
-              tuple = fetcher.search_for_dependency(Gem::Dependency.new('solargraph')).flatten.first
-              if tuple.nil?
-                msg = 'An error occurred checking the Solargraph gem version.'
-                STDERR.puts msg
-                host.show_message(msg, MessageTypes::ERROR)
-              else
-                available = Gem::Version.new(tuple.version)
-                current = Gem::Version.new(Solargraph::VERSION)
-                if available > current
-                  host.show_message_request "Solargraph gem version #{available} is available.",
-                                            LanguageServer::MessageTypes::INFO,
-                                            ['Update now'] do |result|
-                                              next unless result == 'Update now'
-                                              o, s = Open3.capture2("gem update solargraph")
-                                              if s == 0
-                                                host.show_message 'Successfully updated the Solargraph gem.', LanguageServer::MessageTypes::INFO
-                                                host.send_notification '$/solargraph/restart', {}
-                                              else
-                                                host.show_message 'An error occurred while updating the gem.', LanguageServer::MessageTypes::ERROR
-                                              end
+            if available > GEM_ZERO
+              if available > current
+                host.show_message_request "Solargraph gem version #{available} is available. (Current version: #{current})",
+                                          LanguageServer::MessageTypes::INFO,
+                                          ['Update now'] do |result|
+                                            next unless result == 'Update now'
+                                            o, s = Open3.capture2("gem update solargraph")
+                                            if s == 0
+                                              host.show_message 'Successfully updated the Solargraph gem.', LanguageServer::MessageTypes::INFO
+                                              host.send_notification '$/solargraph/restart', {}
+                                            else
+                                              host.show_message 'An error occurred while updating the gem.', LanguageServer::MessageTypes::ERROR
                                             end
-                elsif params['verbose']
-                  host.show_message "The Solargraph gem is up to date (version #{Solargraph::VERSION})."
+                                          end
+              elsif params['verbose']
+                host.show_message "The Solargraph gem is up to date (version #{Solargraph::VERSION})."
+              end
+            elsif fetched?
+              STDERR.puts error
+              host.show_message(error, MessageTypes::ERROR) if params['verbose']
+            end
+            set_result({
+              installed: current,
+              available: available
+            })
+          end
+
+          private
+
+          # @return [Gem::Version]
+          attr_reader :current
+
+          # @return [Gem::Version]
+          def available
+            if !@available && !@fetched
+              @fetched = true
+              begin
+                @available ||= begin
+                  fetcher = Gem::SpecFetcher.new
+                  tuple = fetcher.search_for_dependency(Gem::Dependency.new('solargraph')).flatten.first
+                  if tuple.nil?
+                    @error = 'An error occurred fetching the gem data'
+                    GEM_ZERO
+                  else
+                    tuple.version
+                  end
                 end
-                set_result({
-                  installed: current,
-                  available: available
-                })
+              rescue Errno::EADDRNOTAVAIL => e
+                @error = "Unable to connect to gem source: #{e.message}"
+                GEM_ZERO
               end
-            rescue Errno::EADDRNOTAVAIL => e
-              msg = "Unable to connect to gem source: #{e.message}"
-              STDERR.puts msg
-              host.show_message(msg, MessageTypes::ERROR) if params['verbose']
             end
+            @available
           end
+
+          def fetched?
+            @fetched ||= false
+          end
+
+          # @return [String, nil]
+          attr_reader :error
         end
       end
     end

data/lib/solargraph/library.rb

@@ -2,9 +2,11 @@ module Solargraph
   # A Library handles coordination between a Workspace and an ApiMap.
   #
   class Library
+    # @return [Solargraph::Workspace]
+    attr_reader :workspace
+
     # @param workspace [Solargraph::Workspace]
     def initialize workspace = Solargraph::Workspace.new
-      @mutex = Mutex.new
       @workspace = workspace
       api_map.catalog bundle
       @synchronized = true
@@ -30,7 +32,8 @@ module Solargraph
         source = Solargraph::Source.load_string(text, filename, version)
         workspace.merge source
         open_file_hash[filename] = source
-        catalog #unless api_map.try_merge!(source)
+        checkout filename
+        catalog
       end
     end
 
@@ -51,8 +54,8 @@ module Solargraph
       workspace.has_file?(filename)
     end
 
-    # Create a source to be added to the workspace. The file is ignored if the
-    # workspace is not configured to include the file.
+    # Create a source to be added to the workspace. The file is ignored if it is
+    # neither open in the library nor included in the workspace.
     #
     # @param filename [String]
     # @param text [String] The contents of the file
@@ -60,28 +63,30 @@ module Solargraph
     def create filename, text
       result = false
       mutex.synchronize do
-        next unless workspace.would_merge?(filename)
+        next unless contain?(filename) || open?(filename) || workspace.would_merge?(filename)
         source = Solargraph::Source.load_string(text, filename)
         workspace.merge(source)
-        catalog #unless api_map.try_merge!(source)
+        catalog
         result = true
       end
       result
     end
 
-    # Create a file source from a file on disk. The file is ignored if the
-    # workspace is not configured to include the file.
+    # Create a file source from a file on disk. The file is ignored if it is
+    # neither open in the library nor included in the workspace.
     #
     # @param filename [String]
     # @return [Boolean] True if the file was added to the workspace.
     def create_from_disk filename
       result = false
       mutex.synchronize do
-        next if File.directory?(filename) or !File.exist?(filename)
-        next unless workspace.would_merge?(filename)
+        next if File.directory?(filename) || !File.exist?(filename)
+        next unless contain?(filename) || open?(filename) || workspace.would_merge?(filename)
         source = Solargraph::Source.load_string(File.read(filename), filename)
         workspace.merge(source)
-        catalog #unless api_map.try_merge!(source)
+        open_file_hash[filename] = source if open_file_hash.key?(filename)
+        @current = source if @current && @current.filename == source.filename
+        catalog
         result = true
       end
       result
@@ -179,9 +184,9 @@ module Solargraph
               Solargraph::Location.new(loc.filename, Solargraph::Range.from_to(loc.range.start.line, loc.range.start.column + match[0].length, loc.range.ending.line, loc.range.ending.column))
             end
           end
-          result.concat(found.sort{ |a, b|
+          result.concat(found.sort do |a, b|
             a.range.start.line <=> b.range.start.line
-          })
+          end)
         end
       end
       result
@@ -214,7 +219,9 @@ module Solargraph
     # @param filename [String]
     # @return [Source]
     def checkout filename
-      read filename
+      @current = read(filename)
+      catalog
+      @current
     end
 
     # @param query [String]
@@ -246,7 +253,7 @@ module Solargraph
     # @param filename [String]
     # @return [Array<Solargraph::Pin::Base>]
     def document_symbols filename
-      return [] unless open_file_hash.has_key?(filename)
+      return [] unless open_file_hash.key?(filename)
       api_map.document_symbols(filename)
     end
 
@@ -274,6 +281,7 @@ module Solargraph
           raise FileNotFoundError, "Unable to update #{updater.filename}" unless open?(updater.filename)
           open_file_hash[updater.filename] = open_file_hash[updater.filename].synchronize(updater)
         end
+        @current = open_file_hash[updater.filename] if @current && @current.filename == updater.filename
         @synchronized = false
       end
     end
@@ -325,31 +333,23 @@ module Solargraph
     private
 
     # @return [Mutex]
-    attr_reader :mutex
+    def mutex
+      @mutex ||= Mutex.new
+    end
 
     # @return [ApiMap]
     def api_map
       @api_map ||= Solargraph::ApiMap.new
     end
 
-    # @return [YardMap]
-    def yard_map
-      @yard_map ||= Solargraph::YardMap.new
-    end
-
     # @return [Bundle]
     def bundle
       Bundle.new(
         workspace: workspace,
-        opened: open_file_hash.values
+        opened: @current ? [@current] : []
       )
     end
 
-    # @return [Solargraph::Workspace]
-    def workspace
-      @workspace
-    end
-
     # A collection of files that are currently open in the library. Open
     # files do not need to be in the workspace.
     #
@@ -367,7 +367,7 @@ module Solargraph
     # @param filename [String]
     # @return [Solargraph::Source]
     def read filename
-      return open_file_hash[filename] if open_file_hash.has_key?(filename)
+      return open_file_hash[filename] if open_file_hash.key?(filename)
       raise FileNotFoundError, "File not found: #{filename}" unless workspace.has_file?(filename)
       workspace.source(filename)
     end