From 53ce2a5f1861e2e5bf57e3c02c71a3fc220df6ae Mon Sep 17 00:00:00 2001 From: Matt McKegg Date: Thu, 6 Aug 2015 01:25:34 +1200 Subject: [PATCH 1/4] add test for expression ending in member accessor --- test.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test.js b/test.js index 2e97ba5..fc920b8 100644 --- a/test.js +++ b/test.js @@ -164,3 +164,8 @@ void { var gloopy = 12 [1,2,3].map(function () {}) console.log(gloopy) + +// Test member accessors +var array = [1,2,3] +var val = array[0] +var val2 = array[1] From 023bbbfb5b22e081c043cd7069d62790ebef41dc Mon Sep 17 00:00:00 2001 From: Matt McKegg Date: Thu, 6 Aug 2015 01:26:51 +1200 Subject: [PATCH 2/4] fix member expression new line fixes #72 --- rc/esformatter.json | 1 + 1 file changed, 1 insertion(+) diff --git a/rc/esformatter.json b/rc/esformatter.json index 5f7c549..cc32f5c 100644 --- a/rc/esformatter.json +++ b/rc/esformatter.json @@ -114,6 +114,7 @@ "ElseStatementOpeningBrace" : "<=1", "ElseStatementClosingBrace" : -1, "LogicalExpression" : -1, + "MemberExpressionClosing" : 1, "ObjectExpressionOpeningBrace" : "<=1", "Property" : -1, "PropertyValue" : -1, From 40ba7ff8debd819f5a9144c2978094c1374fd5bc Mon Sep 17 00:00:00 2001 From: Matt McKegg Date: Thu, 6 Aug 2015 01:49:11 +1200 Subject: [PATCH 3/4] add test ensuring member accessors aren't broken --- test/member.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 test/member.js diff --git a/test/member.js b/test/member.js new file mode 100644 index 0000000..17cae33 --- /dev/null +++ b/test/member.js @@ -0,0 +1,18 @@ +var test = require('tape') +var fmt = require('../').transform + +test('allow newline after member accessor', function (t) { + t.plan(1) + + var program = 'test[0]\ntest\n' + var expected = 'test[0]\ntest\n' + t.equal(fmt(program), expected) +}) + +test('don\'t force newline on mid-expression member accessor', function (t) { + t.plan(1) + + var program = 'test(test[0])\n' + var expected = 'test(test[0])\n' + t.equal(fmt(program), expected) +}) From 45cb0440ea4cd5c5d527101abc0f82e588e48118 Mon Sep 17 00:00:00 2001 From: Matt McKegg Date: Thu, 6 Aug 2015 01:49:59 +1200 Subject: [PATCH 4/4] allow member accessors to have a newline after fixes #72 --- rc/esformatter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc/esformatter.json b/rc/esformatter.json index cc32f5c..6aea5bb 100644 --- a/rc/esformatter.json +++ b/rc/esformatter.json @@ -114,7 +114,7 @@ "ElseStatementOpeningBrace" : "<=1", "ElseStatementClosingBrace" : -1, "LogicalExpression" : -1, - "MemberExpressionClosing" : 1, + "MemberExpressionClosing" : ">=0", "ObjectExpressionOpeningBrace" : "<=1", "Property" : -1, "PropertyValue" : -1,