solargraph 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efdf4fdf971f5d10e148b73902701dae0ce549ef38f7304455fefba0465f4e90
-  data.tar.gz: 49c3fcc4fb9c3ad339e7e08c256275ac73907edc62f239a4b315938c18b68661
+  metadata.gz: 2bd332c0e24354eee990335169e5d861e470714cf3f3431b41c5d7e184f33035
+  data.tar.gz: a4ce050c8e2e9ef1990c9be69dc2a4a6457cf27bc9b7ba85168014c30da77480
 SHA512:
-  metadata.gz: d3bddec5d8f6f083905349634b6a36144b5e069b1b94abf0d2ab3e3f074e8bc851ceb79a6d42cee9b2aa9af4645f3ed04347228a16db08fc3b94b7ff974aa0e3
-  data.tar.gz: 6b384c71d2a38c4e5cd02cabb2801d0b57cf5c5f2eb81d63cb56e37fb90b24c030d308cd2e75dc3977963841d1dfcb1f1e33eb8f220a759b83580296c40fb413
+  metadata.gz: 9cd5cfb006e654069b88c596dea33d6be250bda7569a1193c834336345fa927d0b28b48fdfa5c37f68f3ce56ffc6cf6e647cda4e6184cbb566e8ad68ef3ac339
+  data.tar.gz: 9846d874b79d01132a0fdb8ad7dd6f0cf81682a1fb9e1f3d72602d8ca3330380fba455f9c4d7f9e624bb40b2dff21d39fcef42c4273832c549b296c4a98b4a24

data/lib/solargraph.rb

@@ -8,6 +8,7 @@ module Solargraph
   class DiagnosticsError <        RuntimeError;  end
   class FileNotFoundError <       RuntimeError;  end
   class SourceNotAvailableError < StandardError; end
+  class ComplexTypeError        < StandardError; end
   class WorkspaceTooLargeError <  RuntimeError
     # @return [Integer]
     attr_reader :size

data/lib/solargraph/api_map.rb

@@ -629,10 +629,12 @@ module Solargraph
       @path_macros ||= {}
     end
 
+    # @return [Array<Solargraph::Source>]
     def current_workspace_sources
       @sources - [@virtual_source]
     end
 
+    # @return [String]
     def inner_qualify name, root, skip
       return nil if name.nil?
       return nil if skip.include?(root)

data/lib/solargraph/complex_type.rb

@@ -21,10 +21,19 @@ module Solargraph
     def initialize name, substring = ''
       @name = name
       @substring = substring
-      @tag = name
-      @tag += "<#{substring}>" unless substring.empty?
+      @tag = name + substring
+      @key_types = []
       @subtypes = []
-      @subtypes.concat(ComplexType.parse(substring)) unless substring.empty?
+      if parameters?
+        subs = ComplexType.parse(substring[1..-2])
+        if hash_parameters?
+          raise ComplexTypeError, "Bad hash type" unless subs.length == 2 and subs[0].is_a?(Array) and subs[1].is_a?(Array)
+          @key_types.concat subs[0]
+          @subtypes.concat subs[1]
+        else
+          @subtypes.concat subs
+        end
+      end
     end
 
     # @return [Boolean]
@@ -37,6 +46,36 @@ module Solargraph
       @nil_type ||= (name.downcase == 'nil')
     end
 
+    # @return [Boolean]
+    def parameters?
+      !substring.empty?
+    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
       @namespace ||= 'Object' if duck_type?
@@ -60,37 +99,70 @@ module Solargraph
       # @return [Array<ComplexType>]
       def parse *strings
         types = []
+        key_types = nil
         strings.each do |type_string|
           point_stack = 0
           curly_stack = 0
+          paren_stack = 0
           base = ''
           subtype_string = ''
           type_string.each_char do |char|
-            if char == '<'
+            if char == '='
+              #raise ComplexTypeError, "Invalid = in type #{type_string}" unless curly_stack > 0
+            elsif char == '<'
               point_stack += 1
-              next if point_stack == 1
             elsif char == '>'
-              point_stack -= 1
-              raise "Invalid close in type #{type_string}" if point_stack < 0
+              if subtype_string.end_with?('=') and curly_stack > 0
+                subtype_string += char
+              elsif base.end_with?('=')
+                raise ComplexTypeError, "Invalid hash thing" unless key_types.nil?
+                types.push ComplexType.new(base[0..-2].strip)
+                key_types = types
+                types = []
+                base = ''
+                subtype_string = ''
+                next
+              else
+                point_stack -= 1
+                subtype_string += char if point_stack == 0
+                raise ComplexTypeError, "Invalid close in type #{type_string}" if point_stack < 0
+              end
+              next
             elsif char == '{'
-              # @todo Temporarily short-circuiting types with {}
-              break
-            elsif char == ',' and point_stack == 0
+              curly_stack += 1
+            elsif char == '}'
+              curly_stack -= 1
+              subtype_string += char
+              raise ComplexTypeError, "Invalid close in type #{type_string}" if curly_stack < 0
+              # types.push ComplexType.parse(subtype_string[1..-2]) if curly_stack == 0
+              next
+            elsif char == '('
+              paren_stack += 1
+            elsif char == ')'
+              paren_stack -= 1
+              subtype_string += char if paren_stack == 0
+              raise ComplexTypeError, "Invalid close in type #{type_string}" if paren_stack < 0
+              next
+            elsif char == ',' and point_stack == 0 and curly_stack == 0 and paren_stack == 0
               types.push ComplexType.new base.strip, subtype_string.strip
               base = ''
               subtype_string = ''
               next
             end
-            if point_stack == 0 and char != '>'
+            if point_stack == 0 and curly_stack == 0 and paren_stack == 0
               base += char 
-            elsif point_stack != 0
+            else
               subtype_string += char
             end
           end
           base.strip!
           subtype_string.strip!
-          raise 'Unclosed subtype' if point_stack != 0
-          types.push ComplexType.new base, subtype_string
+          raise ComplexTypeError, "Unclosed subtype in #{type_string}" if point_stack != 0 or curly_stack != 0 or paren_stack != 0
+          types.push ComplexType.new(base, subtype_string)
+        end
+        unless key_types.nil?
+          return key_types if types.empty?
+          return [key_types, types]
         end
         types
       end

data/lib/solargraph/language_server/host.rb

@@ -492,17 +492,17 @@ module Solargraph
                     @diagnostics_queue.push change['textDocument']['uri']
                     changed = true
                     next true
-                  # elsif change['textDocument']['version'] == source.version + 1 #and change['contentChanges'].length == 0
-                  #   # HACK: This condition fixes the fact that formatting
-                  #   # increments the version by one regardless of the number
-                  #   # of changes
-                  #   STDERR.puts "Warning: change applied to #{uri_to_file(change['textDocument']['uri'])} is possibly out of sync"
-                  #   pending[change['textDocument']['uri']] -= 1
-                  #   updater = generate_updater(change)
-                  #   library.synchronize updater, pending[change['textDocument']['uri']] == 0
-                  #   @diagnostics_queue.push change['textDocument']['uri']
-                  #   changed = true
-                  #   next true
+                  elsif change['textDocument']['version'] == source.version + 1
+                    # HACK: This condition fixes the fact that certain changes
+                    # increment the version by one regardless of the number of
+                    # changes
+                    STDERR.puts "Warning: change applied to #{uri_to_file(change['textDocument']['uri'])} is possibly out of sync"
+                    pending[change['textDocument']['uri']] -= 1
+                    updater = generate_updater(change)
+                    library.synchronize updater, pending[change['textDocument']['uri']] == 0
+                    @diagnostics_queue.push change['textDocument']['uri']
+                    changed = true
+                    next true
                   elsif change['textDocument']['version'] <= source.version
                     # @todo Is deleting outdated changes correct behavior?
                     STDERR.puts "Warning: outdated change to #{change['textDocument']['uri']} was ignored"
@@ -510,6 +510,7 @@ module Solargraph
                     next true
                   else
                     # @todo Change is out of order. Save it for later
+                    STDERR.puts "Skipping out of order change to #{change['textDocument']['uri']}"
                     next false
                   end
                 end

data/lib/solargraph/pin/method.rb

@@ -72,6 +72,7 @@ module Solargraph
 
       private
 
+      # @return [Array<ComplexType>]
       def generate_complex_types
         tag = docstring.tag(:return)
         if tag.nil?
@@ -79,7 +80,12 @@ module Solargraph
           tag = ol.tag(:return) unless ol.nil?
         end
         return [] if tag.nil?
-        ComplexType.parse *tag.types
+        begin
+          ComplexType.parse *tag.types
+        rescue Solargraph::ComplexTypeError => e
+          STDERR.puts e.message
+          []
+        end
       end
     end
   end

data/lib/solargraph/source.rb

@@ -343,6 +343,7 @@ module Solargraph
       @locals = new_locals
       @requires = new_requires
       @symbols = new_symbols
+      @all_symbols = nil # Reset for future queries
       @domains = []
       @path_macros = {}
       dirpins = []

data/lib/solargraph/source/fragment.rb

@@ -84,7 +84,7 @@ module Solargraph
       #
       # @return [String]
       def signature
-        @signature ||= signature_data[1]
+        @signature ||= signature_data[1].to_s
       end
 
       def valid?
@@ -128,7 +128,7 @@ module Solargraph
 
       # @return [String]
       def chain
-        @chain ||= signature.split('.')[1..-1].join('.')
+        @chain ||= ( signature.empty? ? '' : signature.split('.')[1..-1].join('.') )
       end
 
       # @return [String]
@@ -393,7 +393,7 @@ module Solargraph
       # @param index [Integer]
       # @return [String]
       def word_at index
-        @code[beginning_of_word_at(index)..index - 1]
+        @code[beginning_of_word_at(index)..index - 1].to_s
       end
 
       def beginning_of_word_at index
@@ -442,6 +442,7 @@ module Solargraph
         Solargraph::Source::Range.from_to(start_pos[0], start_pos[1], end_pos[0], end_pos[1])
       end
 
+      # @return [String]
       def remainder_at index
         cursor = index
         while cursor < @code.length
@@ -450,7 +451,7 @@ module Solargraph
           break unless char.match(/[a-z0-9_\?\!]/i)
           cursor += 1
         end
-        @code[index..cursor-1]
+        @code[index..cursor-1].to_s
       end
 
       def signature_position

data/lib/solargraph/source/mapper.rb

@@ -50,9 +50,13 @@ module Solargraph
       # @param node [Parser::AST::Node]
       # @return [String]
       def code_for node
+        # @todo Using node locations on code with converted EOLs seems
+        #   slightly more efficient than calculating offsets.
         b = node.location.expression.begin.begin_pos
         e = node.location.expression.end.end_pos
-        frag = @code[b..e-1].to_s
+        # b = Source::Position.line_char_to_offset(@code, node.location.line - 1, node.location.column)
+        # e = Source::Position.line_char_to_offset(@code, node.location.last_line - 1, node.location.last_column)
+        frag = source_from_parser[b..e-1].to_s
         frag.strip.gsub(/,$/, '')
       end
 
@@ -406,6 +410,10 @@ module Solargraph
         }
         args
       end
+
+      def source_from_parser
+        @source_from_parser ||= @code.gsub(/\r\n/, "\n")
+      end
     end
   end
 end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.25.0'
+  VERSION = '0.25.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser