Merge pull request #240 from trullock/bug_239

Bug 239

changelog.md

@@ -2,6 +2,9 @@
 
 ## vNext (unpublished)
 
+## v1.13.7 (15 Mar 2021)
+- Fixes bug with javascript pretty-print formatting and empty object initializers {}
+
 ## v1.13.6 (9 Mar 2021)
 - Fixes bug with json script elements in HTML e.g. application/ld+json
 

src/NUglify.Tests/TestData/JS/Expected/Switch/PrettyPrint_P.js

@@ -50,3 +50,11 @@ function foo()
             b = a
     }
 }
+(function()
+{
+    try
+    {
+        var a = {}
+    }
+    catch(ex) {}
+})()

src/NUglify.Tests/TestData/JS/Expected/Switch/PrettyPrint_same.js

@@ -40,3 +40,9 @@
             b = a
     }
 }
+(function() {
+    try {
+        var a = {}
+    }
+    catch(ex) {}
+})()

src/NUglify.Tests/TestData/JS/Input/Switch/PrettyPrint.js

@@ -41,4 +41,10 @@ function foo() {
   }
 }
 
-
+(function () {
+	try {
+		var a = {};
+	}
+	catch (ex) {
+	}
+})();

src/NUglify/JavaScript/Visitors/OutputVisitor.cs

@@ -2591,21 +2591,22 @@ public void Visit(ObjectLiteral node)
             if(!(node.Parent is VariableDeclaration))
 				Indent();
 
-	        var count = node.Properties.IfNotNull(p => p.Count);
-	        if (count > 1)
+	        var propertyCount = node.Properties.IfNotNull(p => p.Count);
+	        if (propertyCount > 1)
 		        NewLine();
-	        else if(settings.OutputMode == OutputMode.MultipleLines)
+	        else if(propertyCount == 1 && settings.OutputMode == OutputMode.MultipleLines)
 		        Output(' ');
 
 	        // output each key/value pair
 	        node.Properties?.Accept(this);
-
-	        Unindent();
 
-	        if (count > 1)
+	        if (propertyCount > 0)
+                Unindent();
+
+	        if (propertyCount > 1)
 		        NewLine();
-	        else if (settings.OutputMode == OutputMode.MultipleLines)
-		        Output(' ');
+            else if (propertyCount == 1 && settings.OutputMode == OutputMode.MultipleLines)
+	            Output(' ');
 
             Output('}');
 	        MarkSegment(node, null, node.Context);

src/NUglify/NUglify.csproj

@@ -17,7 +17,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>git://github.com/trullock/NUglify</RepositoryUrl>
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
-    <Version>1.13.6</Version>
+    <Version>1.13.7</Version>
     <PackageLicenseExpression></PackageLicenseExpression>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>