lsp-protocol 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cad9cf151c8eea6ed1c792455f49370275229d97
-  data.tar.gz: f1698d0735cd92fd06fd0b369edc483b3e5803bf
+  metadata.gz: e6579ef14081838c3247d50a2228b1c9d22af069
+  data.tar.gz: e1c04ac11976b49ec3a9d020c9dacfc2a6d4b740
 SHA512:
-  metadata.gz: c36ccab0950c30e39058e69382e9e3d398c0b1bce3c23c80f78eaab45144ed1f3bcdb40f0701bada5be9055b0ecb5cfaeaa55f9d1c11f3a783b37e2d8e9afd23
-  data.tar.gz: 6982ed99efdbc5d629bd7d146cbc068ddd71eabd16ddbfcb857bc653a5ec715f288db9b2c40b62389b0f3f3d44042d741ccfc8651d996dfd877be0561e809a79
+  metadata.gz: 2a5cbd34a8493e93752886e634dd52a9c9c77ee7ef7ed958d9658399238e36b39ac53ccbafd0b7c769fcdf2d76ed162faf079f6c8c5edf82cf7f8c00ce5e37fd
+  data.tar.gz: c576d1d923b21d095b887696b08288801a303cbf3d35c97516e5751465e2e2951d2370e8c08f488dfca67882418676e34e576dd5013c933b423f96c3232bf482

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+matrix:
+  include:
+    - rvm: 2.3.7
+    - rvm: 2.4.4
+    - rvm: 2.5.1
+script:
+  - make test
+  - make mutate

data/Gemfile.lock

@@ -1,13 +1,62 @@
 PATH
   remote: .
   specs:
-    lsp-protocol (0.0.1)
+    lsp-protocol (0.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    abstract_type (0.0.7)
+    adamantium (0.2.0)
+      ice_nine (~> 0.11.0)
+      memoizable (~> 0.4.0)
+    anima (0.3.0)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2)
+      equalizer (~> 0.0.11)
+    ast (2.4.0)
     byebug (10.0.2)
+    concord (0.1.5)
+      adamantium (~> 0.2.0)
+      equalizer (~> 0.0.9)
     diff-lcs (1.3)
+    equalizer (0.0.11)
+    ice_nine (0.11.2)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
+    morpher (0.2.6)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      anima (~> 0.3.0)
+      ast (~> 2.2)
+      concord (~> 0.1.5)
+      equalizer (~> 0.0.9)
+      ice_nine (~> 0.11.0)
+      procto (~> 0.0.2)
+    mutant (0.8.14)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      anima (~> 0.3.0)
+      ast (~> 2.2)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.3)
+      equalizer (~> 0.0.9)
+      ice_nine (~> 0.11.1)
+      memoizable (~> 0.4.2)
+      morpher (~> 0.2.6)
+      parallel (~> 1.3)
+      parser (>= 2.3.1.4, < 2.5)
+      procto (~> 0.0.2)
+      regexp_parser (~> 0.4.3)
+      unparser (~> 0.2.5)
+    mutant-rspec (0.8.14)
+      mutant (~> 0.8.14)
+      rspec-core (>= 3.4.0, < 3.7.0)
+    parallel (1.12.1)
+    parser (2.4.0.2)
+      ast (~> 2.3)
+    procto (0.0.3)
+    regexp_parser (0.4.13)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -21,6 +70,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    thread_safe (0.3.6)
+    unparser (0.2.7)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.3)
+      equalizer (~> 0.0.9)
+      parser (>= 2.3.1.2, < 2.6)
+      procto (~> 0.0.2)
 
 PLATFORMS
   ruby
@@ -29,6 +87,7 @@ DEPENDENCIES
   bundler (~> 1.9)
   byebug
   lsp-protocol!
+  mutant-rspec
   rspec (~> 3.5.0)
 
 BUNDLED WITH

data/Makefile

@@ -0,0 +1,5 @@
+test:
+	@bundle exec rspec spec
+
+mutate:
+	@bundle exec mutant --include lib --require lsp --use rspec "Lsp::FileLanguageServer"

data/lib/lsp.rb

@@ -75,25 +75,26 @@ module Lsp
       when "textDocument/hover"
         handle_text_document_hover(
           TextDocumentPositionParams.new(
-            TextDocumentIdentifier.new(params.fetch(:textDocument).fetch(:uri)),
+            TextDocumentIdentifier.new(
+              URI(params.fetch(:textDocument).fetch(:uri))),
             Position.from_hash(params.fetch(:position))))
       when "textDocument/definition"
         handle_text_document_definition(
           TextDocumentPositionParams.new(
             TextDocumentIdentifier.new(
-              params.fetch(:textDocument)),
-            params.fetch(:position)))
+              URI(params.fetch(:textDocument).fetch(:uri))),
+            Position.from_hash(params.fetch(:position))))
       when "initialize"
         handle_initialize(
           InitializeRequest.new(
-            params.fetch(:rootUri)))
+            URI(params.fetch(:rootUri))))
       else
         ResponseMessage.new(nil, ResponseError::MethodNotFound.new)
       end
       @language_server.response(
         id,
-        response.result ? response.result.to_h : nil,
-        response.error ? response.error.to_h : nil)
+        to_result(response.result),
+        to_result(response.error))
     rescue NotImplementedError
       ResponseMessage.new(nil, ResponseError::MethodNotFound.new)
     end
@@ -106,6 +107,17 @@ module Lsp
     rescue NotImplementedError
     end
 
+    def to_result(obj)
+      case obj
+      when Array
+        obj.map {|elem| to_result(elem) }
+      when NilClass
+        nil
+      else
+        obj.to_h
+      end
+    end
+
     attr_writer :language_server
 
     def handle_text_document_hover(request)

data/lib/lsp/file_language_server.rb

@@ -25,13 +25,13 @@ module Lsp
             end
           end
           header_name, header_value = header_line.split(":", 2)
-          headers[header_name.strip] = header_value.strip
+          headers[header_name] = header_value.strip
         end
 
         body_raw = input.read(headers["Content-Length"].to_i)
         body_json = JSON.parse(body_raw, symbolize_names: true)
         logger.info("RECV #{body_json}")
-        if body_json[:id]
+        if body_json.key?(:id)
           implementation.request(
             body_json.fetch(:id),
             body_json.fetch(:method),
@@ -43,6 +43,8 @@ module Lsp
         end
       end
     rescue EOFError
+    rescue => e
+      logger.error("Server failed because of #{e}")
     end
 
     def prepare

data/lsp-protocol.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'lsp-protocol'
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.licenses      = ['MIT']
   spec.authors       = ['Rafał Łasocha']
   spec.email         = 'lsp@swistak35.com'
@@ -19,4 +19,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rspec', '~> 3.5.0'
   spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'mutant-rspec'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lsp-protocol
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Rafał Łasocha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,15 +52,32 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutant-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple hello world gem
 email: lsp@swistak35.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- Makefile
 - lib/lsp.rb
 - lib/lsp/file_language_server.rb
 - lsp-protocol.gemspec
@@ -84,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Language Server Protocol implementation