language_server-protocol 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d04ba4a69373f5e654e6996087176f6734262ec5
-  data.tar.gz: d12f9d73ee0583e775d4d01560a80ff4dd39b784
+  metadata.gz: 63cb173af8aeba11730787b15dd8f0705312c6ae
+  data.tar.gz: 0656572f2038cb80e5286c1f208347cd741d80e6
 SHA512:
-  metadata.gz: 11125692f139b8cd725551580317a3e6c9b44d9f3c5b675a37fd79da2a5ab171ae5af86c9349ff1635f5a992d2c5971e5c80fca05343d08dac8cdecb547c510b
-  data.tar.gz: ed93a8cee5ef4d7d5f8079177783b3b08ceb28ac31e81e08cc400b8127fc01e679bc2886a35f91c0b58a120112e211279983c6f7a106ab0f3a0da6de016b2b30
+  metadata.gz: d19b0791d8e9c04dce75d82ada89a894c2425d938b1d269b79ab1f84f9f10ac9272f0bbd63c5e25153f9c16cf93a858aad3e9b03850c9419480974d3316d5f15
+  data.tar.gz: 96653a9b13dc8cb14b39fc2bd2a0da988c841bae306d576695d9ca4df8658d22cc4c2eff16be976fb58cad443a594cdb105c5801692c47dc9f28abfd4ef783f9

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/node_modules

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Change log
+
+## 0.3.1
+
+- Fix handling `extends`

data/Dockerfile-node.development

@@ -1,6 +1,6 @@
 FROM node:6-alpine
 
-RUN mkdir /app && chown node:node /app
+RUN mkdir /app /vendor && chown node:node /app /vendor
 
 USER node
 WORKDIR /app

data/Dockerfile.development

@@ -1,14 +1,24 @@
-ARG RUBY_VERSION=2.4.1
+ARG RUBY_VERSION=2.4.2
 FROM ruby:$RUBY_VERSION
 
 RUN apt-get update && apt-get install less -y
 RUN groupadd --gid 1000 ruby && useradd --uid 1000 --gid ruby --shell /bin/bash --create-home ruby
-RUN mkdir /app && chown ruby:ruby /app
+RUN mkdir /app /vendor && chown ruby:ruby /app /vendor
 
 ENV LANG=C.UTF-8 \
-  BUNDLE_PATH=/app/vendor/bundle/$RUBY_VERSION \
+  BUNDLE_PATH=/vendor/bundle/$RUBY_VERSION \
   BUNDLE_JOBS=4
 
+ENV ENTRYKIT_VERSION 0.4.0
+
+RUN wget https://github.com/progrium/entrykit/releases/download/v${ENTRYKIT_VERSION}/entrykit_${ENTRYKIT_VERSION}_Linux_x86_64.tgz \
+  && tar -xvzf entrykit_${ENTRYKIT_VERSION}_Linux_x86_64.tgz \
+  && rm entrykit_${ENTRYKIT_VERSION}_Linux_x86_64.tgz \
+  && mv entrykit /bin/entrykit \
+  && chmod +x /bin/entrykit \
+  && entrykit --symlink
+
 USER ruby
 WORKDIR /app
-CMD ["bundle", "exec", "exe/language_server"]
+
+ENTRYPOINT ["prehook", "bin/setup", "--"]

data/README.md

@@ -59,7 +59,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/language_server-protocol. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/mtsmfm/language_server-protocol-ruby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/bin/generate_files

@@ -2,4 +2,4 @@
 
 set -ex
 yarn install
-yarn run -s ts-node scripts/generateFiles.ts
+yarn run -s -- ts-node --compilerOptions '{"target":"es6"}' scripts/generateFiles.ts

data/bin/setup

@@ -3,6 +3,4 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
-bundle install
-
-# Do any other automated setup that you need to do here
+bundle check || bundle install

data/circle.yml

@@ -3,7 +3,8 @@ jobs:
   build:
     docker:
       - image: tmaier/docker-compose
-    working_directory: /project
+        environment:
+          COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
     steps:
       - checkout
       - setup_remote_docker:
@@ -13,11 +14,14 @@ jobs:
           command: |
             set -x
             docker info
-            docker volume create mtsmfm-language-server-protocol-sync
-            docker create -v mtsmfm-language-server-protocol-sync:/app --name mtsmfm-language-server-protocol-sync busybox chown -R 1000:1000 /app
-            docker cp . mtsmfm-language-server-protocol-sync:/app
-            docker start mtsmfm-language-server-protocol-sync
+            docker volume create project
+            docker create -v project:/app --name project busybox chown -R 1000:1000 /app
+            docker cp . project:/app
+            docker start project
             docker-compose build
-            docker-compose run app bin/setup
-            docker-compose run ruby-2-3 bin/setup
-            docker-compose run ruby-2-2 bin/setup
+      - run:
+          name: test
+          command: |
+            docker-compose run app bundle exec rake test
+            docker-compose run ruby-2-3 bundle exec rake test
+            docker-compose run ruby-2-2 bundle exec rake test

data/docker-compose.ci.yml

@@ -0,0 +1,14 @@
+version: '3.0'
+services:
+  app: &app
+    volumes:
+      - project:/app
+  ruby-2-3:
+    <<: *app
+  ruby-2-2:
+    <<: *app
+  node:
+    <<: *app
+volumes:
+  project:
+    external: true

data/docker-compose.override.yml

@@ -0,0 +1,15 @@
+version: '3.0'
+services:
+  app: &app
+    volumes:
+      - .:/app:cached
+      - $HOME/.gitconfig:/home/ruby/.gitconfig:ro
+      - $HOME/.ssh:/home/ruby/.ssh:ro
+      - $HOME/.gem:/home/ruby/.gem
+  ruby-2-3:
+    <<: *app
+  ruby-2-2:
+    <<: *app
+  node:
+    volumes:
+      - .:/app:cached

data/docker-compose.yml

@@ -5,31 +5,27 @@ services:
       context: .
       dockerfile: Dockerfile.development
     volumes:
-      - mtsmfm-language-server-protocol-sync:/app:nocopy
+      - vendor:/vendor
       - home:/home/ruby
-      - $HOME/.gitconfig:/home/ruby/.gitconfig:ro
-      - $HOME/.ssh:/home/ruby/.ssh:ro
-      - $HOME/.gem:/home/ruby/.gem
   ruby-2-3:
     <<: *app
     build:
       <<: *app-build
       args:
-        RUBY_VERSION: 2.3
+        RUBY_VERSION: 2.3.5
   ruby-2-2:
     <<: *app
     build:
       <<: *app-build
       args:
-        RUBY_VERSION: 2.2
+        RUBY_VERSION: 2.2.8
   node:
     build:
       context: .
       dockerfile: Dockerfile-node.development
     volumes:
-      - mtsmfm-language-server-protocol-sync:/app:nocopy
+      - vendor:/vendor
       - home:/home/node
 volumes:
-  mtsmfm-language-server-protocol-sync:
-    external: true
+  vendor:
   home:

data/lib/language_server/protocol/interface/code_lens_registration_options.rb

@@ -1,8 +1,8 @@
 module LanguageServer
   module Protocol
     module Interface
-      class CodeLensRegistrationOptions
-        def initialize(resolve_provider: nil)
+      class CodeLensRegistrationOptions < TextDocumentRegistrationOptions
+        def initialize(document_selector:, resolve_provider: nil)
           @attributes = {}
 
           @attributes[:resolveProvider] = resolve_provider if resolve_provider

data/lib/language_server/protocol/interface/completion_registration_options.rb

@@ -1,8 +1,8 @@
 module LanguageServer
   module Protocol
     module Interface
-      class CompletionRegistrationOptions
-        def initialize(trigger_characters: nil, resolve_provider: nil)
+      class CompletionRegistrationOptions < TextDocumentRegistrationOptions
+        def initialize(document_selector:, trigger_characters: nil, resolve_provider: nil)
           @attributes = {}
 
           @attributes[:triggerCharacters] = trigger_characters if trigger_characters

data/lib/language_server/protocol/interface/document_link_registration_options.rb

@@ -1,8 +1,8 @@
 module LanguageServer
   module Protocol
     module Interface
-      class DocumentLinkRegistrationOptions
-        def initialize(resolve_provider: nil)
+      class DocumentLinkRegistrationOptions < TextDocumentRegistrationOptions
+        def initialize(document_selector:, resolve_provider: nil)
           @attributes = {}
 
           @attributes[:resolveProvider] = resolve_provider if resolve_provider

data/lib/language_server/protocol/interface/document_on_type_formatting_registration_options.rb

@@ -1,8 +1,8 @@
 module LanguageServer
   module Protocol
     module Interface
-      class DocumentOnTypeFormattingRegistrationOptions
-        def initialize(first_trigger_character:, more_trigger_character: nil)
+      class DocumentOnTypeFormattingRegistrationOptions < TextDocumentRegistrationOptions
+        def initialize(document_selector:, first_trigger_character:, more_trigger_character: nil)
           @attributes = {}
 
           @attributes[:firstTriggerCharacter] = first_trigger_character

data/lib/language_server/protocol/interface/notification_message.rb

@@ -1,8 +1,8 @@
 module LanguageServer
   module Protocol
     module Interface
-      class NotificationMessage
-        def initialize(method:, params: nil)
+      class NotificationMessage < Message
+        def initialize(jsonrpc:, method:, params: nil)
           @attributes = {}
 
           @attributes[:method] = method

data/lib/language_server/protocol/interface/reference_params.rb

@@ -1,8 +1,8 @@
 module LanguageServer
   module Protocol
     module Interface
-      class ReferenceParams
-        def initialize(context:)
+      class ReferenceParams < TextDocumentPositionParams
+        def initialize(text_document:, position:, context:)
           @attributes = {}
 
           @attributes[:context] = context

data/lib/language_server/protocol/interface/request_message.rb

@@ -1,8 +1,8 @@
 module LanguageServer
   module Protocol
     module Interface
-      class RequestMessage
-        def initialize(id:, method:, params: nil)
+      class RequestMessage < Message
+        def initialize(jsonrpc:, id:, method:, params: nil)
           @attributes = {}
 
           @attributes[:id] = id

data/lib/language_server/protocol/interface/response_message.rb

@@ -1,8 +1,8 @@
 module LanguageServer
   module Protocol
     module Interface
-      class ResponseMessage
-        def initialize(id:, result: nil, error: nil)
+      class ResponseMessage < Message
+        def initialize(jsonrpc:, id:, result: nil, error: nil)
           @attributes = {}
 
           @attributes[:id] = id

data/lib/language_server/protocol/interface/signature_help_registration_options.rb

@@ -1,8 +1,8 @@
 module LanguageServer
   module Protocol
     module Interface
-      class SignatureHelpRegistrationOptions
-        def initialize(trigger_characters: nil)
+      class SignatureHelpRegistrationOptions < TextDocumentRegistrationOptions
+        def initialize(document_selector:, trigger_characters: nil)
           @attributes = {}
 
           @attributes[:triggerCharacters] = trigger_characters if trigger_characters

data/lib/language_server/protocol/interface/text_document_change_registration_options.rb

@@ -4,8 +4,8 @@ module LanguageServer
       #
       # Descibe options to be used when registered for text document change events.
       #
-      class TextDocumentChangeRegistrationOptions
-        def initialize(sync_kind:)
+      class TextDocumentChangeRegistrationOptions < TextDocumentRegistrationOptions
+        def initialize(document_selector:, sync_kind:)
           @attributes = {}
 
           @attributes[:syncKind] = sync_kind

data/lib/language_server/protocol/interface/text_document_save_registration_options.rb

@@ -1,8 +1,8 @@
 module LanguageServer
   module Protocol
     module Interface
-      class TextDocumentSaveRegistrationOptions
-        def initialize(include_text: nil)
+      class TextDocumentSaveRegistrationOptions < TextDocumentRegistrationOptions
+        def initialize(document_selector:, include_text: nil)
           @attributes = {}
 
           @attributes[:includeText] = include_text if include_text

data/lib/language_server/protocol/interface/versioned_text_document_identifier.rb

@@ -1,8 +1,8 @@
 module LanguageServer
   module Protocol
     module Interface
-      class VersionedTextDocumentIdentifier
-        def initialize(version:)
+      class VersionedTextDocumentIdentifier < TextDocumentIdentifier
+        def initialize(uri:, version:)
           @attributes = {}
 
           @attributes[:version] = version

data/lib/language_server/protocol/version.rb

@@ -1,5 +1,5 @@
 module LanguageServer
   module Protocol
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/scripts/generateFiles.ts

@@ -59,10 +59,14 @@ const extractDefinitions = content => {
 
   const handleInterface = (node: ts.InterfaceDeclaration) => {
     const members = node.members.filter(member => member.name).map(member => serialize(member));
+    const parentName = node.heritageClauses && node.heritageClauses[0].getLastToken().getText();
+    const parent = output.find(i => i.interface && (i.interface.name === parentName));
 
     output.push(
     {
       interface: serialize(node),
+      parent: parent,
+      allMembers: ((parent && parent.allMembers) || []).concat(members),
       members
     }
     );
@@ -148,8 +152,8 @@ module LanguageServer
 {{comment definition.interface.documentation indent=6}}
       #
       {{/if}}
-      class {{definition.interface.name}}
-        def initialize({{params definition.members}})
+      class {{definition.interface.name}}{{#if definition.parent}} < {{definition.parent.interface.name}}{{/if}}
+        def initialize({{params definition.allMembers}})
           @attributes = {}
 
           {{#each definition.members}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: language_server-protocol
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Fumiaki MATSUSHIMA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Dockerfile-node.development
 - Dockerfile.development
@@ -114,8 +115,9 @@ files:
 - bin/generate_files
 - bin/setup
 - circle.yml
+- docker-compose.ci.yml
+- docker-compose.override.yml
 - docker-compose.yml
-- docker-sync.yml
 - language_server-protocol.gemspec
 - lib/language_server-protocol.rb
 - lib/language_server/protocol.rb

data/docker-sync.yml

@@ -1,9 +0,0 @@
-version: '2'
-options:
-  verbose: true
-syncs:
-  mtsmfm-language-server-protocol-sync:
-    src: .
-    sync_userid: 1000
-    image: mtsmfm/unison
-    sync_excludes: ['vendor', 'node_modules', 'tmp']