ruby-lsp-rubyfmt-formatter 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed5cb1b1289eb0b163a41623c2747754ec8c8c26aeb98221290445be1bd5a767
-  data.tar.gz: 68244f3c075f5286267cf0e7f525a0385227f0ae57ae15135a50f20202f9d15a
+  metadata.gz: e580a05f58e3543801587b5098c5389df062b05e516180e48ea97751427533f8
+  data.tar.gz: 71f7ea4463e475f05eefa8ad3d85c1a3d0d175d80beed5e766a593b4ca71201e
 SHA512:
-  metadata.gz: a6d7d26044b7cf7f9430fabf3e727276d1d4ad1f8f97d2d3cc921db60f5e8b2da948b88aed97d0aa52bcdb514eb4dd1810af12ffeb246f8c2b19aa3059fb4657
-  data.tar.gz: 3a5b50120bfe500ad94737055ec8ba86e6f7872eda1a5861ec400fe797a626662a257ddb6659d3a626c0a40ecbe1524bcd75a31d9f7dc9d9661eca3ba56efa4e
+  metadata.gz: 031142cf02cfed40ccdf601e7c08fd71f7583821c93bef22fdbaeebbe4f4b94716b7273511e1f1eff6671bf61837b7d65feebf8114f1e1dcb2b035dcb7d1d6a1
+  data.tar.gz: f82456554a6232aced596eab50b4e07b00e3c11096e28fd16c89f1465053e39aafeaca81f803b2b333a36bb0841769f3fd286857b1ba3d841ab0adc670c70a82

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+## 0.1.2
+
+- Pass `--stdin-path` on supported versions (>=0.13.0) of `rubyfmt`
+
+## 0.1.1
+
+- Correctly read arguments from VSCode settings
+
+## 0.1.0
+
+Initial release! 🎉

data/Rakefile

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+require "bundler/gem_tasks"
+require "rubocop/rake_task"
 require "minitest/test_task"
 
 Minitest::TestTask.create
+RuboCop::RakeTask.new
 
-task(default: %i[test])
+task(default: %i[test rubocop])

data/lib/ruby_lsp/rubyfmt_formatter/addon.rb

@@ -2,6 +2,7 @@
 
 require "ruby_lsp/internal"
 require "open3"
+require "uri"
 
 module RubyLsp
   module RubyfmtFormatter
@@ -28,7 +29,7 @@ module RubyLsp
 
       def run_formatting(uri, document)
         source = document.source
-        command = build_command
+        command = build_command(uri)
 
         stdout, stderr, status = Open3.capture3(*command, stdin_data: source)
 
@@ -47,27 +48,50 @@ module RubyLsp
         # rubyfmt doesn't emit diagnostics
       end
 
-      private def build_command
+      private def build_command(uri)
         path = rubyfmt_executable
         args = additional_args
 
+        if uri && supports_stdin_filepath?
+          file_path = URI(uri.to_s).path
+          args += ["--stdin-filepath", file_path] if file_path
+        end
+
         [path] + args
       end
 
       private def rubyfmt_executable
         # Fall back to PATH if nothing is provided
-        settings.fetch("rubyfmtPath", "rubyfmt")
+        settings.fetch(:rubyfmtPath, "rubyfmt")
       end
 
       private def additional_args
-        args_string = settings.fetch("rubyfmtArgs", "")
+        args_string = settings.fetch(:rubyfmtArgs, "")
         return [] if args_string.empty?
 
         args_string.split
       end
 
+      private def supports_stdin_filepath?
+        Gem::Version.new(rubyfmt_version) >= Gem::Version.new("0.13.0")
+      rescue ArgumentError
+        false
+      end
+
+      private def rubyfmt_version
+        @rubyfmt_version ||= begin
+          stdout, _stderr, status = Open3.capture3(rubyfmt_executable, "--version")
+          if status.success? && (match = stdout.match(/(\d+\.\d+\.\d+)/))
+            match[1]
+          else
+            "0.0.0"
+          end
+        end
+      end
+
       private def settings
         addon_settings = @global_state.settings_for_addon("rubyfmt")
+        addon_settings&.transform_keys!(&:to_sym)
         addon_settings || {}
       end
     end

data/lib/ruby_lsp/rubyfmt_formatter/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLsp
   module RubyfmtFormatter
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rubyfmt-formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Reese Williams
@@ -30,6 +30,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".vscode/settings.json"
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -41,6 +42,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/reese/ruby-lsp-rubyfmt-formatter
   source_code_uri: https://github.com/reese/ruby-lsp-rubyfmt-formatter
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -55,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A Ruby LSP add-on for formatting with `rubyfmt`.
 test_files: []