yoda-language-server 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 026ad978f889f457cfac675feadfd43524331de432d3b8999470e250609fc2c1
-  data.tar.gz: ba929d2e80bd0d6dcef240517f2bc73ae4a9d138f0319317396f7d1a469e9d73
+  metadata.gz: 45f3bb7e65e24213b3d1c0e60110c08498d765e6a27732800d2c02e3508b03e4
+  data.tar.gz: 4e99d7cba046557256be92cfcf747e194086c52dedd94e7db344cc6fb8e9a2b1
 SHA512:
-  metadata.gz: 4185217b437afa69a84c3ccbd5a0b8611aa29542116333062b03132d27dc9941d45a6c3718e03fcee634816cb7f4647fe9945779d8b46a1f2c0bee2841231f3f
-  data.tar.gz: 4f4773144dbd6807ce54d19acea3b5f3725201615379e312f47e6739fe9559dc5159557f6ea62b10823b17d4ffc99246f173cae2421822fb9c451f4e764a353a
+  metadata.gz: a278106001664f9468805400c571a333765c16f9557345d9295e2afee2a1a1a82e7d3a3022aaaefee04c7ee6b2c9d3dd23b3f634bca35c5150d5f99dd7cc8916
+  data.tar.gz: d13b8b7bde1b5b0dc7028f8df270186e767bae83e901885288b677ca64c9e0326ef788eed7c1578a5a0b359fb33716c89fdad2f203244fb3b14eb796d3fca465

data/client/atom/main.js

@@ -2,28 +2,27 @@ const { AutoLanguageClient } = require('atom-languageclient')
 const { spawn } = require('child_process')
 const { resolve } = require('path')
 
+const busyMessages = {
+  text_document_hover: 'Preparing hover help',
+  text_document_signature_help: 'Preparing signature help',
+  text_document_completion: 'Completing',
+  text_document_definition: 'Finding definition',
+};
+
 class YodaClient extends AutoLanguageClient {
   constructor() {
     super()
+    this.busyHandlers = {};
   }
 
   preInitialization(connection) {
-    connection.onTelemetryEvent(({ type, phase, message }) => {
-      if (!this.busySignalService) { return; }
-      if (type != 'initialization') { return; }
-
-      if (this.initializationBusyMessage) {
-        this.initializationBusyMessage.setTitle(message);
-      } else {
-        this.initializationBusyMessage = this.busySignalService.reportBusy(message);
-      }
-    });
+    connection.onTelemetryEvent((event) => this.handleTelemetryEvent(event));
   }
 
   postInitialization(_server) {
-    if (this.initializationBusyMessage) {
-      this.initializationBusyMessage.dispose();
-      this.initializationBusyMessage = null;
+    if (this.busyHandlers.initialization) {
+      this.busyHandlers.initialization.dispose();
+      this.busyHandlers.initialization = null;
     }
   }
 
@@ -52,6 +51,44 @@ class YodaClient extends AutoLanguageClient {
     const commandOptions = { cwd: projectPath };
     return spawn(this.getServerPath(), ['server'], commandOptions);
   }
+
+  handleTelemetryEvent(eventBody) {
+    if (!this.busySignalService || !eventBody) { return; }
+    switch (eventBody.type) {
+      case 'initialization':
+        return this.handleInitializationEvent(eventBody);
+      case 'text_document_hover':
+      case 'text_document_completion':
+      case 'text_document_signature_help':
+      case 'text_document_completion':
+        return this.handleBusyEvent(eventBody.type, eventBody);
+      default:
+    }
+  }
+
+  handleInitializationEvent({ phase, message }) {
+    if (this.busyHandlers.initialization) {
+      this.busyHandlers.initialization.setTitle(message);
+    } else {
+      this.busyHandlers.initialization = this.busySignalService.reportBusy(message);
+    }
+  }
+
+  handleBusyEvent(handlerName, { phase, message }) {
+    switch (phase) {
+      case 'begin':
+        if (!this.busyHandlers[handlerName]) {
+          this.busyHandlers[handlerName] = this.busySignalService.reportBusy("(Yoda) " + busyMessages[handlerName]);
+        }
+        break;
+      case 'end':
+        if (this.busyHandlers[handlerName]) {
+          this.busyHandlers[handlerName].dispose();
+          this.busyHandlers[handlerName] = null;
+        }
+        break;
+    }
+  }
 }
 
 module.exports = new YodaClient()

data/lib/yoda/evaluation/current_node_explain.rb

@@ -1,5 +1,6 @@
 module Yoda
   module Evaluation
+    # CurrentNodeExplain shows help for the current node.
     class CurrentNodeExplain
       # @return [Store::Registry]
       attr_reader :registry

data/lib/yoda/evaluation/signature_discovery.rb

@@ -1,5 +1,7 @@
 module Yoda
   module Evaluation
+    # SignatureDiscovery infers method candidates for the nearest send node and specify the number of index of these parameters.
+    # SignatureDiscovery shows help for the current parameter of method candidates.
     class SignatureDiscovery
       # @return [Store::Registry]
       attr_reader :registry

data/lib/yoda/model/descriptions.rb

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

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

@@ -0,0 +1,46 @@
+require 'unparser'
+
+module Yoda
+  module Model
+    module Descriptions
+      class NodeDescription < Base
+        # @return [::Parser::AST::Node]
+        attr_reader :node
+
+        # @return [Typing::Traces::Base]
+        attr_reader :trace
+
+        # @param node  [::Parser::AST::Node]
+        # @param trace [Typing::Traces::Base]
+        def initialize(node, trace)
+          @node = node
+          @trace = trace
+        end
+
+        # @return [String]
+        def title
+          node_body
+        end
+
+        # @return [String]
+        def sort_text
+          node_body
+        end
+
+        # @return [String]
+        def to_markdown
+          <<~EOS
+          #{node_body.gsub("\n", ";")}: #{trace.type}
+          EOS
+        end
+
+        private
+
+        # @return [String]
+        def node_body
+          @node_body ||= Unparser.unparse(node)
+        end
+      end
+    end
+  end
+end

data/lib/yoda/model/node_signature.rb

@@ -1,7 +1,12 @@
 module Yoda
   module Model
     class NodeSignature
-      attr_reader :node, :trace
+      # @return [::Parser::AST::Node]
+      attr_reader :node
+
+      # @return [Typing::Traces::Base]
+      attr_reader :trace
+
       # @param node  [::Parser::AST::Node]
       # @param trace [Typing::Traces::Base]
       def initialize(node, trace)
@@ -16,6 +21,16 @@ module Yoda
 
       # @return [Array<Descriptions::Base>]
       def descriptions
+        [top_description, *type_descriptions]
+      end
+
+      # @return [Descriptions::NodeDescription]
+      def top_description
+        Descriptions::NodeDescription.new(node, trace)
+      end
+
+      # @return [Array<Descriptions::Base>]
+      def type_descriptions
         case trace
         when Typing::Traces::Send
           trace.functions.map { |function| Descriptions::FunctionDescription.new(function) }.take(1)

data/lib/yoda/server.rb

@@ -213,28 +213,36 @@ module Yoda
         uri = params[:text_document][:uri]
         position = params[:position]
 
-        completion_provider&.complete(uri, position)
+        notifier.busy(type: :text_document_completion) do
+          completion_provider&.complete(uri, position)
+        end
       end
 
       def handle_text_document_hover(params)
         uri = params[:text_document][:uri]
         position = params[:position]
 
-        hover_provider&.request_hover(uri, position)
+        notifier.busy(type: :text_document_hover) do
+          hover_provider&.request_hover(uri, position)
+        end
       end
 
       def handle_text_document_signature_help(params)
         uri = params[:text_document][:uri]
         position = params[:position]
 
-        signature_provider&.provide(uri, position)
+        notifier.busy(type: :text_document_signature_help) do
+          signature_provider&.provide(uri, position)
+        end
       end
 
       def handle_text_document_definition(params)
         uri = params[:text_document][:uri]
         position = params[:position]
 
-        definition_provider&.provide(uri, position)
+        notifier.busy(type: :text_document_definition) do
+          definition_provider&.provide(uri, position)
+        end
       end
     end
     include TextDocument

data/lib/yoda/server/hover_provider.rb

@@ -1,6 +1,7 @@
 module Yoda
   class Server
     class HoverProvider
+      # @return [Session]
       attr_reader :session
 
       # @param session [Session]

data/lib/yoda/server/notifier.rb

@@ -6,6 +6,14 @@ module Yoda
         @server = server
       end
 
+      # @param type [Symbol]
+      def busy(type:)
+        event(type: type, phase: :begin)
+        yield
+      ensure
+        event(type: type, phase: :end)
+      end
+
       # @param params [Hash]
       def event(params)
         server.send_notification(method: 'telemetry/event', params: params)

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

@@ -12,6 +12,7 @@ module Yoda
           end
         end
 
+        # @param registry [Registry]
         def initialize(registry)
           @registry = registry
         end

data/lib/yoda/store/project/library_doc_loader.rb

@@ -58,6 +58,7 @@ module Yoda
           unless bundle_status.all_present?
             Logger.info 'Constructing database for the current project.'
             bundle_status = import_deps(bundle_status)
+            Instrument.instance.initialization_progress(phase: :save, message: 'Saving registry')
             registry.compress_and_save
           end
           bundle_status

data/lib/yoda/version.rb

@@ -1,3 +1,3 @@
 module Yoda
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/yoda-language-server.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor', '~> 0.20.0'
   spec.add_dependency 'parslet', '~> 1.8'
   spec.add_dependency 'parser', '~> 2.0'
+  spec.add_dependency 'unparser', '~> 0.2.6'
   spec.add_dependency 'language_server-protocol', '~> 3.7.0.0'
   spec.add_dependency 'leveldb', '~> 0.1.9'
   spec.add_dependency 'lmdb', '~> 0.4.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yoda-language-server
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Tomoya Chiba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-26 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: unparser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
   requirement: !ruby/object:Gem::Requirement
@@ -298,6 +312,7 @@ files:
 - lib/yoda/model/descriptions.rb
 - lib/yoda/model/descriptions/base.rb
 - lib/yoda/model/descriptions/function_description.rb
+- lib/yoda/model/descriptions/node_description.rb
 - lib/yoda/model/descriptions/value_description.rb
 - lib/yoda/model/descriptions/word_description.rb
 - lib/yoda/model/function_signatures.rb