From 00b15f3b59afeed73c95f637c96fec3d0386d00f Mon Sep 17 00:00:00 2001 From: Glavin Wiechert Date: Mon, 10 Aug 2015 10:57:53 -0300 Subject: [PATCH] Fixes #496. Update Pretty Diff and fix adding two spaces incorrectly Also fix the related unit tests. --- .../nested-jsbeautifyrc/html-erb/expected/test.erb | 2 +- examples/simple-jsbeautifyrc/jsx/expected/test.jsx | 2 +- .../visualforce/expected/basic-page.page | 2 +- .../visualforce/expected/page-with-inputfield.page | 12 ++++++------ .../visualforce/expected/page-with-outputfield.page | 10 +++++----- package.json | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/nested-jsbeautifyrc/html-erb/expected/test.erb b/examples/nested-jsbeautifyrc/html-erb/expected/test.erb index 53ecd1a..4703965 100644 --- a/examples/nested-jsbeautifyrc/html-erb/expected/test.erb +++ b/examples/nested-jsbeautifyrc/html-erb/expected/test.erb @@ -2,7 +2,7 @@ - + Shopping List for <%= @date.strftime('%A, %d %B %Y') %> diff --git a/examples/simple-jsbeautifyrc/jsx/expected/test.jsx b/examples/simple-jsbeautifyrc/jsx/expected/test.jsx index 6d63f7c..d8cef2f 100644 --- a/examples/simple-jsbeautifyrc/jsx/expected/test.jsx +++ b/examples/simple-jsbeautifyrc/jsx/expected/test.jsx @@ -1,7 +1,7 @@ var Mist = React.createClass({ renderList: function() { return this.props.items.map(function(item) { - return {item}} key={item.id}/>; + return {item}} key={item.id}/>; }); } }); \ No newline at end of file diff --git a/examples/simple-jsbeautifyrc/visualforce/expected/basic-page.page b/examples/simple-jsbeautifyrc/visualforce/expected/basic-page.page index 67aa733..6939107 100644 --- a/examples/simple-jsbeautifyrc/visualforce/expected/basic-page.page +++ b/examples/simple-jsbeautifyrc/visualforce/expected/basic-page.page @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/examples/simple-jsbeautifyrc/visualforce/expected/page-with-inputfield.page b/examples/simple-jsbeautifyrc/visualforce/expected/page-with-inputfield.page index 2d52a61..1e3a1d2 100644 --- a/examples/simple-jsbeautifyrc/visualforce/expected/page-with-inputfield.page +++ b/examples/simple-jsbeautifyrc/visualforce/expected/page-with-inputfield.page @@ -1,15 +1,15 @@ - + - - - - - + + + + + diff --git a/examples/simple-jsbeautifyrc/visualforce/expected/page-with-outputfield.page b/examples/simple-jsbeautifyrc/visualforce/expected/page-with-outputfield.page index f2e99ef..f41d5fe 100644 --- a/examples/simple-jsbeautifyrc/visualforce/expected/page-with-outputfield.page +++ b/examples/simple-jsbeautifyrc/visualforce/expected/page-with-outputfield.page @@ -1,13 +1,13 @@ - + - - - - + + + + diff --git a/package.json b/package.json index 502e017..a4391fb 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "loophole": "^1.0.0", "node-dir": "^0.1.8", "node-uuid": "^1.4.3", - "prettydiff": "^1.12.17", + "prettydiff": "^1.12.19", "space-pen": "^5.1.1", "strip-json-comments": "^1.0.2", "temp": "^0.8.3",