sadr 0.1.0 → 0.2.0

data/lib/sadr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sadr
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/sadr.rb

@@ -27,11 +27,35 @@ module Sadr
     def define(*members)
       return Data.define(*members) if defined?(Data)
 
-      Struct.new(*members, keyword_init: true) do
-        def initialize(**values)
-          super
+      Struct.new(*members) do
+        members.each { |member| undef_method("#{member}=") }
+
+        def initialize(*values, **keywords)
+          if keywords.empty?
+            raise ArgumentError, "wrong number of arguments" unless values.length == self.class.members.length
+
+            super(*values)
+          else
+            raise ArgumentError, "cannot mix positional and keyword arguments" unless values.empty?
+
+            missing = self.class.members - keywords.keys
+            unknown = keywords.keys - self.class.members
+            raise ArgumentError, "missing keyword: #{missing.first.inspect}" unless missing.empty?
+            raise ArgumentError, "unknown keyword: #{unknown.first.inspect}" unless unknown.empty?
+
+            super(*self.class.members.map { |member| keywords.fetch(member) })
+          end
           freeze
         end
+
+        def with(**changes)
+          return self if changes.empty?
+
+          unknown = changes.keys - self.class.members
+          raise ArgumentError, "unknown keyword: #{unknown.first.inspect}" unless unknown.empty?
+
+          self.class.new(**to_h.merge(changes))
+        end
       end
     end
   end

data/sig/sadr.rbs

@@ -35,19 +35,25 @@ module Sadr
   class Position
     attr_reader line: Integer
     attr_reader character: Integer
-    def self.new: (line: Integer, character: Integer) -> Position
+    def self.new: (Integer line, Integer character) -> Position
+                | (line: Integer, character: Integer) -> Position
+    def with: (?line: Integer, ?character: Integer) -> Position
   end
 
   class Range_
     attr_reader start: Position
     attr_reader end: Position
-    def self.new: (start: Position, end: Position) -> Range_
+    def self.new: (Position start, Position end) -> Range_
+                | (start: Position, end: Position) -> Range_
+    def with: (?start: Position, ?end: Position) -> Range_
   end
 
   class ContentChange
     attr_reader range: Range_?
     attr_reader text: String
-    def self.new: (range: Range_?, text: String) -> ContentChange
+    def self.new: (Range_? range, String text) -> ContentChange
+                | (range: Range_?, text: String) -> ContentChange
+    def with: (?range: Range_?, ?text: String) -> ContentChange
   end
 
   class Document
@@ -55,7 +61,9 @@ module Sadr
     attr_reader language_id: String
     attr_reader version: Integer
     attr_reader text: String
-    def self.new: (uri: String, language_id: String, version: Integer, text: String) -> Document
+    def self.new: (String uri, String language_id, Integer version, String text) -> Document
+                | (uri: String, language_id: String, version: Integer, text: String) -> Document
+    def with: (?uri: String, ?language_id: String, ?version: Integer, ?text: String) -> Document
   end
 
   class Token
@@ -64,7 +72,9 @@ module Sadr
     attr_reader length: Integer
     attr_reader type: Integer
     attr_reader modifiers: Integer
-    def self.new: (line: Integer, character: Integer, length: Integer, type: Integer, modifiers: Integer) -> Token
+    def self.new: (Integer line, Integer character, Integer length, Integer type, Integer modifiers) -> Token
+                | (line: Integer, character: Integer, length: Integer, type: Integer, modifiers: Integer) -> Token
+    def with: (?line: Integer, ?character: Integer, ?length: Integer, ?type: Integer, ?modifiers: Integer) -> Token
   end
 
   module Protocol
@@ -77,6 +87,7 @@ module Sadr
     def self.semantic_tokens: (Array[Integer] data, ?legend: Hash[String, Array[String]]?) -> Array[Token]
     def self.semantic_delta: (Array[Integer] data, Array[Hash[String, json]] edits) -> Array[Integer]
     def self.diagnostics: (Array[object] values) -> Array[object]
+    def self.workspace_edit: (object value) -> object
   end
 
   class Future
@@ -100,10 +111,11 @@ module Sadr
     MAX_MESSAGE: Integer
     attr_reader stderr_lines: Array[String]
     attr_reader pid: Integer
-    def initialize: (Array[String] command, ?cwd: String?, ?env: Hash[String, String?]) { (Hash[String, json]?, Exception?) -> untyped } -> void
+    def initialize: (Array[String] command, ?cwd: String?, ?env: Hash[String, String?], ?on_spawn: ^(Transport) -> untyped) { (Hash[String, json]?, Exception?) -> untyped } -> void
     def self.read_message: (IO | StringIO io) -> Hash[String, json]?
     def self.validate_message: (untyped message) -> Hash[String, json]
     def write: (object message) -> untyped
+    def try_write: (object message) -> bool
     def alive?: () -> bool
     def close: () -> untyped
   end
@@ -112,12 +124,12 @@ module Sadr
     attr_reader capabilities: Hash[String, json]
     attr_reader transport: Transport?
     attr_reader diagnostics: Hash[String, Array[object]]
-    attr_reader state: :stopped | :starting | :running | :failed
+    attr_reader state: :stopped | :starting | :restarting | :running | :failed
     attr_reader errors: Array[Error]
     attr_reader server_info: Hash[String, json]?
     attr_reader position_encoding: String?
-    def initialize: (command: Array[String], ?root: String, ?dispatch: ^() { () -> untyped } -> untyped, ?restart: bool, ?env: Hash[String, String?], ?initialization_options: json, ?configuration: object) -> void
-    def start: (?timeout: Numeric) -> self
+    def initialize: (command: Array[String], ?root: String, ?dispatch: ^() { () -> untyped } -> untyped, ?restart: bool, ?env: Hash[String, String?], ?initialization_options: json, ?configuration: json) -> void
+    def start: (?timeout: Numeric) -> Hash[String, json]
     def stop: () -> untyped
     def running?: () -> bool
     def supports?: (String | Symbol capability) -> bool
@@ -136,17 +148,61 @@ module Sadr
     def references: (String uri, Position position, ?include_declaration: bool) -> Future
     def signature_help: (String uri, Position position, **json params) -> Future
     def rename: (String uri, Position position, String new_name) -> Future
+    def prepare_rename: (String uri, Position position, **json params) -> Future
+    def document_highlight: (String uri, Position position, **json params) -> Future
+    def prepare_call_hierarchy: (String uri, Position position, **json params) -> Future
+    def prepare_type_hierarchy: (String uri, Position position, **json params) -> Future
+    def linked_editing_range: (String uri, Position position, **json params) -> Future
     def document_symbol: (String uri) -> Future
     def formatting: (String uri, object options) -> Future
+    def range_formatting: (String uri, Range_ range, object options) -> Future
     def code_action: (String uri, Range_ range, object context) -> Future
     def code_lens: (String uri) -> Future
     def inlay_hint: (String uri, Range_ range) -> Future
+    def folding_range: (String uri) -> Future
+    def selection_range: (String uri, Array[Position | Hash[String | Symbol, Integer]] positions) -> Future
+    def document_link: (String uri) -> Future
     def diagnostic: (String uri, ?previous_result_id: String?) -> Future
     def semantic_tokens: (String uri, version: Integer) -> Array[Token]
     def workspace_symbols: (String query) -> Future
     def resolve_completion: (object item) -> Future
     def resolve_code_action: (object action) -> Future
     def resolve_code_lens: (object lens) -> Future
+    def resolve_document_link: (object link) -> Future
+    def call_hierarchy_incoming_calls: (object item) -> Future
+    def call_hierarchy_outgoing_calls: (object item) -> Future
+    def type_hierarchy_supertypes: (object item) -> Future
+    def type_hierarchy_subtypes: (object item) -> Future
     def execute_command: (String command, ?arguments: Array[json]) -> Future
+    def did_change_configuration: (json settings) -> untyped
+    def did_change_watched_files: (Array[object] events) -> untyped
+  end
+
+  module Testing
+    class FakeServer
+      SCRIPT: String
+      DEFAULT_CAPABILITIES: Hash[String, json]
+      attr_reader capabilities: Hash[String, json]
+      attr_reader messages: Array[object]
+      def self.command: () -> Array[String]
+      def initialize: (?responses: Hash[String | Symbol, untyped], ?capabilities: Hash[String, json]) -> void
+      def transport: () { (Hash[String, json]?, Exception?) -> untyped } -> FakeTransport
+      def dispatch: (object message) -> Array[object]
+    end
+
+    class FakeTransport < Transport
+      attr_reader stderr_lines: Array[String]
+      attr_reader pid: Integer
+      def initialize: (FakeServer server) { (Hash[String, json]?, Exception?) -> untyped } -> void
+      def write: (object message) -> nil
+      def try_write: (object message) -> bool
+      def alive?: () -> bool
+      def close: () -> nil
+    end
+
+    class FakeClient < Client
+      attr_reader server: FakeServer
+      def initialize: (?server: FakeServer, **untyped options) -> void
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sadr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yudai Takada
@@ -26,6 +26,10 @@ files:
 - lib/sadr/document_sync.rb
 - lib/sadr/future.rb
 - lib/sadr/protocol.rb
+- lib/sadr/testing.rb
+- lib/sadr/testing/fake_client.rb
+- lib/sadr/testing/fake_server.rb
+- lib/sadr/testing/fake_transport.rb
 - lib/sadr/transport.rb
 - lib/sadr/version.rb
 - sig/sadr.rbs
@@ -51,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A pure Ruby Language Server Protocol client
 test_files: []