Bug 189

src/NUglify.Tests/Css/Bugs.cs

@@ -57,6 +57,11 @@ public void Bug250()
             TestHelper.Instance.RunTest();
         }
 
+        [Test]
+        public void Bug189()
+        {
+	        TestHelper.Instance.RunTest("-lines:m -comments:all");
+        }
         [Test]
         public void Bug270()
         {

src/NUglify.Tests/Css/Common/TestHelper.cs

@@ -68,6 +68,8 @@ public static TestHelper Instance
         /// </summary>
         TestHelper()
         {
+	        Trace.Listeners.Add(new ConsoleTraceListener());
+
             // start with the unit test DLL. All test data folders will be deployed there by testrun configuration.
             // In order to do that, make sure that "Deployment" section in .testrunconfig file contains the "TestData" folder. If
             // this is the case, then everything in the folder will be copied down right next to unit test DLL.

src/NUglify.Tests/JavaScript/Bugs.cs

@@ -164,6 +164,19 @@ public void Bug181()
 	        Assert.AreEqual("function foo()\n{\n   return 1\n}", uglifyResult.Code);
         }
 
+        [Test]
+        public void Bug189()
+        {
+	        TestHelper.Instance.RunTest("-pretty -comments:all");
+        }
+
+
+        [Test]
+        public void Bug189Important()
+        {
+	        TestHelper.Instance.RunTest("-pretty -comments:important");
+        }
+
         [Test]
         public void Bug197()
         {

src/NUglify.Tests/JavaScript/JsPopular.cs

@@ -59,9 +59,9 @@ static void AssertCompile(string url, string file)
             // https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js
             var client = new WebClient();
             var jqueryText = client.DownloadString(url);
-            var result = Uglify.Js(jqueryText, file, new CodeSettings()
+            var result = Uglify.Js(jqueryText, file, new CodeSettings
             {
-                PreserveImportantComments = false,
+                CommentMode = JsComment.PreserveNone,
                 StripDebugStatements = true,
                 LineBreakThreshold = int.MaxValue,
             });

src/NUglify.Tests/NUglify.Tests.csproj

@@ -395,6 +395,9 @@
     <Content Include="TestData\CSS\Expected\Bugs\Bug270.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\CSS\Expected\Bugs\Bug189.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\CSS\Expected\Bugs\Bug33.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -437,6 +440,9 @@
     <Content Include="TestData\CSS\Input\Bugs\Bug250.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\CSS\Input\Bugs\Bug189.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\CSS\Input\Bugs\Bug74.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -470,6 +476,9 @@
     <Content Include="TestData\JS\Expected\Bugs\Bug241.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\JS\Expected\Bugs\Bug189Important.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\JS\Expected\Bugs\Bug197.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -494,6 +503,9 @@
     <Content Include="TestData\JS\Expected\Bugs\Bug199JS.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\JS\Expected\Bugs\Bug189.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\JS\Expected\Bugs\Bug199JSON.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -2833,6 +2845,9 @@
     <Content Include="TestData\JS\Input\Bugs\Bug293.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\JS\Input\Bugs\Bug189Important.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\JS\Input\Bugs\Bug279.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -2854,6 +2869,9 @@
     <Content Include="TestData\JS\Input\Bugs\Bug197.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="TestData\JS\Input\Bugs\Bug189.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="TestData\JS\Input\Bugs\Bug199JS.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

src/NUglify.Tests/TestData/CSS/Expected/Bugs/Bug189.css

@@ -0,0 +1,6 @@
+h6
+{
+    font-family: 'Hammersmith One',sans-serif;/*
+    font-family: 'Questrial', sans-serif;
+    */
+}

src/NUglify.Tests/TestData/CSS/Input/Bugs/Bug189.css

@@ -0,0 +1,7 @@
+h6 
+{
+	font-family: 'Hammersmith One', sans-serif;
+	/*
+    font-family: 'Questrial', sans-serif;
+    */
+}

src/NUglify.Tests/TestData/JS/Expected/Bugs/Bug189.js

@@ -0,0 +1,8 @@
+let x = 1
+// a comment
+// another comment
+//! important comment
+/*!
+	another important comment
+ */;
+let y = 2

src/NUglify.Tests/TestData/JS/Expected/Bugs/Bug189Important.js

@@ -0,0 +1,6 @@
+let x = 1
+//! important comment
+/*!
+	another important comment
+ */;
+let y = 2

src/NUglify.Tests/TestData/JS/Expected/Comments/ImportantComment.js

@@ -1,18 +1,6 @@
 /*!
  * this is an example of an "important" comment
  * that we want to keep
- */
-function foo(){
-/*! this too */
-}var a=12;
-/*!
- * this is another one, but it's between a couple var statements
- */
-var b=13;
-/** @preserve This is an important comment because of the @preserve token */
-/**
+ */function foo(){/*! this too */}var a=12/*! * this is another one, but it's between a couple var statements */;var b=13/** @preserve This is an important comment because of the @preserve token *//**
  ** @license  And so is this, because of the @license token
- */
-for(var ndx=0;ndx<10;++ndx)
-/*! inside a block */
-;
+ */;for(var ndx=0;ndx<10;++ndx)/*! inside a block */;

src/NUglify.Tests/TestData/JS/Expected/Comments/ImportantIgnore.js

@@ -1,7 +1,3 @@
-var p,i;if(location.hash)throw"hash exists";else alert("no hash");for(p in window)alert(p+" = "+window[p]);for(;;)if(window.timer)break;do{
-//! keep one
-if(+new Date-1e6){
-//! keep two
-break}
-/*! keep three */
-}while(1);foo:for(i=0;i<100;++i)if(i%3)break foo
+var p,i;if(location.hash)throw"hash exists";else alert("no hash");for(p in window)alert(p+" = "+window[p]);for(;;)if(window.timer)break;do{//! keep one
+if(+new Date-1e6){//! keep two
+break}/*! keep three */}while(1);foo:for(i=0;i<100;++i)if(i%3)break foo

src/NUglify.Tests/TestData/JS/Expected/Comments/OnlyImportantComment.js

@@ -1 +1 @@
-/*! Copyright 2010 by Contoso Corp. All rights reserved */
+/*! Copyright 2010 by Contoso Corp. All rights reserved */

src/NUglify.Tests/TestData/JS/Expected/Comments/TwoImportantComments.js

@@ -1,3 +1 @@
-/*! First Important Comment */
-/*! Second Important Comment */
-var a=10
+/*! First Important Comment *//*! Second Important Comment */var a=10

src/NUglify.Tests/TestData/JS/Expected/Modules/ExportCombine.js

@@ -1,3 +1,2 @@
 //! start my implicit module
-function n(n,t){return n+t}export function mul(n,t){return n*t}function t(n){return mul(n,n)}function i(n,t){if(t==0)return 1;for(var i=1;--t;)i=mul(i,n);return i}export const pi=3.1415927,negOne=-1;export var accumulator=0,foo="bar";export{n as sum,t as square,i as pow};
-//! end my implicit module
+function n(n,t){return n+t}export function mul(n,t){return n*t}function t(n){return mul(n,n)}function i(n,t){if(t==0)return 1;for(var i=1;--t;)i=mul(i,n);return i}export const pi=3.1415927,negOne=-1;export var accumulator=0,foo="bar";export{n as sum,t as square,i as pow}//! end my implicit module

src/NUglify.Tests/TestData/JS/Expected/Syntax/EmptyStatement.js

@@ -1,3 +1 @@
-function foo(){for(var ndx=0;ndx<10;++ndx);}if(ndx)
-/*! important */
-;
+function foo(){for(var ndx=0;ndx<10;++ndx);}if(ndx)/*! important */;

src/NUglify.Tests/TestData/JS/Input/BlockOpts/AfterReturn.js

@@ -1,5 +1,5 @@
-function test(a,b)
-{
+function test(a,b) {
+
     var d = foo(c);
     return a + b + d;
 

src/NUglify.Tests/TestData/JS/Input/BlockOpts/DirectivePrologue.js

@@ -12,7 +12,7 @@ function one(a,b)
 
 function two(c,d)
 {
-    // no semi-colons -- they are implicit and should still count
+    //! no semi-colons -- they are implicit and should still count
     "some other prologue"
     "use strict"
     c = d + c + d;

src/NUglify.Tests/TestData/JS/Input/Bugs/Bug189.js

@@ -0,0 +1,7 @@
+let x = 1; // a comment
+// another comment
+//! important comment
+/*!
+	another important comment
+ */
+let y = 2;

src/NUglify.Tests/TestData/JS/Input/Bugs/Bug189Important.js

@@ -0,0 +1,7 @@
+let x = 1; // a comment
+// another comment
+//! important comment
+/*!
+	another important comment
+ */
+let y = 2;

src/NUglify.Tests/TestData/JS/Input/Comments/ImportantComment.js

@@ -5,9 +5,7 @@
 function foo() {/*! this too */}
 /* regular comment that will get stripped */
 var a = 12;
-/*!
- * this is another one, but it's between a couple var statements
- */
+/*! * this is another one, but it's between a couple var statements */
 var b = 13;
 
 /** @preserve This is an important comment because of the @preserve token */

src/NUglify/Css/CssParser.cs

@@ -3923,15 +3923,14 @@ string NextSignificantToken()
 
                             // add the comment to the builder
                             sb.Append(commentText);
+                            if(Settings.OutputMode == OutputMode.MultipleLines)
+								sb.Append(Settings.LineTerminator);
                         }
                     }
 
                     // next token
                     m_currentToken = m_scanner.NextToken(!m_insideCalc);
-                    if (EchoWriter != null)
-                    {
-                        EchoWriter.Write(CurrentTokenText);
-                    }
+                    EchoWriter?.Write(CurrentTokenText);
 
                     m_encounteredNewLine = m_encounteredNewLine || m_scanner.GotEndOfLine;
                 }

src/NUglify/JavaScript/CodeSettings.cs

@@ -40,7 +40,7 @@ public CodeSettings()
             this.EvalTreatment = EvalTreatment.Ignore;
             this.InlineSafeStrings = true;
             this.MacSafariQuirks = true;
-            this.PreserveImportantComments = true;
+            this.CommentMode = JsComment.PreserveImportant;
             this.QuoteObjectLiteralProperties = false;
             this.StrictMode = false;
             this.StripDebugStatements = true;
@@ -114,7 +114,7 @@ public CodeSettings Clone()
                 PreprocessOnly = this.PreprocessOnly,
                 PreprocessorDefineList = this.PreprocessorDefineList,
                 PreserveFunctionNames = this.PreserveFunctionNames,
-                PreserveImportantComments = this.PreserveImportantComments,
+                CommentMode = this.CommentMode,
                 QuoteObjectLiteralProperties = this.QuoteObjectLiteralProperties,
                 RemoveFunctionExpressionNames = this.RemoveFunctionExpressionNames,
                 RemoveUnneededCode = this.RemoveUnneededCode,
@@ -742,16 +742,20 @@ public bool PreserveFunctionNames
             get; set;
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether to preserve important comments in the output.
-        /// Default is true, preserving important comments. Important comments have an exclamation
-        /// mark as the very first in-comment character (//! or /*!).
-        /// </summary>
+        [Obsolete("Use CommentMode instead")]
         public bool PreserveImportantComments
         {
-            get; set;
+	        get => this.CommentMode != JsComment.PreserveNone;
+	        set => this.CommentMode = this.CommentMode == JsComment.PreserveNone ? JsComment.PreserveImportant : this.CommentMode;
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to preserve comments in the output.
+        /// Default is Important, preserving important comments only.
+        /// Important comments have an exclamation mark as the very first in-comment character (//! or /*!).
+        /// </summary>
+        public JsComment CommentMode { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether to always quote object literal property names.
         /// Default is false.

src/NUglify/JavaScript/Comment.cs

@@ -0,0 +1,12 @@
+using System.Diagnostics;
+
+namespace NUglify.JavaScript
+{
+	[DebuggerDisplay("{Context}")]
+	public class Comment
+	{
+		public SourceContext Context { get; set; }
+		public bool IsImportant { get; set; }
+		public bool IsMultiLine { get; set; }
+	}
+}