1 files changed, 23 insertions, 25 deletions

diff --git a/src/3rdParty/LuaMinify.h b/src/3rdParty/LuaMinify.h
index c68097b..895f5a4 100644
--- a/src/3rdParty/LuaMinify.h
+++ b/src/3rdParty/LuaMinify.h
@@ -2,7 +2,7 @@ R"lua_codes(
 --[[
 The MIT License (MIT)
 
-Copyright (c) 2012-2013
+Copyright (c) 2012-2013 Mark Langen, modified by Li Jin 2023
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -2087,7 +2087,7 @@ R"lua_codes(
 local function FormatYue(ast, lineMap)
         local currentLine = 1
         local formatStatlist, formatExpr
-        
+
         local function joinStatementsSafe(out, b, sep)
                 if #out < 1 then
                         return ''
@@ -2148,21 +2148,6 @@ local function FormatYue(ast, lineMap)
 
         formatExpr = function(expr)
                 local out = {string.rep('(', expr.ParenCount or 0)}
-                if expr.Tokens then
-                        local line = expr.Tokens[1].Line
-                        local targetLine = lineMap[line]
-                        if targetLine and currentLine < targetLine then
-                                out[#out + 1] = string.rep('\n', targetLine - currentLine)
-                                currentLine = targetLine
-                        end
-                elseif expr.Value then
-                        local line = expr.Value.Line
-                        local targetLine = lineMap[line]
-                        if targetLine and currentLine < targetLine then
-                                out[#out + 1] = string.rep('\n', targetLine - currentLine)
-                                currentLine = targetLine
-                        end
-                end
                 if expr.AstType == 'VarExpr' then
                         if expr.Variable then
                                 out[#out + 1] = expr.Variable.Name
@@ -2226,6 +2211,11 @@ local function FormatYue(ast, lineMap)
 
                 elseif expr.AstType == 'MemberExpr' then
                         out[#out + 1] = formatExpr(expr.Base)
+                        local targetLine = lineMap[expr.Ident.Line]
+                        if targetLine and currentLine < targetLine then
+                                out[#out + 1] = string.rep('\n', targetLine - currentLine)
+                                currentLine = targetLine
+                        end
                         out[#out + 1] = expr.Indexer
                         out[#out + 1] = expr.Ident.Data
 
@@ -2276,19 +2266,19 @@ local function FormatYue(ast, lineMap)
 
                 end
                 out[#out + 1] = string.rep(')', expr.ParenCount or 0)
-                return table.concat(out)
-        end
-
-        local formatStatement = function(statement)
-                local out = {""}
-                if statement.Tokens and statement.Tokens[1] then
-                        local line = statement.Tokens[1].Line
+                if expr.Tokens and expr.Tokens[1] then
+                        local line = expr.Tokens[1].Line
                         local targetLine = lineMap[line]
                         if targetLine and currentLine < targetLine then
-                                out[#out + 1] = string.rep('\n', targetLine - currentLine)
+                                table.insert(out, 1, string.rep('\n', targetLine - currentLine))
                                 currentLine = targetLine
                         end
                 end
+                return table.concat(out)
+        end
+
+        local formatStatement = function(statement)
+                local out = {""}
                 if statement.AstType == 'AssignmentStatement' then
                         for i = 1, #statement.Lhs do
                                 out[#out + 1] = formatExpr(statement.Lhs[i])
@@ -2443,6 +2433,14 @@ local function FormatYue(ast, lineMap)
                 else
                         print("Unknown AST Type: ", statement.AstType)
                 end
+                if statement.Tokens and statement.Tokens[1] then
+                        local line = statement.Tokens[1].Line
+                        local targetLine = lineMap[line]
+                        if targetLine and currentLine < targetLine then
+                                table.insert(out, 1, string.rep('\n', targetLine - currentLine))
+                                currentLine = targetLine
+                        end
+                end
                 return table.concat(out)
         end