yoda-language-server 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52ade5f050c0172759a16bc736b42a0f81217b4efb51a6dd926f6c54c53464dc
-  data.tar.gz: c1e2b2439b0a22948d01cc5886321e9f6fe6f83142aead6d8466b32e7a54b8b7
+  metadata.gz: ac5417cb4b65a5825e8cbbafc5e7c2396dd676f8c9be6635b6ae9721a58d9d4e
+  data.tar.gz: 93c16d20eeef7a4af4483df0313814529adeefa8f0561e1fa96f72627730eb5a
 SHA512:
-  metadata.gz: 84c53ecfb0696eadb924907812d9614d8df2f71b1b9bc8deac0b92dd2d70180aeb708731f75d96508acace9c6bfb027f2b88d509af0dbd0d42ba7418146c8af5
-  data.tar.gz: a38c732bc5cfa9eee8d2e343d328073e978eae350bf4806e8d8ffc203e0b4ec0061e7fec7df0925375f656a2aa078fd106dc1b695cc87b70c298969bf49a1386
+  metadata.gz: 57ab04ba88f6d0047c00ef4a0c92531ddc8a7966dcf10b93c16d01152ea62981bba5eb40d8a94dcaf1c6eea015f710fb44c5a1eca45bc40614b51c5f79325d9e
+  data.tar.gz: 7af4d13dd31562946ee5c3dd7e57e5c95b14450dce1b8ab8a9e1719a4b53067f384f069cb522b027158cca2407e9c47d84e86dcf604f940d3cea1cf47318a00d

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 ## Unreleased
+## v0.10.0 - 2022-03-28
+
+* Support go to definition on path of require clause
+* Fix inference failure on code with constant node and super node
+
 ## v0.9.0 - 2022-03-22
 
 * Support progress report of server initialization

data/client/vscode/package-lock.json

@@ -1472,9 +1472,9 @@
             }
         },
         "node_modules/minimist": {
-            "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-            "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
             "dev": true
         },
         "node_modules/mkdirp": {
@@ -3784,9 +3784,9 @@
             }
         },
         "minimist": {
-            "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-            "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
             "dev": true
         },
         "mkdirp": {

data/client/vscode/src/check-versions.ts

@@ -10,8 +10,11 @@ interface CheckResult {
 }
 
 export async function checkVersions(): Promise<CheckResult> {
-    const { stdout } = await asyncExec("gem list --both --exact yoda-language-server")
-    const [localVersion, remoteVersion] = parseGemList(stdout)
+    const { stdout: localStdout } = await asyncExec("gem list --local --exact yoda-language-server")
+    const localVersion = extractVersion(localStdout)
+
+    const { stdout: remoteStdout } = await asyncExec("gem list --remote --no-prerelease --exact yoda-language-server")
+    const remoteVersion = extractVersion(remoteStdout)
 
     return {
         shouldUpdate: shouldUpdate(localVersion, remoteVersion),
@@ -32,15 +35,6 @@ function shouldUpdate(localVersion: string, remoteVersion: string): boolean {
     return cmp(localVersion, "<", remoteVersion)
 }
 
-function parseGemList(stdout: string): [string, string] {
-    const [local, remote] = stdout.split("*** REMOTE GEMS ***")
-
-    const localVersion = extractVersion(local)
-    const remoteVersion = extractVersion(remote)
-
-    return [localVersion, remoteVersion]
-}
-
 function extractVersion(text: string): string {
     const lines = text.split("\n")
     for (const line of lines) {

data/client/vscode/src/install-tools.ts

@@ -44,7 +44,7 @@ export async function promptForInstallTool(update: boolean, newVersion?: string)
     const newVersionLabel = newVersion ? ` (${newVersion})` : ''
 
     const message = update ? 
-    `A newer version of yoda${newVersionLabel} is updatable.` : 
+    `A newer version of yoda${newVersionLabel} is available.` : 
     'yoda command is not available. Please install.'
 
     const selected = await window.showInformationMessage(message, ...choises)

data/lib/yoda/cli/analyze_deps.rb

@@ -16,7 +16,7 @@ module Yoda
 
         # @param root_path [String]
         def initialize(root_path)
-          @root_path = root_path
+          @root_path = File.expand_path(root_path)
         end
 
         # @return [Array<Yoda::Store::Objects::Library::Gem>]
@@ -28,6 +28,7 @@ module Yoda
           {
             path: root_path,
             dependencies: gems.map(&:to_h),
+            autoload_dependency_ids: autoload_gem_ids,
           }
         end
 
@@ -45,39 +46,47 @@ module Yoda
           end
         end
 
-        # @return [Array<Bundler::LazySpecification>, nil]
+        # @return [Array<String>]
+        def autoload_gem_ids
+          if has_gemfile?
+            gems.map(&:id)
+          else
+            []
+          end
+        end
+
+        # @return [Array<Bundler::LazySpecification, Gem::Specification>, nil]
         def gem_specs
           @gem_specs ||= begin
-            Dir.chdir(root_path) do
-              with_unbundled_env do
-                # Suppress bundler outputs to stdout.
-                Bundler.ui = Bundler::UI::Silent.new
-
-                Bundler.reset!
-
-                if File.exists?("Gemfile")
-                  # Resolve dependencies of uninstalled gems and ensure remote sources are available.
-                  Bundler.definition.resolve_remotely!
-                  spec_set = Bundler.definition.resolve
-
-                  if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.2.25')
-                    deps = Bundler.definition.requested_dependencies
-                    spec_set.materialize(deps).to_a
-                  else
-                    # For backward compatibility (Ref: https://github.com/rubygems/rubygems/pull/4788)
-                    deps = Bundler.definition.send(:requested_dependencies)
-                    missing = []
-                    materialized = spec_set.materialize(deps, missing)
-                    materialized.to_a + missing
-                  end
+            with_project_env do
+              if has_gemfile?
+                # Resolve dependencies of uninstalled gems and ensure remote sources are available.
+                Bundler.definition.resolve_remotely!
+                spec_set = Bundler.definition.resolve
+
+                if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.2.25')
+                  deps = Bundler.definition.requested_dependencies
+                  spec_set.materialize(deps).to_a
                 else
-                  []
+                  # For backward compatibility (Ref: https://github.com/rubygems/rubygems/pull/4788)
+                  deps = Bundler.definition.send(:requested_dependencies)
+                  missing = []
+                  materialized = spec_set.materialize(deps, missing)
+
+                  materialized.to_a + missing
                 end
+              else
+                [] # Gem::Specification.latest_specs(true)
               end
             end
           end
         end
 
+        # @return [Boolean]
+        def has_gemfile?
+          File.exists?(File.expand_path("Gemfile", root_path))
+        end
+
         # @param [Gem::Specification]
         def metadata?(spec)
           spec.source.is_a?(Bundler::Source::Metadata)
@@ -88,6 +97,18 @@ module Yoda
           spec.source.is_a?(Bundler::Source::Path) && (File.expand_path(spec.source.path) == File.expand_path(root_path))
         end
 
+        def with_project_env
+          Dir.chdir(root_path) do
+            with_unbundled_env do
+              # Suppress bundler outputs to stdout.
+              Bundler.ui = Bundler::UI::Silent.new
+              Bundler.reset!
+
+              yield
+            end
+          end
+        end
+
         def with_unbundled_env(&block)
           if Bundler.respond_to?(:with_unbundled_env)
             Bundler.with_unbundled_env(&block)

data/lib/yoda/id_mask.rb

@@ -0,0 +1,84 @@
+require 'set'
+
+module Yoda
+  class IdMask
+    # @return [Hash<Symbol>, nil]
+    attr_reader :pattern
+
+    # @param pattern [IdMask, Set<Symbol>, Array<Symbol>, Hash<Symbol>, nil]
+    # @return [IdMask]
+    def self.build(pattern)
+      if pattern.is_a?(IdMask)
+        pattern
+      elsif pattern.nil?
+        new(pattern)
+      elsif pattern.is_a?(Hash)
+        new(pattern.map { |k, v| [k.to_sym, v] }.to_h)
+      else
+        new(pattern.to_a.to_h { |id| [id.to_sym, nil] })
+      end
+    end
+
+    # @param pattern [Hash<Symbol>, nil]
+    def initialize(pattern)
+      fail TypeError, "pattern must be a Hash or nil" unless pattern.is_a?(Hash) || pattern.nil?
+      @pattern = pattern
+    end
+
+    # @param id [Symbol, String]
+    # @return [Boolean]
+    def cover?(id)
+      return true if any?
+      pattern.has_key?(id.to_sym)
+    end
+
+    # @param another [IdMasklia, Set<Symbol>, Array<Symbol>, Hash<Symbol>, nil]
+    # @return [IdMask]
+    def intersection(another)
+      another_mask = IdMask.build(another)
+      return another_mask if any?
+      return self if another_mask.any?
+
+      ids_intersection = covering_ids & another_mask.covering_ids
+
+      intersection_pattern = ids_intersection.map do |id|
+        [id, nesting_mask(id) & another_mask.nesting_mask(id)]
+      end.to_h
+
+      IdMask.build(intersection_pattern)
+    end
+
+    alias_method :&, :intersection
+
+    # @return [Boolean]
+    def any?
+      pattern.nil?
+    end
+
+    # @return [Set<Symbol>, nil]
+    def covering_ids
+      @covering_ids ||= begin
+        if any?
+          nil
+        else 
+          Set.new(pattern.keys)
+        end
+      end
+    end
+
+    # @param id [String, Symbol]
+    # @return [IdMask]
+    def nesting_mask(id)
+      if pattern.is_a?(Hash)
+        IdMask.build(pattern[id.to_sym])
+      else
+        IdMask.build(nil)
+      end
+    end
+
+    # @return [Hash, nil]
+    def to_pattern
+      pattern&.map { |k, v| [k, v&.to_pattern] }&.to_h
+    end
+  end
+end

data/lib/yoda/model/descriptions/require_path_description.rb

@@ -0,0 +1,45 @@
+module Yoda
+  module Model
+    module Descriptions
+      # @abstract
+      class RequirePathDescription
+        # @return [String]
+        attr_reader :path
+
+        # @param path [String]
+        def initialize(path)
+          @path = path
+        end
+
+        # @abstract
+        # @return [String]
+        def title
+          path
+        end
+
+        # @abstract
+        # @return [String]
+        def sort_text
+          path
+        end
+
+        # @return [String]
+        def label
+          sort_text
+        end
+
+        # @abstract
+        # @return [String]
+        def to_markdown
+          path
+        end
+
+        # Return an LSP MarkedString content for description
+        # @return [String, Hash]
+        def markup_content
+          to_markdown
+        end
+      end
+    end
+  end
+end

data/lib/yoda/model/descriptions.rb

@@ -7,6 +7,7 @@ module Yoda
       require 'yoda/model/descriptions/value_description'
       require 'yoda/model/descriptions/word_description'
       require 'yoda/model/descriptions/node_description'
+      require 'yoda/model/descriptions/require_path_description'
       require 'yoda/model/descriptions/variable_description'
     end
   end

data/lib/yoda/model/node_signatures/node.rb

@@ -3,7 +3,15 @@ module Yoda
     module NodeSignatures
       class Node < Base
         def descriptions
-          [node_type_description, *type_descriptions]
+          if node_info.require_paths.empty?
+            [node_type_description, *type_descriptions]
+          else
+            node_info.require_paths.map { |path| Descriptions::RequirePathDescription.new(path) }
+          end
+        end
+
+        def defined_files
+          node_info.require_paths.map { |path| [path, Parsing::Location.first_row, Parsing::Location.first_column] }
         end
       end
     end

data/lib/yoda/model/values/literal_value.rb

@@ -11,6 +11,9 @@ module Yoda
         # @return [Base]
         attr_reader :value
 
+        # @return [Object]
+        attr_reader :literal
+
         # @param value [Base]
         # @param literal [Object]
         def initialize(value:, literal:)

data/lib/yoda/parsing/location.rb

@@ -17,6 +17,15 @@ module Yoda
         @column = column
       end
 
+      def self.first_row
+        1
+      end
+
+      def self.first_column
+        0
+      end
+
+
       # @param ast_location [Parser::Source::Map, Parser::Source::Range]
       # @return [Location, nil]
       def self.of_ast_location(ast_location)

data/lib/yoda/services/loadable_path_resolver.rb

@@ -0,0 +1,33 @@
+module Yoda
+  module Services
+    class LoadablePathResolver
+      def initialize
+      end
+
+      # @param base_paths [Array<String>]
+      # @param pattern [String]
+      # @return [String, nil]
+      def find_loadable_path(base_paths, pattern)
+        # TODO: Support absolute path
+        return nil if File.absolute_path?(pattern)
+        return nil if pattern.start_with?("~/")
+        return nil if pattern.start_with?("./")
+        return nil if pattern.start_with?("../")
+
+        base_paths.each do |base_path|
+          path = File.join(base_path, pattern)
+
+          if File.extname(path).empty?
+            paths_with_suffix = ::Gem.suffixes.map { |suffix| path + suffix }
+            matched_path = paths_with_suffix.find { |path| File.file?(path) }
+            return matched_path if matched_path
+          else
+            return path if File.file?(path)
+          end
+        end
+
+        return nil
+      end
+    end
+  end
+end

data/lib/yoda/services.rb

@@ -4,6 +4,7 @@ module Yoda
     require 'yoda/services/current_node_explain'
     require 'yoda/services/comment_completion'
     require 'yoda/services/code_completion'
+    require 'yoda/services/loadable_path_resolver'
     require 'yoda/services/signature_discovery'
   end
 end

data/lib/yoda/store/actions/read_project_files.rb

@@ -2,21 +2,23 @@ module Yoda
   module Store
     module Actions
       class ReadProjectFiles
+        # @return [Project]
+        attr_reader :project
+
         # @return [Registry]
         attr_reader :registry
 
-        # @return [String]
-        attr_reader :root_path
-
         # @param project [Project]
         # @return [ReadProjectFiles]
         def self.for_project(project)
-          new(project.registry, project.root_path)
+          new(project, project.registry)
         end
 
-        def initialize(registry, root_path)
+        # @param project [Project]
+        # @param registry [Project]
+        def initialize(project, registry)
+          @project = project
           @registry = registry
-          @root_path = root_path
         end
 
         def run
@@ -35,7 +37,7 @@ module Yoda
 
         # @return [Array<String>]
         def project_files
-          Dir.chdir(root_path) { Dir.glob(["{lib,app}/**/*.rb", "ext/**/*.c", ".yoda/*.rb"]).map { |name| File.expand_path(name, root_path) } }
+          project.project_source_paths
         end
       end
     end

data/lib/yoda/store/adapters/gdbm_adapter/namespace_accessor.rb

@@ -20,7 +20,7 @@ module Yoda
 
           # @param address [String, Symbol]
           # @return [Object, nil]
-          def get(address)
+          def get(address, **)
             JSON.load(database[build_key(address)], symbolize_names: true)
           end
 

data/lib/yoda/store/adapters/memory_adapter.rb

@@ -28,7 +28,7 @@ module Yoda
 
         # @param address [String]
         # @return [any]
-        def get(address)
+        def get(address, **)
           JSON.load(db[address.to_s], symbolize_names: true)
         end
 

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

@@ -10,7 +10,7 @@ module Yoda
         # @param dependency [Project::Dependency]
         # @return [Array<Object::Library::Core, Object::Library::Std, Object::Library::Gem>]
         def self.libraies_from_dependency(dependency)
-          [dependency.core, dependency.std, *dependency.gems.select(&:installed?)]
+          [dependency.core, dependency.std, *dependency.autoload_gems.select(&:installed?)]
         end
 
         # @param libraries [Array<Library::Core, Library::Std, Library::Gem>]

data/lib/yoda/store/objects/library/core.rb

@@ -1,3 +1,5 @@
+require 'yoda/store/objects/library/path_resolvable'
+
 module Yoda
   module Store
     module Objects
@@ -42,6 +44,7 @@ module Yoda
           class Connected
             extend ConnectedDelegation
             include WithRegistry
+            include PathResolvable
 
             delegate_to_object :version
             delegate_to_object :id, :name, :doc_path, :to_h, :with_project_connection
@@ -64,6 +67,11 @@ module Yoda
             def registry_path
               VersionStore.for_current_version.registry_path_for_core
             end
+
+            # @return [Array<String>]
+            def require_paths
+              []
+            end
           end
         end
       end

data/lib/yoda/store/objects/library/gem.rb

@@ -1,18 +1,24 @@
+require 'yoda/store/objects/library/path_resolvable'
+
 module Yoda
   module Store
     module Objects
       module Library
         class Gem
           include Serializable
+          include PathResolvable
 
           # @return [String]
           attr_reader :name, :version, :source_path, :full_gem_path, :doc_dir
 
+          # @return [Array<String>]
+          attr_reader :require_paths
+
           # @return [Symbol, nil]
           attr_reader :source_type
 
           class << self
-            # @param spec [Bundler::LazySpecification]
+            # @param spec [Bundler::LazySpecification, Gem::Specification]
             def from_gem_spec(spec)
               if spec.respond_to?(:full_gem_path)
                 # Installed
@@ -20,6 +26,7 @@ module Yoda
                   name: spec.name,
                   version: spec.version.version,
                   source_path: spec.source.respond_to?(:path) ? spec.source.path : nil,
+                  require_paths: spec.full_require_paths,
                   full_gem_path: spec.full_gem_path,
                   doc_dir: spec.doc_dir,
                   source_type: source_type_of(spec.source),
@@ -30,6 +37,7 @@ module Yoda
                   name: spec.name,
                   version: spec.version.version,
                   source_path: nil,
+                  require_paths: [],
                   full_gem_path: nil,
                   doc_dir: nil,
                   source_type: nil,
@@ -57,11 +65,12 @@ module Yoda
             end
           end
 
-          def initialize(name:, version:, source_path:, full_gem_path:, doc_dir:, source_type:)
+          def initialize(name:, version:, source_path:, full_gem_path:, require_paths:, doc_dir:, source_type:)
             @name = name
             @version = version
             @source_path = source_path
             @full_gem_path = full_gem_path
+            @require_paths = require_paths
             @doc_dir = doc_dir
             @source_type = source_type&.to_sym
           end
@@ -80,6 +89,7 @@ module Yoda
               version: version,
               source_path: source_path,
               full_gem_path: full_gem_path,
+              require_paths: require_paths,
               doc_dir: doc_dir,
               source_type: source_type,
             }
@@ -103,9 +113,10 @@ module Yoda
             extend ConnectedDelegation
             include WithRegistry
 
-            delegate_to_object :name, :version, :source_path, :full_gem_path, :doc_dir, :source_type
+            delegate_to_object :name, :version, :source_path, :full_gem_path, :doc_dir, :source_type, :require_paths
             delegate_to_object :id, :local?, :to_h, :installed?, :managed_by_rubygems?, :with_project_connection
             delegate_to_object :hash, :eql?, :==, :to_json, :derive
+            delegate_to_object :contain_requirable_file?, :find_requirable_file
 
             # @return [Gem]
             attr_reader :object

data/lib/yoda/store/objects/library/path_resolvable.rb

@@ -0,0 +1,29 @@
+require 'yoda/store/objects/library/path_resolvable'
+
+module Yoda
+  module Store
+    module Objects
+      module Library
+        module PathResolvable
+          # @abstract
+          # @return [Array<String>]
+          def require_paths
+            fail NotImplementedError
+          end
+
+          # @param relative_path [String]
+          # @return [Boolean]
+          def contain_requirable_file?(relative_path)
+            !!find_requirable_file(relative_path)
+          end
+
+          # @param relative_path [String]
+          # @return [String, nil]
+          def find_requirable_file(relative_path)
+            Services::LoadablePathResolver.new.find_loadable_path(require_paths, relative_path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/yoda/store/objects/library/std.rb

@@ -1,3 +1,5 @@
+require 'yoda/store/objects/library/path_resolvable'
+
 module Yoda
   module Store
     module Objects
@@ -42,6 +44,7 @@ module Yoda
           class Connected
             extend ConnectedDelegation
             include WithRegistry
+            include PathResolvable
 
             delegate_to_object :version
             delegate_to_object :id, :name, :doc_path, :to_h, :with_project_connection
@@ -64,6 +67,12 @@ module Yoda
             def registry_path
               VersionStore.for_current_version.registry_path_for_stdlib
             end
+
+            # @return [Array<String>]
+            def require_paths
+              # TODO: Calculate from registry
+              [File.join(VersionStore.for_current_version.ruby_source_path, "lib/")]
+            end
           end
         end
       end

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

@@ -6,6 +6,7 @@ module Yoda
         require 'yoda/store/objects/library/core'
         require 'yoda/store/objects/library/std'
         require 'yoda/store/objects/library/gem'
+        require 'yoda/store/objects/library/path_resolvable'
 
         class << self
           # @return [Core]

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

@@ -17,7 +17,7 @@ module Yoda
 
         # @param address [String, Symbol]
         # @return [Addressable, nil]
-        def find(address)
+        def find(address, **)
           @registry[address.to_sym]
         end
         alias get find