Merge pull request #628 from wadetandy/rubyfmt

Get modern rubyfmt working
rubyide · Jun 16, 2020 · 9ca9719 · 9ca9719
2 parents 19b8b34 + bf4564b
commit 9ca9719
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3,795 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -75,7 +75,7 @@ Improvements:
 - Support SLIM heredocs [#274](https://github.com/rubyide/vscode-ruby/issues/274)
 - Support heredocs defined inline during a method call [#183](https://github.com/rubyide/vscode-ruby/issues/183)
 - Drop `spawn-rx` for custom version which allows greater control over failed commands
-- Support [RubyFMT](https://github.com/samphippen/rubyfmt) as a formatter [#445](https://github.com/rubyide/vscode-ruby/issues/445)
+- Support [RubyFMT](https://github.com/penelopezone/rubyfmt) as a formatter [#445](https://github.com/rubyide/vscode-ruby/issues/445)
 - Add command palette entries for viewing extension and language server logs (`Ruby: Show Output Channel` and `Ruby: Show Language Server Output Channel`)
 - Support multiline and keyword option YARD comments [#371](https://github.com/rubyide/vscode-ruby/pull/371)
 - Improve/Fix Block Parameter Highlighting [#514](https://github.com/rubyide/vscode-ruby/pull/514)

diff --git a/docs/formatting.md b/docs/formatting.md
@@ -5,7 +5,7 @@ The language server currently supports formatting via the following formatters:
 - [RuboCop](https://github.com/rubocop-hq/rubocop)
 - [Standard](https://github.com/testdouble/standard)
 - [Rufo](https://github.com/ruby-formatter/rufo)
-- [RubyFMT](https://github.com/samphippen/rubyfmt)
+- [RubyFMT](https://github.com/penelopezone/rubyfmt)
 
 ## Configuration
 

diff --git a/docs/language-server.md b/docs/language-server.md
@@ -7,7 +7,7 @@ The server is built to be extensible, accurate, and performant with such feature
 - Automatic Ruby environment detection with support for rvm, rbenv, chruby, and asdf
 - Robust language feature extraction powered by the [tree-sitter](https://tree-sitter.github.io/tree-sitter/) project
 - Lint support via RuboCop, Reek, and Standard
-- Format support via RuboCop, Standard, and Rufo
+- Format support via RuboCop, Standard, Rubyfmt, and Rufo
 - Semantic code folding support
 - Semantic highlighting support
 - Intellisense support

diff --git a/packages/language-server-ruby/src/formatters/RubyFMT.ts b/packages/language-server-ruby/src/formatters/RubyFMT.ts
@@ -1,15 +1,12 @@
-import path from 'path';
 import BaseFormatter from './BaseFormatter';
 
-const RUBYFMT_PATH = path.resolve(__dirname, 'rubyfmt.rb');
-
 export default class RubyFMT extends BaseFormatter {
 	get cmd(): string {
-		return 'ruby';
+		return 'rubyfmt';
 	}
 
 	get args(): string[] {
-		return ['--disable=gems', RUBYFMT_PATH];
+		return [];
 	}
 
 	get useBundler(): boolean {