rubocop-lsp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c17a7ea5c41b994245f6f8d3231d64bd14debc7d694383f2e847f0ccef92d82
-  data.tar.gz: c1b2f65bfd943cc815ac35196660296f11e89bdfd6945f605014c813c7244489
+  metadata.gz: 2e39f6df6dfef436bd3d67d745e2b300e9eead65c37ddeb8d28e05ac916d6ce5
+  data.tar.gz: d537d77e74bef4a92db2a71a05fd4e1b8c4832f4ca40a9a524b94433e9a1f204
 SHA512:
-  metadata.gz: ffacb6a3e97dd4d3d70e8c36daf9a6d3864b1a732ea09fa5bb6f92cba96ea7cb4ac15d8e384fd82b839dea513af5de15da072289cbad99e90d80f9bb81298a3f
-  data.tar.gz: 6d37b9ee07feda017345dd717c26c158d8cafe154d2b3c61b89d460d1edcc092cebfeb7fe68d1167e7036d097de9a41347b3208e19a438c355327037739ef4ca
+  metadata.gz: 5de228c6fa093e2835e58686a6452d04971d5808a84ed15b2cae42a2ccbecc126e0ca115695b0c82075d455b2cf59778d35a3b6ca5cc44d8ba0f5c2e09fbb6b5
+  data.tar.gz: 33eeba13254dc0ee9617ef1b1d8f559da3a91ac3e9c9daeafc528fe38bdafab90975260ed7b04a8a4d22771b097c381574ef0398d3219aa48fd125bd47319423

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-lsp (0.1.1)
+    rubocop-lsp (0.1.2)
       language_server-protocol (>= 3.16)
       rubocop (>= 1.0)
 

data/lib/rubocop/lsp/cli.rb

@@ -22,8 +22,9 @@ module Rubocop
               capabilities: Interface::ServerCapabilities.new(
                 text_document_sync: Interface::TextDocumentSyncOptions.new(
                   change: Constant::TextDocumentSyncKind::FULL,
-                  open_close: true
+                  open_close: true,
                 ),
+                document_formatting_provider: true,
                 code_action_provider: true
               ),
             )
@@ -62,6 +63,16 @@ module Rubocop
             nil
           end
 
+          on("textDocument/formatting") do |request|
+            uri = request[:params][:textDocument][:uri]
+            file = CGI.unescape(URI.parse(uri).path)
+
+            collector = DiagnosticCollector.new(file: file, text: File.binread(file))
+            collector.run
+
+            collector.text_edits_from_formatting
+          end
+
           on("textDocument/codeAction") do |request|
             uri = request[:params][:textDocument][:uri]
             range = request[:params][:range]

data/lib/rubocop/lsp/diagnostic_collector.rb

@@ -4,21 +4,25 @@ class DiagnosticCollector < RuboCop::Formatter::BaseFormatter
   Interface = LanguageServer::Protocol::Interface
   Constant = LanguageServer::Protocol::Constant
 
-  attr_reader :diagnostics
+  attr_reader :file, :text, :formatted_text, :diagnostics
 
-  def initialize
+  def initialize(file:, text:)
     super({}, nil)
+    @file = file
+    @text = text
+    @formatted_text = nil
   end
 
-  def run(file:, text:)
+  def run
     config_store = ::RuboCop::ConfigStore.new
-    options, paths = ::RuboCop::Options.new.parse(["--stderr"])
+    options, paths = ::RuboCop::Options.new.parse(["--stderr", "--auto-correct"])
     # config_store.options_config = options[:config] if options[:config]
     options[:stdin] = text
     paths << file
     runner = ::RuboCop::Runner.new(options, config_store)
     runner.send(:formatter_set).clear.push(self)
     runner.run(paths)
+    @formatted_text = options[:stdin]
   end
 
   def file_finished(_file, offenses)
@@ -27,6 +31,20 @@ class DiagnosticCollector < RuboCop::Formatter::BaseFormatter
     end
   end
 
+  def formatting_text_edits
+    return unless formatted_text
+
+    [
+      Interface::TextEdit.new(
+        range: Interface::Range.new(
+          start: Interface::Position.new(line: 0, character: 0),
+          end: Interface::Position.new(line: text.size, character: text.size)
+        ),
+        new_text: formatted_text
+      ),
+    ]
+  end
+
   private
 
   def diagnostic_from_offense(offense)

data/lib/rubocop/lsp/diagnostic_store.rb

@@ -35,7 +35,6 @@ module DiagnosticStore
 
     unless actions.empty?
       actions << code_action_from_diagnostics(uri, line_diagnostics, title: "Autocorrect all offenses on line")
-      actions << code_action_from_diagnostics(uri, file_diagnostics, title: "Autocorrect all offenses in file")
     end
 
     actions

data/lib/rubocop/lsp/handler.rb

@@ -65,8 +65,8 @@ class Handler
 
   def collect_diagnostics(uri:, text:)
     file = CGI.unescape(URI.parse(uri).path)
-    collector = DiagnosticCollector.new
-    collector.run(file: file, text: text)
+    collector = DiagnosticCollector.new(file: file, text: text)
+    collector.run
     DiagnosticStore.set_diagnostics_for(uri, collector.diagnostics)
   end
 end

data/lib/rubocop/lsp/version.rb

@@ -2,6 +2,6 @@
 
 module Rubocop
   module Lsp
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-lsp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Shopify