yoda-language-server 0.6.2 → 0.7.0

data/lib/yoda/version.rb

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

data/yoda-language-server.gemspec

@@ -26,10 +26,11 @@ Gem::Specification.new do |spec|
   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 'language_server-protocol', '~> 3.12.0.0'
   spec.add_dependency 'leveldb', '~> 0.1.9'
   spec.add_dependency 'lmdb', '~> 0.4.8'
   spec.add_dependency 'ruby-progressbar'
+  spec.add_dependency 'concurrent-ruby', '~> 1.0.0'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yoda-language-server
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Tomoya Chiba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0.0
+        version: 3.12.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0.0
+        version: 3.12.0.0
 - !ruby/object:Gem::Dependency
   name: leveldb
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -373,14 +387,22 @@ files:
 - lib/yoda/parsing/type_parser.rb
 - lib/yoda/runner.rb
 - lib/yoda/server.rb
-- lib/yoda/server/completion_provider.rb
-- lib/yoda/server/definition_provider.rb
+- lib/yoda/server/concurrent_writer.rb
 - lib/yoda/server/deserializer.rb
-- lib/yoda/server/hover_provider.rb
-- lib/yoda/server/initialization_provider.rb
+- lib/yoda/server/file_store.rb
+- lib/yoda/server/lifecycle_handler.rb
 - lib/yoda/server/notifier.rb
+- lib/yoda/server/providers.rb
+- lib/yoda/server/providers/base.rb
+- lib/yoda/server/providers/completion.rb
+- lib/yoda/server/providers/definition.rb
+- lib/yoda/server/providers/hover.rb
+- lib/yoda/server/providers/signature.rb
+- lib/yoda/server/providers/text_document_did_change.rb
+- lib/yoda/server/providers/text_document_did_open.rb
+- lib/yoda/server/providers/text_document_did_save.rb
+- lib/yoda/server/root_handler.rb
 - lib/yoda/server/session.rb
-- lib/yoda/server/signature_provider.rb
 - lib/yoda/store.rb
 - lib/yoda/store/actions.rb
 - lib/yoda/store/actions/build_core_index.rb

data/lib/yoda/server/completion_provider.rb

@@ -1,78 +0,0 @@
-module Yoda
-  class Server
-    class CompletionProvider
-      # @type Session
-      attr_reader :session
-
-      # @param session [Session]
-      def initialize(session)
-        @session = session
-      end
-
-      # @param uri      [String]
-      # @param position [{Symbol => Integer}]
-      def complete(uri, position)
-        source = session.file_store.get(uri)
-        location = Parsing::Location.of_language_server_protocol_position(line: position[:line], character: position[:character])
-
-        if candidates = comment_complete(source, location)
-          return candidates
-        end
-        complete_from_cut_source(source, location)
-      end
-
-      private
-
-      # @param source   [String]
-      # @param location [Parsing::Location]
-      # @return [LanguageServerProtocol::Interface::CompletionList, nil]
-      def comment_complete(source, location)
-        ast, comments = Parsing::Parser.new.parse_with_comments(source)
-        return nil unless Parsing::Query::CurrentCommentQuery.new(comments, location).current_comment
-        completion_worker = Evaluation::CommentCompletion.new(session.registry, ast, comments, location)
-        return nil unless completion_worker.available?
-
-        completion_items = completion_worker.candidates
-
-        LSP::Interface::CompletionList.new(
-          is_incomplete: false,
-          items: completion_worker.candidates.map { |completion_item| create_completion_item(completion_item) },
-        )
-      rescue ::Parser::SyntaxError
-        nil
-      end
-
-      # @param source   [String]
-      # @param location [Parsing::Location]
-      # @return [LanguageServerProtocol::Interface::CompletionList, nil]
-      def complete_from_cut_source(source, location)
-        cut_source = Parsing::SourceCutter.new(source, location).error_recovered_source
-        method_completion_worker = Evaluation::CodeCompletion.new(session.registry, cut_source, location)
-        completion_items = method_completion_worker.candidates
-        return nil if completion_items.empty?
-
-        LSP::Interface::CompletionList.new(
-          is_incomplete: false,
-          items: completion_items.map { |completion_item| create_completion_item(completion_item) },
-        )
-      end
-
-      # @param completion_item [Model::CompletionItem]
-      # @return            [LSP::Interface::CompletionItem]
-      def create_completion_item(completion_item)
-        LSP::Interface::CompletionItem.new(
-          label: completion_item.description.is_a?(Model::Descriptions::FunctionDescription) ? completion_item.description.signature : completion_item.description.sort_text,
-          kind: completion_item.language_server_kind,
-          detail: completion_item.description.title,
-          documentation: completion_item.description.to_markdown,
-          sort_text: completion_item.description.sort_text,
-          text_edit: LSP::Interface::TextEdit.new(
-            range: LSP::Interface::Range.new(completion_item.range.to_language_server_protocol_range),
-            new_text: completion_item.edit_text,
-          ),
-          data: {},
-        )
-      end
-    end
-  end
-end

data/lib/yoda/server/definition_provider.rb

@@ -1,36 +0,0 @@
-module Yoda
-  class Server
-    class DefinitionProvider
-      # @type Session
-      attr_reader :session
-
-      # @param session [Session]
-      def initialize(session)
-        @session = session
-      end
-
-      # @param uri      [String]
-      # @param position [{Symbol => Integer}]
-      # @param include_declaration [Boolean]
-      def provide(uri, position, include_declaration = false)
-        source = session.file_store.get(uri)
-        location = Parsing::Location.of_language_server_protocol_position(line: position[:line], character: position[:character])
-
-        node_worker = Evaluation::CurrentNodeExplain.new(session.registry, source, location)
-        references = node_worker.defined_files
-        references.map { |(path, line, column)| create_location(path, line, column) }
-      end
-
-      # @param path [String]
-      # @param line [Integer]
-      # @param column [Integer]
-      def create_location(path, line, column)
-        location = Parsing::Location.new(row: line - 1, column: column)
-        LSP::Interface::Location.new(
-          uri: session.uri_of_path(path),
-          range: LSP::Interface::Range.new(Parsing::Range.new(location, location).to_language_server_protocol_range),
-        )
-      end
-    end
-  end
-end

data/lib/yoda/server/hover_provider.rb

@@ -1,39 +0,0 @@
-module Yoda
-  class Server
-    class HoverProvider
-      # @return [Session]
-      attr_reader :session
-
-      # @param session [Session]
-      def initialize(session)
-        @session = session
-      end
-
-      # @param uri      [String]
-      # @param position [{Symbol => Integer}]
-      def request_hover(uri, position)
-        source = session.file_store.get(uri)
-        location = Parsing::Location.of_language_server_protocol_position(line: position[:line], character: position[:character])
-
-        node_worker = Evaluation::CurrentNodeExplain.new(session.registry, source, location)
-
-        current_node_signature = node_worker.current_node_signature
-        create_hover(current_node_signature) if current_node_signature
-      end
-
-      # @param signature [Evaluation::NodeSignature]
-      def create_hover(signature)
-        LSP::Interface::Hover.new(
-          contents: signature.descriptions.map { |value| create_hover_text(value) },
-          range: LSP::Interface::Range.new(signature.node_range.to_language_server_protocol_range),
-        )
-      end
-
-      # @param description [Evaluation::Descriptions::Base]
-      # @return [String]
-      def create_hover_text(description)
-        description.to_markdown
-      end
-    end
-  end
-end

data/lib/yoda/server/initialization_provider.rb

@@ -1,96 +0,0 @@
-module Yoda
-  class Server
-    class InitializationProvider
-      # @return [Session]
-      attr_reader :session
-
-      # @return [Notifier]
-      attr_reader :notifier
-
-      # @param session [Session]
-      # @param nofitier [Notifier]
-      def initialize(session:, notifier:)
-        @session = session
-        @notifier = notifier
-      end
-
-      # @return [LanguageServer::Protocol::Interface::ShowMessageParams, nil]
-      def provide
-        errors = Instrument.instance.hear(initialization_progress: method(:notify_initialization_progress)) do
-          session.setup
-        end
-        build_complete_message(errors)
-      end
-
-      private
-
-      # @param errors [Array<BaseError>]
-      # @return [Array<Object>]
-      def build_complete_message(errors)
-        return [] if errors.empty?
-        gem_import_errors = errors.select { |error| error.is_a?(GemImportError) }
-        core_import_errors = errors.select { |error| error.is_a?(CoreImportError) }
-
-        notifications = [
-          {
-            method: 'window/showMessage',
-            params: LanguageServer::Protocol::Interface::ShowMessageParams.new(
-              type: LanguageServer::Protocol::Constant::MessageType::WARNING,
-              message: "Failed to load some libraries (Please check console for details)",
-            )
-          }
-        ]
-
-        if gem_message = gem_import_warnings(gem_import_errors)
-          notifications.push(
-            method: 'window/logMessage',
-            params: LanguageServer::Protocol::Interface::LogMessageParams.new(
-              type: LanguageServer::Protocol::Constant::MessageType::WARNING,
-              message: gem_message,
-            ),
-          )
-        end
-
-        if core_message = core_import_warnings(core_import_errors)
-          notifications.push(
-            method: 'window/logMessage',
-            params: LanguageServer::Protocol::Interface::LogMessageParams.new(
-              type: LanguageServer::Protocol::Constant::MessageType::WARNING,
-              message: core_message,
-            ),
-          )
-        end
-
-        notifications
-      end
-
-      # @param gem_import_errors [Array<GemImportError>]
-      # @return [String, nil]
-      def gem_import_warnings(gem_import_errors)
-        return if gem_import_errors.empty?
-        warnings = gem_import_errors.map { |error| "- #{error.name} (#{error.version})" }
-
-        <<~EOS
-        Failed to import some gems.
-        Please check these gems are installed for Ruby version #{RUBY_VERSION}.
-        #{warnings.join("\n")}
-        EOS
-      end
-
-      # @param gem_import_errors [Array<GemImportError>]
-      # @return [String, nil]
-      def core_import_warnings(core_import_errors)
-        return if core_import_errors.empty?
-
-        <<~EOS
-        Failed to import some core libraries (Ruby version: #{RUBY_VERSION}).
-        Please execute `yoda setup` with Ruby version #{RUBY_VERSION}.
-        EOS
-      end
-
-      def notify_initialization_progress(phase: nil, message: nil, **params)
-        notifier.event(type: :initialization, phase: phase, message: message)
-      end
-    end
-  end
-end

data/lib/yoda/server/signature_provider.rb

@@ -1,46 +0,0 @@
-module Yoda
-  class Server
-    class SignatureProvider
-      attr_reader :session
-
-      # @param session [Session]
-      def initialize(session)
-        @session = session
-      end
-
-      # @param uri      [String]
-      # @param position [{Symbol => Integer}]
-      def provide(uri, position)
-        source = session.file_store.get(uri)
-        location = Parsing::Location.of_language_server_protocol_position(line: position[:line], character: position[:character])
-        cut_source = Parsing::SourceCutter.new(source, location).error_recovered_source
-
-        signature_worker = Evaluation::SignatureDiscovery.new(session.registry, cut_source, location)
-
-        functions = signature_worker.method_candidates
-        create_signature_help(functions)
-      end
-
-      # @param code_objects [Array<Model::FunctionSignatures::Base>]
-      def create_signature_help(functions)
-        signatures = functions.map { |func| Model::Descriptions::FunctionDescription.new(func) }
-        LSP::Interface::SignatureHelp.new(
-          signatures: signatures.map { |signature| create_signature_info(signature) },
-        )
-      end
-
-      # @param signature [Evaluation::Descriptions::FunctionDescription]
-      def create_signature_info(signature)
-        LSP::Interface::SignatureInformation.new(
-          label: signature.title.to_s,
-          documentation: signature.to_markdown,
-          parameters: signature.parameter_names.map do |parameter|
-            LSP::Interface::ParameterInformation.new(
-              label: parameter,
-            )
-          end,
-        )
-      end
-    end
-  end
-end