prettier 0.18.1 → 0.18.2

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prettier/plugin-ruby",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "description": "prettier plugin for the Ruby programming language",
   "main": "src/ruby.js",
   "scripts": {
@@ -25,7 +25,9 @@
     "all-contributors-cli": "^6.14.1",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.1",
-    "jest": "^25.2.7"
+    "husky": "^4.2.5",
+    "jest": "^25.2.7",
+    "pretty-quick": "^2.0.1"
   },
   "eslintConfig": {
     "extends": [
@@ -53,6 +55,11 @@
     ],
     "testRegex": ".test.js$"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "pretty-quick --staged"
+    }
+  },
   "prettier": {
     "trailingComma": "none"
   }

data/src/nodes/conditionals.js

@@ -177,9 +177,10 @@ const canTernaryStmts = (stmts) => {
 // additional node must have only one statement, and that statement list must
 // pass the `canTernaryStmts` check.
 const canTernary = (path) => {
-  const [_pred, stmts, addition] = path.getValue().body;
+  const [predicate, stmts, addition] = path.getValue().body;
 
   return (
+    !["assign", "opassign"].includes(predicate.type) &&
     addition &&
     addition.type === "else" &&
     [stmts, addition.body[0]].every(canTernaryStmts)

data/src/nodes/rescue.js

@@ -53,7 +53,11 @@ module.exports = {
       parts.push(" StandardError");
     }
 
-    parts.push(indent(concat([hardline, path.call(print, "body", 2)])));
+    const rescueBody = path.call(print, "body", 2);
+
+    if (rescueBody.parts.length > 0) {
+      parts.push(indent(concat([hardline, rescueBody])));
+    }
 
     // This is the next clause on the `begin` statement, either another
     // `rescue`, and `ensure`, or an `else` clause.

data/src/ruby.js

@@ -78,7 +78,8 @@ module.exports = {
     {
       name: "HAML",
       parsers: ["haml"],
-      extensions: [".haml"]
+      extensions: [".haml"],
+      vscodeLanguageIds: ["haml"]
     }
   ],
   parsers: {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler