standard 1.24.0 → 1.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0671d43dc2bb8c9d1337a61ea48651fa7bf9d47f3e9c427e27603d5eed9d462
-  data.tar.gz: b98d3235ec3a617dfe3c6dbb57d827c6f4aff4670c53c5e4dccf92a003b79206
+  metadata.gz: 69342b56c2cb5d98f491d5c02cb7d787c667954fe4422654ddc434d0f34384b4
+  data.tar.gz: 7945846b4e2a92e4543752ccd7034a8ce5e441d126f5604d72333cd3b2ec1966
 SHA512:
-  metadata.gz: 465bf72a4d1585c54e93d290358a13e2a5b4e4890c428f41f08918bec2d6365367f41f8b7b3614765d4eb6a7557c9ef13823a845e86ce3f54f39e043027a93cf
-  data.tar.gz: b9c98f70f328bdad82f563f8fa572f5ea18389bdebeb81b830b54c23197cedfb9918ee29d7a1dfe79b83b0e2ee7aa41798fd25bdeb68eb85ca28460cd2376fc3
+  metadata.gz: 49e59dc51822c205910db0f1dc318e26012875ae727c00d1f358779b7292799e1d6ce4df36d321fd4a1633471afc86a218697bfd9dc7b00b73e62efc2bdbe7c8
+  data.tar.gz: 29dfd9bb60acb15d038be99e338e6376894237e8fe1fac78915b9c8f76040a17e6b3fcd7f14a072b9c6e712f256e8ef51445099993604a57c3b14d9675bb4285

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.24.1
+
+* _Further_ improve `--lsp` server to better support commands used by VS Code
+
 ## 1.24.0
 
 * Improve `--lsp` server to better support the commands used by VS Code

data/Gemfile

@@ -9,7 +9,6 @@ gem "rake", "~> 13.0"
 gem "gimme"
 gem "m"
 
-
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.5")
   gem "simplecov"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    standard (1.24.0)
+    standard (1.24.1)
       language_server-protocol (~> 3.17.0.2)
       rubocop (= 1.44.1)
       rubocop-performance (= 1.15.2)
@@ -21,7 +21,7 @@ GEM
     method_source (1.0.0)
     minitest (5.17.0)
     parallel (1.22.1)
-    parser (3.2.0.0)
+    parser (3.2.1.0)
       ast (~> 2.4.1)
     pry (0.14.2)
       coderay (~> 1.1)

data/lib/standard/lsp/kills_server.rb

@@ -0,0 +1,10 @@
+module Standard
+  module Lsp
+    class KillsServer
+      def call(&blk)
+        at_exit(&blk) unless blk.nil?
+        exit 0
+      end
+    end
+  end
+end

data/lib/standard/lsp/routes.rb

@@ -1,3 +1,5 @@
+require_relative "kills_server"
+
 module Standard
   module Lsp
     class Routes
@@ -7,6 +9,7 @@ module Standard
         @standardizer = standardizer
 
         @text_cache = {}
+        @kills_server = KillsServer.new
       end
 
       def self.handle(name, &block)
@@ -25,6 +28,7 @@ module Standard
           capabilities: Proto::Interface::ServerCapabilities.new(
             document_formatting_provider: true,
             diagnostic_provider: true,
+            execute_command_provider: true,
             text_document_sync: Proto::Interface::TextDocumentSyncOptions.new(
               change: Proto::Constant::TextDocumentSyncKind::FULL
             )
@@ -37,11 +41,11 @@ module Standard
       end
 
       handle "shutdown" do |request|
-        @logger.puts "Client asked to shutdown Standard LSP server. Exiting..."
-        at_exit {
+        @logger.puts "Client asked to shutdown Standard LSP server."
+        @kills_server.call do
           @writer.write(id: request[:id], result: nil)
-        }
-        exit 0
+          @logger.puts "Exiting..."
+        end
       end
 
       handle "textDocument/diagnostic" do |request|
@@ -71,16 +75,51 @@ module Standard
         @writer.write({id: request[:id], result: format_file(uri)})
       end
 
+      handle "workspace/didChangeWatchedFiles" do |request|
+        if request[:params][:changes].any? { |change| change[:uri].end_with?(".standard.yml") }
+          @logger.puts "Configuration file changed; restart required"
+          @kills_server.call
+        end
+      end
+
+      handle "workspace/executeCommand" do |request|
+        if request[:params][:command] == "standardRuby.formatAutoFixes"
+          uri = request[:params][:arguments][0][:uri]
+          @writer.write({
+            id: request[:id],
+            method: "workspace/applyEdit",
+            params: {
+              label: "Format with Standard Ruby auto-fixes",
+              edit: {
+                changes: {
+                  uri => format_file(uri)
+                }
+              }
+            }
+          })
+        else
+          handle_unsupported_method(request, request[:params][:command])
+        end
+      end
+
       handle "textDocument/didSave" do |_request|
-        # No-op
+        # Nothing to do
       end
 
       handle "$/cancelRequest" do |_request|
-        # No-op
+        # Can't cancel anything because single-threaded
       end
 
       handle "$/setTrace" do |_request|
-        # No-op
+        # No-op, we log everything
+      end
+
+      def handle_unsupported_method(request, method = request[:method])
+        @writer.write({id: request[:id], error: Proto::Interface::ResponseError.new(
+          code: Proto::Constant::ErrorCodes::METHOD_NOT_FOUND,
+          message: "Unsupported Method: #{method}"
+        )})
+        @logger.puts "Unsupported Method: #{method}"
       end
 
       private

data/lib/standard/lsp/server.rb

@@ -23,15 +23,13 @@ module Standard
 
       def start
         @reader.read do |request|
+          next unless request.key?(:method) # ignore responses without methods
+
           method = request[:method]
           if (route = @routes.for(method))
             route.call(request)
           else
-            @writer.write({id: request[:id], error: Proto::Interface::ResponseError.new(
-              code: Proto::Constant::ErrorCodes::METHOD_NOT_FOUND,
-              message: "Unsupported Method: #{method}"
-            )})
-            @logger.puts "Unsupported Method: #{method}"
+            @routes.handle_unsupported_method(request)
           end
         rescue => e
           @logger.puts "Error #{e.class} #{e.message[0..100]}"

data/lib/standard/version.rb

@@ -1,3 +1,3 @@
 module Standard
-  VERSION = Gem::Version.new("1.24.0")
+  VERSION = Gem::Version.new("1.24.1")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.24.1
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-09 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -102,6 +102,7 @@ files:
 - lib/standard/formatter.rb
 - lib/standard/loads_runner.rb
 - lib/standard/loads_yaml_config.rb
+- lib/standard/lsp/kills_server.rb
 - lib/standard/lsp/logger.rb
 - lib/standard/lsp/routes.rb
 - lib/standard/lsp/server.rb