From 4886b4248aaa933153617e2fb7619b7c68d525eb Mon Sep 17 00:00:00 2001
From: flowmemo <flowmemo@outlook.com>
Date: Thu, 22 Dec 2016 23:18:12 +0800
Subject: [PATCH] fix issue #13114

---
 src/services/formatting/rules.ts              |  4 +--
 .../formattingSpaceBeforeCloseParen.ts        | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 tests/cases/fourslash/formattingSpaceBeforeCloseParen.ts

diff --git a/src/services/formatting/rules.ts b/src/services/formatting/rules.ts
index 2fac6c05555..e0268675e5a 100644
--- a/src/services/formatting/rules.ts
+++ b/src/services/formatting/rules.ts
@@ -264,12 +264,12 @@ namespace ts.formatting {
             this.SpaceAfterSemicolon = new Rule(RuleDescriptor.create3(SyntaxKind.SemicolonToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
 
             // Space after }.
-            this.SpaceAfterCloseBrace = new Rule(RuleDescriptor.create3(SyntaxKind.CloseBraceToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsAfterCodeBlockContext), RuleAction.Space));
+            this.SpaceAfterCloseBrace = new Rule(RuleDescriptor.create3(SyntaxKind.CloseBraceToken, Shared.TokenRange.FromRange(SyntaxKind.FirstToken, SyntaxKind.LastToken, [SyntaxKind.CloseParenToken])), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsAfterCodeBlockContext), RuleAction.Space));
 
             // Special case for (}, else) and (}, while) since else & while tokens are not part of the tree which makes SpaceAfterCloseBrace rule not applied
             this.SpaceBetweenCloseBraceAndElse = new Rule(RuleDescriptor.create1(SyntaxKind.CloseBraceToken, SyntaxKind.ElseKeyword), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
             this.SpaceBetweenCloseBraceAndWhile = new Rule(RuleDescriptor.create1(SyntaxKind.CloseBraceToken, SyntaxKind.WhileKeyword), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Space));
-            this.NoSpaceAfterCloseBrace = new Rule(RuleDescriptor.create3(SyntaxKind.CloseBraceToken, Shared.TokenRange.FromTokens([SyntaxKind.CloseParenToken, SyntaxKind.CloseBracketToken, SyntaxKind.CommaToken, SyntaxKind.SemicolonToken])), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
+            this.NoSpaceAfterCloseBrace = new Rule(RuleDescriptor.create3(SyntaxKind.CloseBraceToken, Shared.TokenRange.FromTokens([SyntaxKind.CloseBracketToken, SyntaxKind.CommaToken, SyntaxKind.SemicolonToken])), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
 
             // No space for dot
             this.NoSpaceBeforeDot = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.DotToken), RuleOperation.create2(new RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), RuleAction.Delete));
diff --git a/tests/cases/fourslash/formattingSpaceBeforeCloseParen.ts b/tests/cases/fourslash/formattingSpaceBeforeCloseParen.ts
new file mode 100644
index 00000000000..fb2d648e211
--- /dev/null
+++ b/tests/cases/fourslash/formattingSpaceBeforeCloseParen.ts
@@ -0,0 +1,33 @@
+/// <reference path='fourslash.ts' />
+
+/////*1*/({});
+/////*2*/(  {});
+/////*3*/({foo:42});
+/////*4*/(  {foo:42}  );
+/////*5*/var bar = (function (a) { });
+
+format.setOption("InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis", true);
+format.document();
+goTo.marker('1');
+verify.currentLineContentIs('( {} );');
+goTo.marker('2');
+verify.currentLineContentIs('( {} );');
+goTo.marker('3');
+verify.currentLineContentIs('( { foo: 42 } );');
+goTo.marker('4');
+verify.currentLineContentIs('( { foo: 42 } );');
+goTo.marker('5');
+verify.currentLineContentIs('var bar = ( function( a ) { } );');
+
+format.setOption("InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis", false);
+format.document();
+goTo.marker('1');
+verify.currentLineContentIs('({});');
+goTo.marker('2');
+verify.currentLineContentIs('({});');
+goTo.marker('3');
+verify.currentLineContentIs('({ foo: 42 });');
+goTo.marker('4');
+verify.currentLineContentIs('({ foo: 42 });');
+goTo.marker('5');
+verify.currentLineContentIs('var bar = (function(a) { });');
\ No newline at end of file