yoda-language-server 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1135858460f719a79d288fd6210011d1380f39ecedf817b06277aa400277e79
-  data.tar.gz: 5fa3c98c453be13419c9e3225d5cbeea81ee1103e77812a1097f251f29c4a39d
+  metadata.gz: 715586351d4d461d35dd89cd858dcc1f886508e7b8ed1f8ba82c071130ecb7d7
+  data.tar.gz: 932d126f234752431363cabdc461c8c2abfc7546293134074986e08678427914
 SHA512:
-  metadata.gz: 6dffa44d4bb6dbe751fdb34c0f47ea2b371deae46e22b85da27dc0c2c57938d8203f593b0990cea379dc708d34c060173dff6c512e2603edc98808d9131b9026
-  data.tar.gz: 2df74769182891b2ef9926a89abf8e8487e4a734a87719ead05374c3bc6b52db53ec4b3f01186de03af60bbf5f54bb1a323a3803a908d78f106fbd3a3d874b90
+  metadata.gz: 57e1304da036c27fc3f945c92cfe4bb7ac7d9c0d22f30cf4b6664bf647e833f62c6df31cb5618094c63824b58769648739bcd7771ffb7163310c017f9fbb9604
+  data.tar.gz: 6c76098551ddcd5be50d022ba649acc527bc0c173fbc49322add37914e91cc12fc479c928fabb43d7f2954dd94fab0c7d3660fdf2ce485f6d863fe9af7619ba5

data/lib/yoda/parsing/location.rb

@@ -4,7 +4,7 @@ module Yoda
       include Comparable
 
       # @todo Make this 0-indexed.
-      # @return [Integer] 0-indexed column number.
+      # @return [Integer] 1-indexed column number.
       attr_reader :row
 
       # @return [Integer] 0-indexed column number.

data/lib/yoda/store/objects/class_object.rb

@@ -2,7 +2,7 @@ module Yoda
   module Store
     module Objects
       class ClassObject < NamespaceObject
-        # @return [ScopedPath, nil]
+        # @return [Path, nil]
         attr_reader :superclass_path
 
         # @return [Array<Symbol>]
@@ -15,7 +15,7 @@ module Yoda
         def initialize(superclass_path: nil, **kwargs)
           super(kwargs)
 
-          @superclass_path = Model::ScopedPath.new(Objects.lexical_scopes_of(path), superclass_path) if superclass_path
+          @superclass_path = Model::Path.new(superclass_path) if superclass_path
         end
 
         def kind
@@ -23,7 +23,7 @@ module Yoda
         end
 
         def to_h
-          super.merge(superclass_path: superclass_path&.path&.to_s)
+          super.merge(superclass_path: superclass_path&.to_s)
         end
 
         private
@@ -32,14 +32,14 @@ module Yoda
         # @return [Hash]
         def merge_attributes(another)
           super.merge(
-            superclass_path: select_superclass(another.superclass_path)&.path&.to_s,
+            superclass_path: select_superclass(another.superclass_path)&.to_s,
           )
         end
 
         # @param another [ScopedPath]
-        # @return [ScopedPath]
+        # @return [Path]
         def select_superclass(another)
-          if %w(Object Exception).include?(another&.path&.to_s)
+          if %w(Object Exception).include?(another&.to_s)
             superclass_path || another
           else
             another || superclass_path

data/lib/yoda/store/query/associators/associate_ancestors.rb

@@ -5,7 +5,12 @@ module Yoda
     module Query
       module Associators
         class AssociateAncestors
-          class CircularReferenceError < StandardError; end
+          class CircularReferenceError < StandardError
+            # @param circular_scope [Objects::NamespaceObject, nil]
+            def initialize(circular_scope)
+              super("#{circular_scope&.path} appears twice")
+            end
+          end
 
           # @return [Registry]
           attr_reader :registry
@@ -16,11 +21,14 @@ module Yoda
           end
 
           # @param obj [Objects::Base]
+          # @return [Enumerator<Objects::NamespaceObject>]
           def associate(obj)
             if obj.is_a?(Objects::NamespaceObject)
-              obj.ancestors = Enumerator.new do |yielder|
+              Enumerator.new do |yielder|
                 Processor.new(registry).process(obj).each { |klass| yielder << klass }
               end
+            else
+              []
             end
           end
 

data/lib/yoda/store/query/associators/associate_methods.rb

@@ -12,23 +12,26 @@ module Yoda
           end
 
           # @param obj [Object::Base]
+          # @return [Enumerator<Objects::MethodObject>]
           def associate(obj)
             if obj.is_a?(Objects::NamespaceObject)
-              AssociateMethods.new(registry).associate(obj)
-              obj.methods = Enumerator.new do |yielder|
+              Enumerator.new do |yielder|
                 name_set = Set.new
 
-                obj.ancestors.each do |ancestor|
+                AssociateAncestors.new(registry).associate(obj).each do |ancestor|
                   ancestor.instance_method_addresses.each do |method_address|
                     method_name = Objects::MethodObject.name_of_path(method_address)
-                    next name_set.has_key?(method_name)
-                    name_set.add(method_name)
-                    if el = registry.find(method_address)
-                      yielder << el
+                    if !name_set.member?(method_name)
+                      name_set.add(method_name)
+                      if el = registry.find(method_address)
+                        yielder << el
+                      end
                     end
                   end
                 end
               end
+            else
+              []
             end
           end
         end

data/lib/yoda/store/query/find_constant.rb

@@ -78,8 +78,7 @@ module Yoda
           Enumerator.new do |yielder|
             met = Set.new
 
-            Associators::AssociateAncestors.new(registry).associate(scope)
-            scope.ancestors.each do |ancestor|
+            Associators::AssociateAncestors.new(registry).associate(scope).each do |ancestor|
               select_child_constants(ancestor, name).each do |obj|
                 next if met.include?(obj.name)
                 met.add(obj.name)

data/lib/yoda/store/query/find_method.rb

@@ -27,29 +27,9 @@ module Yoda
         def lazy_select(namespace, expected, visibility: nil)
           visibility ||=  %i(public private protected)
           Enumerator.new do |yielder|
-            met = Set.new
-
-            all_method_addresses(namespace).each do |address|
-              name = Objects::MethodObject.name_of_path(address)
-              if match_name?(name, expected)
-                next if met.include?(name)
-                if el = registry.find(address)
-                  met.add(name)
-                  yielder << el if visibility.include?(el.visibility)
-                end
-              end
-            end
-          end
-        end
-
-        # @param namespace [Objects::Namespace]
-        # @return [Enumerator<Objects::MethodObject>]
-        def all_method_addresses(namespace)
-          Enumerator.new do |yielder|
-            Associators::AssociateAncestors.new(registry).associate(namespace)
-            namespace.ancestors.each do |ancestor|
-              ancestor.instance_method_addresses.each do |address|
-                yielder << address
+            Associators::AssociateMethods.new(registry).associate(namespace).each do |method|
+              if match_name?(method.name, expected) && visibility.include?(method.visibility)
+                yielder << method
               end
             end
           end

data/lib/yoda/store/registry.rb

@@ -5,7 +5,7 @@ module Yoda
   module Store
     class Registry
       # @note This number must be updated when breaking change is added.
-      REGISTRY_VERSION = 1
+      REGISTRY_VERSION = 2
 
       PROJECT_STATUS_KEY = '%project_status'
 

data/lib/yoda/store/yard_importer.rb

@@ -39,7 +39,7 @@ module Yoda
       def register(code_object)
         return if @registered.member?(code_object.path)
         @registered.add(code_object.path)
-        register(code_object.parent) if code_object.parent && !code_object.parent.root?
+        register(code_object.parent) if code_object.parent
 
         new_objects = begin
           case code_object.type
@@ -64,7 +64,9 @@ module Yoda
           end
         end
 
-        register_to_parent_proxy(code_object) if code_object.parent && code_object.parent.type == :proxy
+        # In YARD, proxy module is undetermined its absolute path and its defined namespace is undetermined.
+        # In Yoda, proxy module is assumed to be defined directory under parent namespace.
+        register_to_parent(code_object) if code_object.parent && (code_object.type == :proxy || code_object.parent.type == :proxy)
         [new_objects].flatten.compact.each { |new_object| patch.register(new_object) }
       end
 
@@ -79,7 +81,7 @@ module Yoda
           tag_list: code_object.tags.map { |tag| convert_tag(tag, '') },
           sources: code_object.files.map(&method(:convert_source)),
           primary_source: code_object[:current_file_has_comments] ? convert_source(code_object.files.first) : nil,
-          instance_method_addresses: code_object.meths(included: false, scope: :instance).map(&:path),
+          instance_method_addresses: code_object.meths(included: false, scope: :instance).map { |meth| path_to_store(meth) },
           mixin_addresses: code_object.instance_mixins.map { |mixin| path_to_store(mixin) },
           constant_addresses: (code_object.children.select{ |child| %i(constant module class).include?(child.type) }.map { |constant| constant.path } + ['Object']).uniq,
         )
@@ -87,7 +89,7 @@ module Yoda
           path: path_to_store(code_object),
           sources: code_object.files.map(&method(:convert_source)),
           primary_source: code_object[:current_file_has_comments] ? convert_source(code_object.files.first) : nil,
-          instance_method_addresses: code_object.meths(included: false, scope: :class).map(&:path),
+          instance_method_addresses: code_object.meths(included: false, scope: :class).map { |meth| path_to_store(meth) },
           mixin_addresses: code_object.instance_mixins.map { |mixin| path_to_store(mixin) },
         )
         [object_class, object_meta_class]
@@ -149,7 +151,7 @@ module Yoda
           tag_list: code_object.tags.map { |tag| convert_tag(tag, path_to_store(code_object)) },
           sources: code_object.files.map(&method(:convert_source)),
           primary_source: code_object[:current_file_has_comments] ? convert_source(code_object.files.first) : nil,
-          instance_method_addresses: code_object.meths(included: false, scope: :instance).map(&:path),
+          instance_method_addresses: code_object.meths(included: false, scope: :instance).map { |meth| path_to_store(meth) },
           mixin_addresses: code_object.instance_mixins.map { |mixin| path_to_store(mixin) },
           constant_addresses: code_object.children.select{ |child| %i(constant module class).include?(child.type) }.map { |constant| constant.path },
         )
@@ -158,7 +160,7 @@ module Yoda
           path: path_to_store(code_object),
           sources: code_object.files.map(&method(:convert_source)),
           primary_source: code_object[:current_file_has_comments] ? convert_source(code_object.files.first) : nil,
-          instance_method_addresses: code_object.meths(included: false, scope: :class).map(&:path),
+          instance_method_addresses: code_object.meths(included: false, scope: :class).map { |meth| path_to_store(meth) },
           mixin_addresses: code_object.instance_mixins.map { |mixin| path_to_store(mixin) },
         )
 
@@ -174,7 +176,7 @@ module Yoda
           tag_list: code_object.tags.map { |tag| convert_tag(tag, path_to_store(code_object)) },
           sources: code_object.files.map(&method(:convert_source)),
           primary_source: code_object[:current_file_has_comments] ? convert_source(code_object.files.first) : nil,
-          instance_method_addresses: code_object.meths(included: false, scope: :instance).map(&:path),
+          instance_method_addresses: code_object.meths(included: false, scope: :instance).map { |meth| path_to_store(meth) },
           mixin_addresses: code_object.instance_mixins.map { |mixin| path_to_store(mixin) },
           constant_addresses: code_object.children.select{ |child| %i(constant module class).include?(child.type) }.map { |constant| path_to_store(constant) },
           superclass_path: !code_object.superclass || code_object.superclass&.path == 'Qnil' ? nil : path_to_store(code_object.superclass),
@@ -184,7 +186,7 @@ module Yoda
           path: path_to_store(code_object),
           sources: code_object.files.map(&method(:convert_source)),
           primary_source: code_object[:current_file_has_comments] ? convert_source(code_object.files.first) : nil,
-          instance_method_addresses: code_object.meths(included: false, scope: :class).map(&:path),
+          instance_method_addresses: code_object.meths(included: false, scope: :class).map { |meth| path_to_store(meth) },
           mixin_addresses: code_object.class_mixins.map { |mixin| path_to_store(mixin) },
         )
 
@@ -250,10 +252,10 @@ module Yoda
 
       # @param code_object [::YARD::CodeObjects::Base]
       # @return [vaid]
-      def register_to_parent_proxy(code_object)
-        proxy_module = patch.find(path_to_store(code_object.parent))
-        proxy_module.instance_method_addresses.push(path_to_store(code_object)) if code_object.type == :method
-        proxy_module.constant_addresses.push(path_to_store(code_object)) if [:class, :module, :proxy].include?(code_object.type)
+      def register_to_parent(code_object)
+        parent_module = patch.find(path_to_store(code_object.parent))
+        parent_module.instance_method_addresses.push(path_to_store(code_object)) if code_object.type == :method
+        parent_module.constant_addresses.push(path_to_store(code_object)) if [:class, :module, :proxy].include?(code_object.type)
       end
 
       # @param source [(String, Integer)]
@@ -271,13 +273,13 @@ module Yoda
       end
 
       # @param code_object [::YARD::CodeObjects::Base]
-      # @return [String]
+      # @return [String] absolute object path to store.
       def calc_path_to_store(object)
         return 'Object' if object.root?
         parent_path = path_to_store(object.parent)
 
         if object.type == :proxy || object.is_a?(YARD::CodeObjects::Proxy)
-          # For now, we suppose the proxy object exists directly under its lexical namespace.
+          # For now, we suppose the proxy object exists directly under its namespace.
           [path_to_store(object.parent), object.name].join('::')
         elsif object.parent.path == path_to_store(object.parent)
           object.path

data/lib/yoda/version.rb

@@ -1,3 +1,3 @@
 module Yoda
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yoda-language-server
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Tomoya Chiba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-30 00:00:00.000000000 Z
+date: 2018-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard