Merge pull request #157 from trullock/bug_156

fixes #156 optional chaining
trullock · Oct 1, 2020 · a5c2c1e · a5c2c1e
2 parents ce8c85c + 3770ec5
commit a5c2c1e
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 22 deletions.
diff --git a/src/NUglify.Tests/JavaScript/Bugs.cs b/src/NUglify.Tests/JavaScript/Bugs.cs
@@ -128,5 +128,11 @@ public void Bug139_A()
             Assert.AreEqual("var testString=`\n\r`+`} async init(){ }`", uglifyResult.Code);
 
         }
+
+        [Test]
+        public void Bug156()
+        {
+            TestHelper.Instance.RunTest();
+        }
     }
 }
diff --git a/src/NUglify.Tests/NUglify.Tests.csproj b/src/NUglify.Tests/NUglify.Tests.csproj
@@ -427,6 +427,9 @@
     <Content Include="TestData\JS\Expected\Bugs\Bug138.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\JS\Expected\Bugs\Bug156.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\JS\Expected\Bugs\Bug70.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -2745,6 +2748,9 @@
     <Content Include="TestData\JS\Input\Bugs\Bug139.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\JS\Input\Bugs\Bug156.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\JS\Input\Bugs\Bug94.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/src/NUglify.Tests/NUglify.Tests.nuget.props b/src/NUglify.Tests/NUglify.Tests.nuget.props
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
-    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.lock.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\alexr.GTSRO\.nuget\packages\</NuGetPackageFolders>
-    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">ProjectJson</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.3.1</NuGetToolVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgNUnit3TestAdapter Condition=" '$(PkgNUnit3TestAdapter)' == '' ">C:\Users\alexr.GTSRO\.nuget\packages\nunit3testadapter\3.5.0</PkgNUnit3TestAdapter>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
+    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.lock.json</ProjectAssetsFile>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\trull\.nuget\packages\</NuGetPackageFolders>
+    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">ProjectJson</NuGetProjectStyle>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <PkgNUnit3TestAdapter Condition=" '$(PkgNUnit3TestAdapter)' == '' ">C:\Users\trull\.nuget\packages\nunit3testadapter\3.5.0</PkgNUnit3TestAdapter>
+  </PropertyGroup>
 </Project>
diff --git a/src/NUglify.Tests/TestData/JS/Expected/Bugs/Bug156.js b/src/NUglify.Tests/TestData/JS/Expected/Bugs/Bug156.js
@@ -0,0 +1 @@
+a?.b;let x=a?.b
diff --git a/src/NUglify.Tests/TestData/JS/Expected/ES2020/OptionalChaining.js b/src/NUglify.Tests/TestData/JS/Expected/ES2020/OptionalChaining.js
@@ -1 +1 @@
-let x=foo.?bar,y=foo.?(),z=foo.?().?[],p=foo?.3:0;return x+y+z
+let x=foo?.bar,y=foo?.(),z=foo?.()?.[a],p=foo?.3:0;return x+y+z
diff --git a/src/NUglify.Tests/TestData/JS/Input/Bugs/Bug156.js b/src/NUglify.Tests/TestData/JS/Input/Bugs/Bug156.js
@@ -0,0 +1,2 @@
+a?.b;
+let x = a?.b;
diff --git a/src/NUglify.Tests/TestData/JS/Input/ES2020/OptionalChaining.js b/src/NUglify.Tests/TestData/JS/Input/ES2020/OptionalChaining.js
@@ -1,6 +1,6 @@
 let x = foo?.bar;
 let y = foo?.();
-let z = foo?.()?.[];
+let z = foo?.()?.[a];
 
 // should be treated as a conditional expression
 let p = foo?.3 : 0;

diff --git a/src/NUglify/JavaScript/Visitors/OutputVisitor.cs b/src/NUglify/JavaScript/Visitors/OutputVisitor.cs
@@ -748,8 +748,8 @@ public void Visit(CallExpression node)
                 {
                     if (node.OptionalChaining)
                     {
-                        OutputPossibleLineBreak('.');
                         OutputPossibleLineBreak('?');
+                        OutputPossibleLineBreak('.');
                     }
 
                     OutputPossibleLineBreak(node.InBrackets ? '[' : '(');
@@ -2499,9 +2499,9 @@ public void Visit(MemberExpression node)
                     SetContextOutputPosition(node.Context);
                 }
 
-                OutputPossibleLineBreak('.');
-                if(node.OptionalChaining)
+                if (node.OptionalChaining)
                     OutputPossibleLineBreak('?');
+                OutputPossibleLineBreak('.');
 
                 MarkSegment(node, node.Name, node.NameContext);
                 Output(node.Name);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		let x=foo.?bar,y=foo.?(),z=foo.?().?[],p=foo?.3:0;return x+y+z
		let x=foo?.bar,y=foo?.(),z=foo?.()?.[a],p=foo?.3:0;return x+y+z