prettier · kddnewton · Apr 17, 2019 · Apr 11, 2019 · Apr 11, 2019 · Apr 11, 2019
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -15,7 +15,7 @@
    }],
    "object-curly-newline": "off",
    "prefer-spread": "off",
-    "quotes": ["error", "double"]
+    "quotes": "off"
  },
  "globals": {
    "runCase": "readonly"

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.eslintcache
 /coverage/
 /node_modules/
 /yarn-error.log

diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,18 @@
 language: ruby
 rvm:
 - ruby-head
- 2.6.1
- 2.5.3
+- 2.6.2
+- 2.5.5
 branches:
  only: master
 before_install: bin/ci-install
 script:
- yarn test
+- RUBY_VERSION=$(ruby -e 'puts RUBY_VERSION') yarn test
 - yarn lint
 - yarn build
 - gem build prettier.gemspec
 - bundle exec rake test
- bundle exec rbprettier --check 'src/ripper.rb' 'lib/**/*.rb' 'test/*_test.rb' 'prettier.gemspec'
+- bundle exec rbprettier --check 'src/ripper.rb' 'lib/**/*.rb' 'test/rb/*_test.rb' 'prettier.gemspec'
 cache:
 - bundler
 - yarn
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ## [Unreleased]
 ### Added
 - Support for parsing things with a ruby shebang (e.g., `#!/usr/bin/env ruby` or `#!/usr/bin/ruby`).
+- [INTERNAL] Big tests refactor.
+- Make multiple `when` predicates break at 80 chars and then wrap to be inline with the other predicates.

 ## [0.10.0] - 2019-03-25
 ### Added

diff --git a/Rakefile b/Rakefile
@@ -4,9 +4,9 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'

 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
+  t.libs << 'test/rb'
  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.test_files = FileList['test/rb/**/*_test.rb']
 end

 task default: :test
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
  "main": "src/ruby.js",
  "scripts": {
    "build": "pkg --output pkg/prettier --targets=linux,macos,win node_modules/prettier/bin-prettier.js",
-    "lint": "eslint .",
+    "lint": "eslint --cache .",
    "print": "prettier --plugin=.",
    "rubocop": "run() { prettier --plugin=. $@ | bundle exec rubocop --stdin $1; }; run",
    "test": "jest"
@@ -32,8 +32,8 @@
    "pkg": "^4.3.7"
  },
  "jest": {
-    "setupFiles": [
-      "./test/testRunner.js"
+    "setupFilesAfterEnv": [
+      "./test/js/setupTests.js"
    ],
    "testRegex": ".test.js$"
  }

diff --git a/src/nodes.js b/src/nodes.js
@@ -1,4 +1,4 @@
-const { align, breakParent, concat, dedent, group, hardline, ifBreak, indent, join, line, literalline, markAsRoot, softline, trim } = require("prettier").doc.builders;
+const { align, breakParent, concat, dedent, fill, group, hardline, ifBreak, indent, join, line, literalline, markAsRoot, softline, trim } = require("prettier").doc.builders;
 const { removeLines } = require("prettier").doc.utils;
 const { concatBody, empty, first, literal, makeArgs, makeCall, makeList, prefix, printComments, skipAssignIndent } = require("./utils");

@@ -564,8 +564,15 @@ const nodes = {
  when: (path, opts, print) => {
    const [_predicates, _statements, addition] = path.getValue().body;

+    const predicates = path.call(print, "body", 0).reduce(
+      (accum, pred, index) => (
+        index === 0 ? [pred] : accum.concat([",", line, pred])
+      ),
+      null
+    );
+
    const stmts = path.call(print, "body", 1);
-    const parts = [group(concat(["when ", join(", ", path.call(print, "body", 0))]))];
+    const parts = [group(concat(["when ", align(5, fill(predicates))]))];

    if (!stmts.parts.every(part => !part)) {
      parts.push(indent(concat([hardline, stmts])));

diff --git a/src/nodes/blocks.js b/src/nodes/blocks.js
@@ -110,11 +110,14 @@ const printBlock = (path, opts, print) => {
    return concat([breakParent, doBlock]);
  }

+  const hasBody = stmts.some(({ type }) => type !== "void_stmt");
  const braceBlock = concat([
-    " { ",
+    " {",
+    (hasBody || variables) ? " " : "",
    variables ? path.call(print, "body", 0) : "",
    path.call(print, "body", 1),
-    " }"
+    hasBody ? " " : "",
+    "}"
  ]);

  return group(ifBreak(doBlock, braceBlock));

diff --git a/src/ripper.rb b/src/ripper.rb
@@ -249,6 +249,7 @@ module InlineComments
      assoc_new: [:body, 1],
      break: [:body, 0],
      command: [:body, 1],
+      command_call: [:body, 3],
      string_literal: [:body, 0]
    }

@@ -268,7 +269,7 @@ def self.prepended(base)
      define_method(:"on_#{event}") do |*body|
        @last_sexp =
          super(*body).tap do |sexp|
-            comments = sexp.dig(*path).delete(:comments)
+            comments = (sexp.dig(*path) || {}).delete(:comments)
            sexp.merge!(comments: comments) if comments
          end
      end
@@ -320,7 +321,8 @@ def on_comment(body)
      case RipperJS.lex_state_name(state)
      when 'EXPR_END', 'EXPR_ARG|EXPR_LABELED', 'EXPR_ENDFN'
        last_sexp.merge!(comments: [sexp])
-      when 'EXPR_CMDARG', 'EXPR_END|EXPR_ENDARG', 'EXPR_ENDARG', 'EXPR_ARG', 'EXPR_FNAME|EXPR_FITEM', 'EXPR_CLASS', 'EXPR_END|EXPR_LABEL'
+      when 'EXPR_CMDARG', 'EXPR_END|EXPR_ENDARG', 'EXPR_ENDARG', 'EXPR_ARG',
+           'EXPR_FNAME|EXPR_FITEM', 'EXPR_CLASS', 'EXPR_END|EXPR_LABEL'
        inline_comments << sexp
      when 'EXPR_BEG|EXPR_LABEL', 'EXPR_MID'
        inline_comments << sexp.merge!(break: true)
@@ -410,7 +412,7 @@ class RipperJS < Ripper
  builder = RipperJS.new($stdin.read)
  response = builder.parse

-  if builder.error?
+  if !response && builder.error?
    STDERR.puts 'Invalid ruby'
    exit 1
  end

diff --git a/src/ruby.js b/src/ruby.js
@@ -4,9 +4,11 @@ const print = require("./print");
 const pragmaPattern = /#\s*@(prettier|format)/;
 const hasPragma = text => pragmaPattern.test(text);

-// extensions, filenames and interpreters mostly pulled from linguist and rubocop
-// https://github.com/github/linguist/blob/master/lib/linguist/languages.yml
-// https://github.com/rubocop-hq/rubocop/blob/master/spec/rubocop/target_finder_spec.rb
+/*
+ * metadata mostly pulled from linguist and rubocop:
+ * https://github.com/github/linguist/blob/master/lib/linguist/languages.yml
+ * https://github.com/rubocop-hq/rubocop/blob/master/spec/rubocop/target_finder_spec.rb
+ */

 module.exports = {
  languages: [{

diff --git a/test/cases/__snapshots__/alias.test.js.snap b/test/cases/__snapshots__/alias.test.js.snap
diff --git a/test/cases/__snapshots__/array.test.js.snap b/test/cases/__snapshots__/array.test.js.snap
-Original file line number
+Diff line change
@@ -110,11 +110,14 @@ const printBlock = (path, opts, print) => {
         return concat([breakParent, doBlock]);
       }
+      const hasBody = stmts.some(({ type }) => type !== "void_stmt");
       const braceBlock = concat([
-        " { ",
+        " {",
+        (hasBody || variables) ? " " : "",
         variables ? path.call(print, "body", 0) : "",
         path.call(print, "body", 1),
-        " }"
               Copy link

  
        
      
    

    
        

  
    Contributor


        

    
  

  
    
      
          
      

      
            johnschoeman
  

      

      

      


        Apr 14, 2019


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      👍
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
      
        
            
    All reactions
+        hasBody ? " " : "",
+        "}"
       ]);
       return group(ifBreak(doBlock, braceBlock));
-          Expand Down