q

Author: newtonguass

ClientDependency.Core/CompositeFiles/JSMin.cs

@@ -44,95 +44,50 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 namespace ClientDependency.Core.CompositeFiles
 {
-
     public class JSMin
-
     {
-
         private const int Eof = -1;
-
         private TextReader _sr;
-
         private TextWriter _sw;
-
         private int _theA;
-
         private int _theB;
-
         private int _theLookahead = Eof;
-
         private int _theX = Eof;
-
         private int _theY = Eof;
-
         private int _retStatement = -1;
-
         private bool _start = false;
 
-
-
         [Obsolete("Use the overloads specifying a Stream instead")]
-
         public static string CompressJS(string body)
-
         {
-
             return new JSMin().Minify(body);
-
         }
 
-
-
         public static string CompressJS(Stream stream)
-
         {
-
             var jsMin = new JSMin();
-
             if (!stream.CanRead) throw new InvalidOperationException("Cannot read input stream");
-
             if (stream.CanSeek)
-
             {
-
                 stream.Position = 0;
-
             }
-
             return jsMin.Minify(new StreamReader(stream));
-
         }
 
-
-
         [Obsolete("Use the overloads specifying a TextReader instead")]
-
         public string Minify(string src)
-
         {
-
             StringBuilder sb = new StringBuilder();
-
             using (_sr = new StringReader(src))
-
             {
-
                 using (_sw = new StringWriter(sb))
-
                 {
-
                     ExecuteJsMin();
-
                 }
-
             }
-
             return sb.ToString();
-
         }
 
-
-
         public string Minify(TextReader reader)
         {
             _sr = reader;
@@ -172,7 +127,6 @@ private void ExecuteJsMin()
                     case '\n':
                     case '\u2028':
                     case '\u2029':
-
                         switch (_theB)
                         {
                             case '{':
@@ -193,10 +147,8 @@ private void ExecuteJsMin()
                                 Action(1);
                                 break;
                             case ' ':
-
                                 Action(3);
                                 break;
-
                             default:
                                 if (!_start)
                                 {
@@ -212,7 +164,7 @@ private void ExecuteJsMin()
                     default:
                         switch (_theB)
                         {
-
+                    
                             case ' ':
                                 Action(IsAlphanum(_theA) ? 1 : 3);
                                 break;
@@ -271,8 +223,6 @@ void Action(int d)
                     if (!HandleStringLiteral())
                         HandleEndOfStatement();
 
-
-
                     goto case 3;
                 case 3:
                     _theB = NextCharExcludingComments();
@@ -312,8 +262,6 @@ private bool TrackReturnStatement()
                 return true;
             }
 
-
-
             if (_retStatement >= (r.Length - 1))
             {
                 //reset when there is a return statement and the next char is not whitespace
@@ -341,8 +289,6 @@ private bool HandleEndOfStatement()
         {
             if (_theA != '}') return false;
 
-
-
             var peek = Peek();
             //NOTE: We don't skip over a new line, this is becase in some cases 
             // library managers don't put a semicolon after a } when they have defined a variable as a method,
@@ -364,19 +310,13 @@ private bool HandleStringLiteral()
             if (_theA != '\'' && _theA != '"' && _theA != '`')
                 return false;
 
-
-
             //only allowed with template strings
-
             var allowLineFeed = _theA == '`';
 
-
-
             //write the start quote
-
             Put(_theA);
             _theA = Get(replaceCr: !allowLineFeed); //don't replace CR here, if we need to deal with that
-
+            
             for (;;)
             {
                 //If the A matches B it means the string literal is done
@@ -388,15 +328,13 @@ private bool HandleStringLiteral()
 
                     //reset, this essentially resets the process
                     _theA = ' ';
-
                     break;
                 }
 
                 var skipRead = false;
 
                 switch (_theA)
                 {
-
                     case '\r':
                     case '\n':
                         if (!allowLineFeed)
@@ -422,7 +360,6 @@ private bool HandleStringLiteral()
                                 _theA = Get();      //get the escaped char
                                 if (_theA == Eof)
                                     throw new Exception($"Error: JSMIN unterminated string literal: {_theA}\n");
-
                                 Put(_theA);         //write the escaped char
                                 _theA = Get();
                                 skipRead = true;    //go to beginning of loop