From d393518f03e502972ffacfc854263c64b458f83b Mon Sep 17 00:00:00 2001
From: leinlin <345036769@qq.com>
Date: Mon, 11 May 2020 21:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=89=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=A0=86=E6=A0=88=E4=B8=8D=E5=AF=B9=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LuaProfiler/Tools/InjectLua.exe               | Bin 21504 -> 21504 bytes
 .../Tools/InjectLua/InjectLua/Parse/Parse.cs  |  10 +++++-----
 .../LuaProfiler/Core/Driver/Parse/Parse.cs    |  10 +++++-----
 .../TreeView/LuaProfilerTreeView.cs           |   2 ++
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/LuaProfiler/Tools/InjectLua.exe b/LuaProfiler/Tools/InjectLua.exe
index e946416d1f596a5575e84f47bbdaedae36133be1..8c4c810cac5d5805ff1171c48db6d33b421b38da 100644
GIT binary patch
delta 2743
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
Ool8^JT~jPsYy20DJq%$0

delta 2700
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

diff --git a/LuaProfiler/Tools/InjectLua/InjectLua/Parse/Parse.cs b/LuaProfiler/Tools/InjectLua/InjectLua/Parse/Parse.cs
index 76201445..990f09a1 100644
--- a/LuaProfiler/Tools/InjectLua/InjectLua/Parse/Parse.cs
+++ b/LuaProfiler/Tools/InjectLua/InjectLua/Parse/Parse.cs
@@ -187,6 +187,11 @@ static void InsertSample(LLex l, ref int lastPos, ref int nextPos, int tokenType
                     case (int)TK.RETURN:
                         int insertPos = lastPos - 1;
 
+                        if (lastStackToken == (int)TK.FUNCTION && tokens.Count == 1)
+                        {
+                            hasReturn = true;
+                        }
+
                         if (tokens.Count == 0)
                         {
                             needLastSample = false;
@@ -239,11 +244,6 @@ static void InsertSample(LLex l, ref int lastPos, ref int nextPos, int tokenType
                                 break;
                             }
                         }
-
-                        if (lastStackToken != (int)TK.IF)
-                        {
-                            hasReturn = true;
-                        }
                         break;
                     case (int)TK.END:
                         if (tokens.Count > 0)
diff --git a/LuaProfiler/example/Assets/LuaProfiler/Core/Driver/Parse/Parse.cs b/LuaProfiler/example/Assets/LuaProfiler/Core/Driver/Parse/Parse.cs
index 76201445..990f09a1 100644
--- a/LuaProfiler/example/Assets/LuaProfiler/Core/Driver/Parse/Parse.cs
+++ b/LuaProfiler/example/Assets/LuaProfiler/Core/Driver/Parse/Parse.cs
@@ -187,6 +187,11 @@ static void InsertSample(LLex l, ref int lastPos, ref int nextPos, int tokenType
                     case (int)TK.RETURN:
                         int insertPos = lastPos - 1;
 
+                        if (lastStackToken == (int)TK.FUNCTION && tokens.Count == 1)
+                        {
+                            hasReturn = true;
+                        }
+
                         if (tokens.Count == 0)
                         {
                             needLastSample = false;
@@ -239,11 +244,6 @@ static void InsertSample(LLex l, ref int lastPos, ref int nextPos, int tokenType
                                 break;
                             }
                         }
-
-                        if (lastStackToken != (int)TK.IF)
-                        {
-                            hasReturn = true;
-                        }
                         break;
                     case (int)TK.END:
                         if (tokens.Count > 0)
diff --git a/LuaProfiler/example/Assets/LuaProfiler/Editor/Window/ProfilerWin/TreeView/LuaProfilerTreeView.cs b/LuaProfiler/example/Assets/LuaProfiler/Editor/Window/ProfilerWin/TreeView/LuaProfilerTreeView.cs
index 4473c8bc..5228f968 100644
--- a/LuaProfiler/example/Assets/LuaProfiler/Editor/Window/ProfilerWin/TreeView/LuaProfilerTreeView.cs
+++ b/LuaProfiler/example/Assets/LuaProfiler/Editor/Window/ProfilerWin/TreeView/LuaProfilerTreeView.cs
@@ -441,6 +441,8 @@ public LuaProfilerTreeView(TreeViewState treeViewState, float width)
             //NetWorkClient.ConnectServer("127.0.0.1", 23333);
 
             //LuaProfiler.SetSampleEnd(LoadRootSample);
+            showAlternatingRowBackgrounds = true;
+            showBorder = true;
             m_root = LuaProfilerTreeViewItem.Create(null, -1, null);
             needRebuild = true;
             multiColumnHeader.sortingChanged += (header) => { needRebuild = true; };