rufo 0.8.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8e977df730572c1448155a1bc4e3fd358a1abcdadf78c18700874e75e9c54aa
-  data.tar.gz: 07a074f0137daf3c957dd2d6646efb72281b062b93a7df7b1981b3fdcdd3ca79
+  metadata.gz: 67f0bac262d71b5c91c9babdc6d975e88d1b7f04e903b8111f7ccf4f56aa2a35
+  data.tar.gz: c437092573d817e16b05bf2ddc6a1b5a084bc8a81a06836b2e84528f65db1dca
 SHA512:
-  metadata.gz: 32de1903e674e7a21f34b0e092d2fd4af9fa9db9f4570611b9e50bb7ec1ba031df7b940dbc9797855688d3a6956dfa2830a0251bf4ec7296b6f4a7b5117ad5fd
-  data.tar.gz: 9592effea9978267ab0dc2d641b8e033a7a4156723a68e0aaf2b1742f69b768329a6a8d4824fcd0fdaf1ed342279f59a1cb2e15c13514045d350ddbfcbce6060
+  metadata.gz: 4e14f22cc80b1566449f65c5b5eb7ceaa4b3f7ed9e98c9dbce35161830049d155c7cc83dd6fe5c3e965ebc085b7cda787b18d4a705b71daebdc1571060a7b545
+  data.tar.gz: a49e26fe230db7e7c42d6f0a8cb700dec11caac98dfc6bfdc7eda7a0cfe80c3fb7b5da675acf0fd29da6b70253c893183279fd1b042d1f6e450f66b1e6e29813

data/.circleci/config.yml

@@ -28,6 +28,9 @@
                             --format RspecJunitFormatter \
                             --out test_results/rspec.xml \
                             --format progress
+    - run:
+          name: Upload code coverage
+          command: bash <(curl -s https://codecov.io/bash) -f 'coverage/coverage.xml'
     - run:
         name: Run RuboCop
         command: |
@@ -53,55 +56,46 @@
     - store_test_results:
         path: test_results
 
-
 version: 2
 jobs:
-  build-2-7-0:
+  build-3-0-1:
     <<: *dockerbuild
     docker:
-      - image: circleci/ruby:2.7.0
+      - image: circleci/ruby:3.0.1
         environment:
           BUNDLE_JOBS: "3"
           BUNDLE_RETRY: "3"
           BUNDLE_PATH: /home/circleci/project/vendor/bundle
-  build-2-6-3:
+  build-2-7-3:
     <<: *dockerbuild
     docker:
-      - image: circleci/ruby:2.6.3
+      - image: circleci/ruby:2.7.3
         environment:
           BUNDLE_JOBS: "3"
           BUNDLE_RETRY: "3"
           BUNDLE_PATH: /home/circleci/project/vendor/bundle
-  build-2-6-1:
+  build-2-6-7:
     <<: *dockerbuild
     docker:
-      - image: circleci/ruby:2.6.1
+      - image: circleci/ruby:2.6.7
         environment:
           BUNDLE_JOBS: "3"
           BUNDLE_RETRY: "3"
-          BUNDLE_PATH: vendor/bundle
-  build-2-5-3:
-    <<: *dockerbuild
-    docker:
-      - image: circleci/ruby:2.5.3
-        environment:
-          BUNDLE_JOBS: "3"
-          BUNDLE_RETRY: "3"
-          BUNDLE_PATH: vendor/bundle
-  build-2-4-5:
+          BUNDLE_PATH: /home/circleci/project/vendor/bundle
+  build-2-6-1:
     <<: *dockerbuild
     docker:
-      - image: circleci/ruby:2.4.5
+      - image: circleci/ruby:2.6.1
         environment:
           BUNDLE_JOBS: "3"
           BUNDLE_RETRY: "3"
           BUNDLE_PATH: vendor/bundle
+
 workflows:
   version: 2
   test:
     jobs:
-      - build-2-7-0
-      - build-2-6-3
+      - build-3-0-1
+      - build-2-7-3
+      - build-2-6-7
       - build-2-6-1
-      - build-2-5-3
-      - build-2-4-5

data/.gitignore

@@ -11,4 +11,8 @@
 
 # rspec failure tracking
 .rspec_status
+spec/examples.txt
+
 sample_code
+
+.byebug_history

data/.rspec

@@ -1,2 +1,2 @@
+--require spec_helper
 --format documentation
---color

data/.rubocop.yml

@@ -2,7 +2,7 @@ AllCops:
   Exclude:
     - "spec/**/*"
     - "vendor/**/*"
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
 
 Layout:
   Enabled: false

data/CHANGELOG.md

@@ -12,6 +12,88 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+## [0.13.0] - 2021-05-07
+
+### Fixed
+
+- Properly format comma when a heredoc is passed as a call argument
+- Correctly interpret case statements with multiple when clauses in ERB files
+
+### Changed
+
+- Dropped support for Ruby 2.4 and 2.5 as they are end of life.
+
+### Added
+
+- Add Ruby 3.0.1 to test runs on CI.
+
+## [0.12.0] - 2020-03-08
+
+### Fixed
+
+- File.read default encode UTF-8
+- Handle case where the code is invalid but ripper does not raise an error.
+- Removed implicit dependency on `rake`.
+- Error when semicolon and then used in a case statement #230.
+
+### Changed
+
+### Added
+- Code coverage tracking with codecov.io
+- `node_modules` folders are now ignored.
+
+## [0.11.0] - 2020-02-09
+
+### Fixed
+- Documentation for `trailing_commas`
+- Handle empty string symbol for key in hash.
+
+### Added
+- Support for escaped ERB template tags. For example `<%%%%= format :name %>`.
+
+## [0.10.0] - 2020-01-16
+
+### Fixed
+- Squiggly heredoc closing tag indentation.
+- Formatting .erb files from stdin.
+
+### Changed
+- Method parameters are now no longer aligned with the method parenthesis. For example:
+  - ```ruby
+    def foo(
+            param
+           )
+    end
+
+    # Becomes:
+
+    def foo(
+      param
+    )
+    end
+    ```
+- Multiline assignments are no longer aligned with variable indentation.
+  - ```ruby
+    a = if true
+          b
+        end
+
+    # Becomes:
+
+    a = if true
+        b
+      end
+    ```
+### Added
+
+## [0.9.0] - 2020-01-11
+
+### Added
+
+- Support for trim style erb templates ending with `-%>`.
+- Support for rails raw mode erb templates starting with `<%==`.
+- Support for ruby 2.7 features. This includes beginless ranges `..10`, method argument forwarding `def forward(...); to(...); end` and keyword args not being allowed `def foo(*args, **nil)`.
+
 ## [0.8.1] - 2020-01-02
 
 ### Fixed

data/bin/verify-sample-code

@@ -8,6 +8,7 @@ repos = {
       "spec/rspec/core/formatters/snippet_extractor_spec.rb",
       "spec/rspec/core/metadata_spec.rb",
       "spec/rspec/core/formatters/html_formatter_spec.rb",
+      "spec/rspec/core/formatters_spec.rb",
     ].join(","),
   },
 }

data/docs/settings.md

@@ -23,7 +23,7 @@ See https://github.com/ruby-formatter/rufo/issues/2 for more context!
 - [parens_in_def](#parens_in_def)
 - [trailing_commas](#trailing_commas)
 - [quote_style](#quote_style)
-- [includes and excludes](#includes%20and%20excludes)
+- [includes and excludes](#includes-and-excludes)
 
 ### align_case_when
 
@@ -116,8 +116,8 @@ With `:dynamic` it won't modify it.
 
 Use trailing commas in array and hash literals, and keyword arguments?
 
-- `:always`: (default) always put a trailing comma
-- `:never`: never put a trailing comma
+- `true`: (default) always put a trailing comma
+- `false`: never put a trailing comma
 
 Given this code:
 
@@ -153,7 +153,7 @@ foo(
 )
 ```
 
-With `:always`, the formatter will change it to:
+With `true`, the formatter will change it to:
 
 ```ruby
 [
@@ -187,7 +187,7 @@ foo(
 )
 ```
 
-With `:never`, the formatter will change it to:
+With `false`, the formatter will change it to:
 
 ```ruby
 [
@@ -284,5 +284,5 @@ Files can be excluded or included in formatting with rufo by specifying glob pat
 For example:
 ```
 includes [*.txt,*.text]
-excludes [*.rb]
+excludes [**/*.erb]
 ```

data/lib/rufo.rb

@@ -2,6 +2,7 @@
 
 module Rufo
   class Bug < StandardError; end
+  class UnknownSyntaxError < StandardError; end
 
   class SyntaxError < StandardError
     attr_reader :lineno
@@ -25,4 +26,5 @@ require_relative "rufo/parser"
 require_relative "rufo/formatter"
 require_relative "rufo/erb_formatter"
 require_relative "rufo/version"
+require_relative "rufo/file_list"
 require_relative "rufo/file_finder"

data/lib/rufo/command.rb

@@ -35,17 +35,18 @@ class Rufo::Command
 
   def run(argv)
     status_code = if argv.empty?
-                    format_stdin
-                  else
-                    format_args argv
-                  end
+        format_stdin
+      else
+        format_args argv
+      end
     exit exit_code(status_code)
   end
 
   def format_stdin
     code = STDIN.read
 
-    result = format(code, @filename_for_dot_rufo || Dir.getwd)
+    erb = @filename_for_dot_rufo && @filename_for_dot_rufo.end_with?(".erb")
+    result = format(code, @filename_for_dot_rufo || Dir.getwd, erb: erb)
 
     print(result) if !@want_check
 
@@ -53,10 +54,13 @@ class Rufo::Command
   rescue Rufo::SyntaxError => e
     logger.error("STDIN is invalid code. Error on line:#{e.lineno} #{e.message}")
     CODE_ERROR
-  rescue => ex
+  rescue Rufo::UnknownSyntaxError
+    logger.error("STDIN is invalid code. Try running the code for a better error.")
+    CODE_ERROR
+  rescue => e
     logger.error("You've found a bug!")
     logger.error("Please report it to https://github.com/ruby-formatter/rufo/issues with code that triggers it\n")
-    raise ex
+    raise e
   end
 
   def format_args(args)
@@ -95,7 +99,7 @@ class Rufo::Command
 
   def format_file(filename)
     logger.debug("Formatting: #{filename}")
-    code = File.read(filename)
+    code = File.read(filename, encoding: "UTF-8")
 
     begin
       location = @filename_for_dot_rufo || File.dirname(filename)
@@ -121,11 +125,14 @@ class Rufo::Command
   rescue Rufo::SyntaxError => e
     logger.error("#{filename}:#{e.lineno} #{e.message}")
     CODE_ERROR
-  rescue => ex
+  rescue Rufo::UnknownSyntaxError
+    logger.error("#{filename} is invalid code. Try running the code for a better error.")
+    CODE_ERROR
+  rescue => e
     logger.error("You've found a bug!")
     logger.error("It happened while trying to format the file #{filename}")
     logger.error("Please report it to https://github.com/ruby-formatter/rufo/issues with code that triggers it\n")
-    raise ex
+    raise e
   end
 
   def format(code, dir, erb: false)

data/lib/rufo/erb_formatter.rb

@@ -1,6 +1,21 @@
 # frozen_string_literal: true
 require "erb"
 
+class CustomScanner < ERB::Compiler::TrimScanner
+  def initialize(src)
+    super(src, "<>", false)
+    @scan_reg = /(.*?)(%>\r?\n|#{(stags + etags).join("|")}|\n|\z)/m
+  end
+
+  def stags
+    ["<%==", "<%+={0,2}"] + super
+  end
+
+  def etags
+    super + ["-%>"]
+  end
+end
+
 class Rufo::ErbFormatter
   def self.format(code, **options)
     new(code, **options).format
@@ -9,9 +24,8 @@ class Rufo::ErbFormatter
   attr_reader :result
 
   def initialize(code, **options)
-    compiler = ERB::Compiler.new("<>")
     @options = options
-    @scanner = compiler.make_scanner(code)
+    @scanner = CustomScanner.new(code)
     @code_mode = false
     @current_lineno = 0
     @current_column = 0
@@ -97,6 +111,7 @@ class Rufo::ErbFormatter
     return "begin", nil if Ripper.sexp("begin #{code_str}")
     return "begin\n", "\nend" if Ripper.sexp("begin\n#{code_str}\nend")
     return "if a\n", "\nend" if Ripper.sexp("if a\n#{code_str}\nend")
+    return "case a\n", "\nend" if Ripper.sexp("case a\n#{code_str}\nend")
     raise_syntax_error!(code_str)
   end
 

data/lib/rufo/file_finder.rb

@@ -1,6 +1,3 @@
-require "find"
-require "rake/file_list"
-
 class Rufo::FileFinder
   include Enumerable
 
@@ -31,12 +28,9 @@ class Rufo::FileFinder
     *EXTENSIONS,
   ]
 
-  EXCLUDED_DIRS = [
-    "vendor",
-  ]
-
   EXCLUDE_PATTERNS = [
     "vendor/**/*",
+    "node_modules/**/*",
   ]
 
   def initialize(files_or_dirs, includes: [], excludes: [])
@@ -69,7 +63,7 @@ class Rufo::FileFinder
   end
 
   def build_file_list
-    fl = Rake::FileList.new(*DEFAULT_PATTERNS)
+    fl = Rufo::FileList.new(*DEFAULT_PATTERNS)
     fl.exclude(*EXCLUDE_PATTERNS)
     fl.exclude(*excludes)
     fl.include(*includes)

data/lib/rufo/file_list.rb

@@ -0,0 +1,244 @@
+# frozen_string_literal: true
+
+# This file is based on https://github.com/ruby/rake/blob/master/lib/rake/file_list.rb
+# Git commit: 5b8f8fc41a5d7d7d6a5d767e48464c60884d3aee
+
+module Rufo
+
+  ##
+  # A FileList is essentially an array with a few helper methods defined to
+  # make file manipulation a bit easier.
+  #
+  # FileLists are lazy.  When given a list of glob patterns for possible files
+  # to be included in the file list, instead of searching the file structures
+  # to find the files, a FileList holds the pattern for latter use.
+  #
+  # This allows us to define a number of FileList to match any number of
+  # files, but only search out the actual files when then FileList itself is
+  # actually used.  The key is that the first time an element of the
+  # FileList/Array is requested, the pending patterns are resolved into a real
+  # list of file names.
+  #
+  class FileList
+
+    # == Method Delegation
+    #
+    # The lazy evaluation magic of FileLists happens by implementing all the
+    # array specific methods to call +resolve+ before delegating the heavy
+    # lifting to an embedded array object (@items).
+    #
+    # In addition, there are two kinds of delegation calls.  The regular kind
+    # delegates to the @items array and returns the result directly.  Well,
+    # almost directly.  It checks if the returned value is the @items object
+    # itself, and if so will return the FileList object instead.
+    #
+    # The second kind of delegation call is used in methods that normally
+    # return a new Array object.  We want to capture the return value of these
+    # methods and wrap them in a new FileList object.  We enumerate these
+    # methods in the +SPECIAL_RETURN+ list below.
+
+    # List of array methods (that are not in +Object+) that need to be
+    # delegated.
+    ARRAY_METHODS = (Array.instance_methods - Object.instance_methods).map(&:to_s)
+
+    # List of additional methods that must be delegated.
+    MUST_DEFINE = %w[inspect <=>]
+
+    # List of methods that should not be delegated here (we define special
+    # versions of them explicitly below).
+    MUST_NOT_DEFINE = %w[to_a to_ary partition * <<]
+
+    # List of delegated methods that return new array values which need
+    # wrapping.
+    SPECIAL_RETURN = %w[
+      map collect sort sort_by select find_all reject grep
+      compact flatten uniq values_at
+      + - & |
+    ]
+
+    DELEGATING_METHODS = (ARRAY_METHODS + MUST_DEFINE - MUST_NOT_DEFINE).map(&:to_s).sort.uniq
+
+    # Now do the delegation.
+    DELEGATING_METHODS.each do |sym|
+      if SPECIAL_RETURN.include?(sym)
+        ln = __LINE__ + 1
+        class_eval %{
+          def #{sym}(*args, &block)
+            resolve
+            result = @items.send(:#{sym}, *args, &block)
+            self.class.new.import(result)
+          end
+        }, __FILE__, ln
+      else
+        ln = __LINE__ + 1
+        class_eval %{
+          def #{sym}(*args, &block)
+            resolve
+            result = @items.send(:#{sym}, *args, &block)
+            result.object_id == @items.object_id ? self : result
+          end
+        }, __FILE__, ln
+      end
+    end
+
+    GLOB_PATTERN = %r{[*?\[\{]}
+
+    # Create a file list from the globbable patterns given.  If you wish to
+    # perform multiple includes or excludes at object build time, use the
+    # "yield self" pattern.
+    #
+    # Example:
+    #   file_list = FileList.new('lib/**/*.rb', 'test/test*.rb')
+    #
+    #   pkg_files = FileList.new('lib/**/*') do |fl|
+    #     fl.exclude(/\bCVS\b/)
+    #   end
+    #
+    def initialize(*patterns)
+      @pending_add = []
+      @pending = false
+      @exclude_patterns = DEFAULT_IGNORE_PATTERNS.dup
+      @exclude_procs = DEFAULT_IGNORE_PROCS.dup
+      @items = []
+      patterns.each { |pattern| include(pattern) }
+      yield self if block_given?
+    end
+
+    # Add file names defined by glob patterns to the file list.  If an array
+    # is given, add each element of the array.
+    #
+    # Example:
+    #   file_list.include("*.java", "*.cfg")
+    #   file_list.include %w( math.c lib.h *.o )
+    #
+    def include(*filenames)
+      filenames.each do |fn|
+        @pending_add << fn
+      end
+      @pending = true
+      self
+    end
+
+    alias :add :include
+
+    # Register a list of file name patterns that should be excluded from the
+    # list.  Patterns may be regular expressions, glob patterns or regular
+    # strings.  In addition, a block given to exclude will remove entries that
+    # return true when given to the block.
+    #
+    # Note that glob patterns are expanded against the file system. If a file
+    # is explicitly added to a file list, but does not exist in the file
+    # system, then an glob pattern in the exclude list will not exclude the
+    # file.
+    #
+    # Examples:
+    #   FileList['a.c', 'b.c'].exclude("a.c") => ['b.c']
+    #   FileList['a.c', 'b.c'].exclude(/^a/)  => ['b.c']
+    #
+    # If "a.c" is a file, then ...
+    #   FileList['a.c', 'b.c'].exclude("a.*") => ['b.c']
+    #
+    # If "a.c" is not a file, then ...
+    #   FileList['a.c', 'b.c'].exclude("a.*") => ['a.c', 'b.c']
+    #
+    def exclude(*patterns, &block)
+      patterns.each do |pat|
+        @exclude_patterns << pat
+      end
+      @exclude_procs << block if block_given?
+      resolve_exclude unless @pending
+      self
+    end
+
+    # Return the internal array object.
+    def to_a
+      resolve
+      @items
+    end
+
+    def <<(obj)
+      resolve
+      @items << obj
+      self
+    end
+
+    # Resolve all the pending adds now.
+    def resolve
+      if @pending
+        @pending = false
+        @pending_add.each do |fn| resolve_add(fn) end
+        @pending_add = []
+        resolve_exclude
+      end
+      self
+    end
+
+    def resolve_add(filename) # :nodoc:
+      case filename
+      when GLOB_PATTERN
+        add_matching(filename)
+      else
+        self << filename
+      end
+    end
+
+    private :resolve_add
+
+    def resolve_exclude # :nodoc:
+      reject! { |fn| excluded_from_list?(fn) }
+      self
+    end
+
+    private :resolve_exclude
+    # Convert a FileList to a string by joining all elements with a space.
+    def to_s
+      resolve
+      self.join(" ")
+    end
+
+    # Add matching glob patterns.
+    def add_matching(pattern)
+      self.class.glob(pattern).each do |fn|
+        self << fn unless excluded_from_list?(fn)
+      end
+    end
+
+    private :add_matching
+
+    # Should the given file name be excluded from the list?
+    def excluded_from_list?(filename)
+      return true if @exclude_patterns.any? do |pat|
+        case pat
+        when Regexp
+          filename =~ pat
+        when GLOB_PATTERN
+          flags = File::FNM_PATHNAME
+          flags |= File::FNM_EXTGLOB
+          File.fnmatch?(pat, filename, flags)
+        else
+          filename == pat
+        end
+      end
+      @exclude_procs.any? { |p| p.call(filename) }
+    end
+
+    DEFAULT_IGNORE_PATTERNS = [
+      /(^|[\/\\])CVS([\/\\]|$)/,
+      /(^|[\/\\])\.svn([\/\\]|$)/,
+      /\.bak$/,
+      /~$/,
+    ]
+    DEFAULT_IGNORE_PROCS = [
+      proc { |fn| fn =~ /(^|[\/\\])core$/ && !File.directory?(fn) },
+    ]
+
+    class << self
+      # Get a sorted list of files matching the pattern. This method
+      # should be preferred to Dir[pattern] and Dir.glob(pattern) because
+      # the files returned are guaranteed to be sorted.
+      def glob(pattern, *args)
+        Dir.glob(pattern, *args).sort
+      end
+    end
+  end
+end

data/lib/rufo/formatter.rb

@@ -21,7 +21,10 @@ class Rufo::Formatter
 
     # sexp being nil means that the code is not valid.
     # Parse the code so we get better error messages.
-    Rufo::Parser.parse(code) if @sexp.nil?
+    if @sexp.nil?
+      Rufo::Parser.parse(code)
+      raise Rufo::UnknownSyntaxError # Sometimes parsing does not raise an error
+    end
 
     @indent = 0
     @line = 0
@@ -209,7 +212,7 @@ class Rufo::Formatter
     when :@float
       # Float literal
       #
-      # [:@int, "123.45", [1, 0]]
+      # [:@float, "123.45", [1, 0]]
       consume_token :on_float
     when :@rational
       # Rational literal
@@ -484,6 +487,8 @@ class Rufo::Formatter
       visit_begin_node(node)
     when :END
       visit_end_node(node)
+    when :args_forward
+      consume_op("...")
     else
       bug "Unhandled node: #{node.first}"
     end
@@ -885,19 +890,24 @@ class Rufo::Formatter
   def visit_assign_value(value)
     has_slash_newline, _first_space = skip_space_backslash
 
-    sticky = indentable_value?(value)
-
     # Remove backslash after equal + newline (it's useless)
     if has_slash_newline
       skip_space_or_newline
-      write_line
+      write_space
       indent(next_indent) do
-        write_indent
         visit(value)
       end
     else
-      indent_after_space value, sticky: sticky,
-                                want_space: true
+      if [:begin, :case, :if, :unless].include?(value.first)
+        skip_space_or_newline
+        write_space
+        indent(next_indent) do
+          visit value
+        end
+      else
+        indent_after_space value, sticky: false,
+                                  want_space: true
+      end
     end
   end
 
@@ -1116,11 +1126,14 @@ class Rufo::Formatter
 
       found_comma = comma?
 
+      heredoc_needs_newline = true
+
       if found_comma
         if needs_trailing_newline
           write "," if trailing_commas && !block_arg
 
           next_token
+          heredoc_needs_newline = !newline?
           indent(next_indent) do
             consume_end_of_line
           end
@@ -1132,7 +1145,7 @@ class Rufo::Formatter
       end
 
       if newline? || comment?
-        if needs_trailing_newline
+        if needs_trailing_newline && !@last_was_heredoc
           write "," if trailing_commas && want_trailing_comma
 
           indent(next_indent) do
@@ -1144,7 +1157,7 @@ class Rufo::Formatter
         end
       else
         if needs_trailing_newline && !found_comma
-          write "," if trailing_commas && want_trailing_comma
+          write "," if trailing_commas && want_trailing_comma && !@last_was_heredoc
           consume_end_of_line
           write_indent
         end
@@ -1159,8 +1172,9 @@ class Rufo::Formatter
       call_info << @line
     end
 
-    if @last_was_heredoc
+    if @last_was_heredoc && heredoc_needs_newline
       write_line
+      write_indent
     end
     consume_token :on_rparen
   end
@@ -1193,9 +1207,6 @@ class Rufo::Formatter
       write current_token_value.rstrip
       next_token
       write_line
-      if @heredocs.last[1]
-        write_indent(next_indent)
-      end
     end
 
     printed = false
@@ -2029,6 +2040,7 @@ class Rufo::Formatter
       next_token
       skip_space
       skip_semicolons
+      broken_across_line = false
 
       if empty_params?(params)
         skip_space_or_newline
@@ -2039,8 +2051,8 @@ class Rufo::Formatter
         write "("
 
         if newline? || comment?
-          column = @column
-          indent(column) do
+          broken_across_line = true
+          indent(next_indent) do
             consume_end_of_line
             write_indent
             visit params
@@ -2052,7 +2064,12 @@ class Rufo::Formatter
         end
 
         skip_space_or_newline
+        consume_keyword("nil") if current_token[1] == :on_kw
         check :on_rparen
+        if broken_across_line
+          write_line
+          write_indent
+        end
         write ")"
         next_token
       end
@@ -2125,6 +2142,8 @@ class Rufo::Formatter
       case rest_param
       when 0, [:excessed_comma]
         write_params_comma
+      when [:args_forward]
+        consume_op "..."
       else
         # [:rest_param, [:@ident, "x", [1, 15]]]
         _, rest = rest_param
@@ -2377,7 +2396,7 @@ class Rufo::Formatter
     # [:dot2, left, right]
     _, left, right = node
 
-    visit left
+    visit left unless left.nil?
     skip_space_or_newline
     consume_op(inclusive ? ".." : "...")
     skip_space_or_newline
@@ -2732,8 +2751,9 @@ class Rufo::Formatter
       # We have to be careful not to aumatically write a heredoc on next_token,
       # because we miss the chance to write a comma to separate elements
       first_space = skip_space_no_heredoc_check
-      wrote_comma = check_heredocs_in_literal_elements(is_last, wrote_comma)
-
+      indent(needed_indent) do
+        wrote_comma = check_heredocs_in_literal_elements(is_last, wrote_comma)
+      end
       next unless comma?
 
       unless is_last
@@ -2746,7 +2766,9 @@ class Rufo::Formatter
       next_token_no_heredoc_check
 
       first_space = skip_space_no_heredoc_check
-      wrote_comma = check_heredocs_in_literal_elements(is_last, wrote_comma)
+      indent(needed_indent) do
+        wrote_comma = check_heredocs_in_literal_elements(is_last, wrote_comma)
+      end
 
       if newline? || comment?
         if is_last
@@ -2909,10 +2931,23 @@ class Rufo::Formatter
       visit_comma_separated_list conds
       skip_space
     end
+    written_space = false
+    if semicolon?
+      inline = true
+      skip_semicolons
+
+      if newline? || comment?
+        inline = false
+      else
+        write ";"
+        track_case_when
+        write " "
+        written_space = true
+      end
+    end
 
-    then_keyword = keyword?("then")
-    inline = then_keyword || semicolon?
-    if then_keyword
+    if keyword?("then")
+      inline = true
       next_token
 
       skip_space
@@ -2926,7 +2961,7 @@ class Rufo::Formatter
         # Cancel tracking of `case when ... then` on a nelwine.
         @case_when_positions.pop
       else
-        write_space
+        write_space unless written_space
 
         write "then"
 
@@ -2949,16 +2984,6 @@ class Rufo::Formatter
 
         write_space
       end
-    elsif semicolon?
-      skip_semicolons
-
-      if newline? || comment?
-        inline = false
-      else
-        write ";"
-        track_case_when
-        write " "
-      end
     end
 
     if inline
@@ -3845,6 +3870,7 @@ class Rufo::Formatter
   end
 
   def node_line(node, beginning: true)
+    return if node.nil?
     # get line of node, it is only used in visit_hash right now,
     # so handling the following node types is enough.
     case node.first

data/lib/rufo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rufo
-  VERSION = "0.8.1"
+  VERSION = "0.13.0"
 end

data/rufo.gemspec

@@ -20,13 +20,16 @@ Gem::Specification.new do |spec|
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.4.5"
+  spec.required_ruby_version = ">= 2.6.0"
 
   spec.add_development_dependency "bundler", ">= 1.15"
-  spec.add_development_dependency "byebug", "~> 10.0.2"
+  spec.add_development_dependency "byebug", "~> 11.0.1"
   spec.add_development_dependency "guard-rspec", "~> 4.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rexml", "~> 3.2.5"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
-  spec.add_development_dependency "rubocop", "~> 0.63.1"
+  spec.add_development_dependency "rubocop", "~> 0.79.0"
+  spec.add_development_dependency "simplecov", "~> 0.18.5"
+  spec.add_development_dependency "simplecov-cobertura", "~> 1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Ary Borenszweig
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: 11.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: 11.0.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.63.1
+        version: 0.79.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.79.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.5
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.63.1
+        version: 1.3.1
 description: Fast and unobtrusive Ruby code formatter
 email:
 - asterite@gmail.com
@@ -140,6 +182,7 @@ files:
 - lib/rufo/dot_file.rb
 - lib/rufo/erb_formatter.rb
 - lib/rufo/file_finder.rb
+- lib/rufo/file_list.rb
 - lib/rufo/formatter.rb
 - lib/rufo/logger.rb
 - lib/rufo/parser.rb
@@ -151,7 +194,7 @@ homepage: https://github.com/ruby-formatter/rufo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -159,15 +202,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.5
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.17
+signing_key:
 specification_version: 4
 summary: Ruby code formatter
 test_files: []