From 6f8986fb48f1998b685aaf661aa33db501b40859 Mon Sep 17 00:00:00 2001
From: Peng-YM <1048217874pengym@gmail.com>
Date: Thu, 3 Sep 2020 12:54:34 +0800
Subject: [PATCH] Bug fixed for keyword replace

---
 backend/.idea/workspace.xml | 68 +++++++++++++++++++------------------
 backend/sub-store.js        |  2 +-
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index a99564a..45b388a 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -20,6 +20,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="8b97a098-48b2-4e64-a9ef-522fe2d30b52" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/sub-store.js" beforeDir="false" afterPath="$PROJECT_DIR$/sub-store.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -96,7 +97,8 @@
       <workItem from="1599095419072" duration="112000" />
       <workItem from="1599095538624" duration="1682000" />
       <workItem from="1599098635956" duration="82000" />
-      <workItem from="1599099268523" duration="672000" />
+      <workItem from="1599099268523" duration="934000" />
+      <workItem from="1599108801252" duration="56000" />
     </task>
     <servers />
   </component>
@@ -116,7 +118,7 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="WindowStateProjectService">
-    <state width="1322" height="440" key="GridCell.Tab.0.bottom" timestamp="1599099330723">
+    <state width="1322" height="440" key="GridCell.Tab.0.bottom" timestamp="1599100319941">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.0.bottom/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358068" />
@@ -127,8 +129,8 @@
     <state width="849" height="374" key="GridCell.Tab.0.bottom/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992684" />
     <state width="840" height="374" key="GridCell.Tab.0.bottom/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305944" />
     <state width="840" height="374" key="GridCell.Tab.0.bottom/70.23.1722.1097@70.23.1722.1097" timestamp="1598946266532" />
-    <state width="1322" height="440" key="GridCell.Tab.0.bottom/70.23.2490.1417@70.23.2490.1417" timestamp="1599099330723" />
-    <state width="1322" height="440" key="GridCell.Tab.0.center" timestamp="1599099330723">
+    <state width="1322" height="440" key="GridCell.Tab.0.bottom/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319941" />
+    <state width="1322" height="440" key="GridCell.Tab.0.center" timestamp="1599100319940">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.0.center/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358067" />
@@ -139,8 +141,8 @@
     <state width="849" height="374" key="GridCell.Tab.0.center/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992684" />
     <state width="840" height="374" key="GridCell.Tab.0.center/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305944" />
     <state width="840" height="374" key="GridCell.Tab.0.center/70.23.1722.1097@70.23.1722.1097" timestamp="1598946266532" />
-    <state width="1322" height="440" key="GridCell.Tab.0.center/70.23.2490.1417@70.23.2490.1417" timestamp="1599099330723" />
-    <state width="1322" height="440" key="GridCell.Tab.0.left" timestamp="1599099330723">
+    <state width="1322" height="440" key="GridCell.Tab.0.center/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319940" />
+    <state width="1322" height="440" key="GridCell.Tab.0.left" timestamp="1599100319940">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.0.left/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358067" />
@@ -151,8 +153,8 @@
     <state width="849" height="374" key="GridCell.Tab.0.left/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992683" />
     <state width="840" height="374" key="GridCell.Tab.0.left/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305944" />
     <state width="840" height="374" key="GridCell.Tab.0.left/70.23.1722.1097@70.23.1722.1097" timestamp="1598946266531" />
-    <state width="1322" height="440" key="GridCell.Tab.0.left/70.23.2490.1417@70.23.2490.1417" timestamp="1599099330723" />
-    <state width="1322" height="440" key="GridCell.Tab.0.right" timestamp="1599099330723">
+    <state width="1322" height="440" key="GridCell.Tab.0.left/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319940" />
+    <state width="1322" height="440" key="GridCell.Tab.0.right" timestamp="1599100319941">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.0.right/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358068" />
@@ -163,8 +165,8 @@
     <state width="849" height="374" key="GridCell.Tab.0.right/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992684" />
     <state width="840" height="374" key="GridCell.Tab.0.right/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305944" />
     <state width="840" height="374" key="GridCell.Tab.0.right/70.23.1722.1097@70.23.1722.1097" timestamp="1598946266532" />
-    <state width="1322" height="440" key="GridCell.Tab.0.right/70.23.2490.1417@70.23.2490.1417" timestamp="1599099330723" />
-    <state width="1322" height="374" key="GridCell.Tab.1.bottom" timestamp="1599097989339">
+    <state width="1322" height="440" key="GridCell.Tab.0.right/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319941" />
+    <state width="1322" height="440" key="GridCell.Tab.1.bottom" timestamp="1599100319942">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.1.bottom/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358069" />
@@ -175,8 +177,8 @@
     <state width="849" height="374" key="GridCell.Tab.1.bottom/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992587" />
     <state width="840" height="374" key="GridCell.Tab.1.bottom/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305945" />
     <state width="840" height="374" key="GridCell.Tab.1.bottom/70.23.1722.1097@70.23.1722.1097" timestamp="1598932593853" />
-    <state width="1322" height="374" key="GridCell.Tab.1.bottom/70.23.2490.1417@70.23.2490.1417" timestamp="1599097989339" />
-    <state width="1322" height="374" key="GridCell.Tab.1.center" timestamp="1599097989338">
+    <state width="1322" height="440" key="GridCell.Tab.1.bottom/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319942" />
+    <state width="1322" height="440" key="GridCell.Tab.1.center" timestamp="1599100319941">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.1.center/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358069" />
@@ -187,8 +189,8 @@
     <state width="849" height="374" key="GridCell.Tab.1.center/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992587" />
     <state width="840" height="374" key="GridCell.Tab.1.center/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305944" />
     <state width="840" height="374" key="GridCell.Tab.1.center/70.23.1722.1097@70.23.1722.1097" timestamp="1598932593853" />
-    <state width="1322" height="374" key="GridCell.Tab.1.center/70.23.2490.1417@70.23.2490.1417" timestamp="1599097989338" />
-    <state width="1322" height="374" key="GridCell.Tab.1.left" timestamp="1599097989338">
+    <state width="1322" height="440" key="GridCell.Tab.1.center/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319941" />
+    <state width="1322" height="440" key="GridCell.Tab.1.left" timestamp="1599100319941">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.1.left/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358069" />
@@ -199,8 +201,8 @@
     <state width="849" height="374" key="GridCell.Tab.1.left/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992587" />
     <state width="840" height="374" key="GridCell.Tab.1.left/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305944" />
     <state width="840" height="374" key="GridCell.Tab.1.left/70.23.1722.1097@70.23.1722.1097" timestamp="1598932593852" />
-    <state width="1322" height="374" key="GridCell.Tab.1.left/70.23.2490.1417@70.23.2490.1417" timestamp="1599097989338" />
-    <state width="1322" height="374" key="GridCell.Tab.1.right" timestamp="1599097989338">
+    <state width="1322" height="440" key="GridCell.Tab.1.left/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319941" />
+    <state width="1322" height="440" key="GridCell.Tab.1.right" timestamp="1599100319942">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.1.right/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358069" />
@@ -211,8 +213,8 @@
     <state width="849" height="374" key="GridCell.Tab.1.right/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992587" />
     <state width="840" height="374" key="GridCell.Tab.1.right/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305944" />
     <state width="840" height="374" key="GridCell.Tab.1.right/70.23.1722.1097@70.23.1722.1097" timestamp="1598932593853" />
-    <state width="1322" height="374" key="GridCell.Tab.1.right/70.23.2490.1417@70.23.2490.1417" timestamp="1599097989338" />
-    <state width="1322" height="374" key="GridCell.Tab.2.bottom" timestamp="1599097989340">
+    <state width="1322" height="440" key="GridCell.Tab.1.right/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319942" />
+    <state width="1322" height="440" key="GridCell.Tab.2.bottom" timestamp="1599100319943">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.2.bottom/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358071" />
@@ -223,8 +225,8 @@
     <state width="849" height="374" key="GridCell.Tab.2.bottom/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992588" />
     <state width="840" height="374" key="GridCell.Tab.2.bottom/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305945" />
     <state width="1300" height="374" key="GridCell.Tab.2.bottom/70.23.1722.1097@70.23.1722.1097" timestamp="1598931659637" />
-    <state width="1322" height="374" key="GridCell.Tab.2.bottom/70.23.2490.1417@70.23.2490.1417" timestamp="1599097989340" />
-    <state width="1322" height="374" key="GridCell.Tab.2.center" timestamp="1599097989339">
+    <state width="1322" height="440" key="GridCell.Tab.2.bottom/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319943" />
+    <state width="1322" height="440" key="GridCell.Tab.2.center" timestamp="1599100319942">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.2.center/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358070" />
@@ -235,8 +237,8 @@
     <state width="849" height="374" key="GridCell.Tab.2.center/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992588" />
     <state width="840" height="374" key="GridCell.Tab.2.center/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305945" />
     <state width="1300" height="374" key="GridCell.Tab.2.center/70.23.1722.1097@70.23.1722.1097" timestamp="1598931659636" />
-    <state width="1322" height="374" key="GridCell.Tab.2.center/70.23.2490.1417@70.23.2490.1417" timestamp="1599097989339" />
-    <state width="1322" height="374" key="GridCell.Tab.2.left" timestamp="1599097989339">
+    <state width="1322" height="440" key="GridCell.Tab.2.center/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319942" />
+    <state width="1322" height="440" key="GridCell.Tab.2.left" timestamp="1599100319942">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.2.left/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358070" />
@@ -247,8 +249,8 @@
     <state width="849" height="374" key="GridCell.Tab.2.left/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992587" />
     <state width="840" height="374" key="GridCell.Tab.2.left/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305945" />
     <state width="1300" height="374" key="GridCell.Tab.2.left/70.23.1722.1097@70.23.1722.1097" timestamp="1598931659636" />
-    <state width="1322" height="374" key="GridCell.Tab.2.left/70.23.2490.1417@70.23.2490.1417" timestamp="1599097989339" />
-    <state width="1322" height="374" key="GridCell.Tab.2.right" timestamp="1599097989339">
+    <state width="1322" height="440" key="GridCell.Tab.2.left/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319942" />
+    <state width="1322" height="440" key="GridCell.Tab.2.right" timestamp="1599100319942">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.2.right/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358070" />
@@ -259,8 +261,8 @@
     <state width="849" height="374" key="GridCell.Tab.2.right/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992588" />
     <state width="840" height="374" key="GridCell.Tab.2.right/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305945" />
     <state width="1300" height="374" key="GridCell.Tab.2.right/70.23.1722.1097@70.23.1722.1097" timestamp="1598931659636" />
-    <state width="1322" height="374" key="GridCell.Tab.2.right/70.23.2490.1417@70.23.2490.1417" timestamp="1599097989339" />
-    <state width="1322" height="374" key="GridCell.Tab.3.bottom" timestamp="1599097989340">
+    <state width="1322" height="440" key="GridCell.Tab.2.right/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319942" />
+    <state width="1322" height="440" key="GridCell.Tab.3.bottom" timestamp="1599100319943">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.3.bottom/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358072" />
@@ -271,8 +273,8 @@
     <state width="849" height="374" key="GridCell.Tab.3.bottom/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992588" />
     <state width="840" height="374" key="GridCell.Tab.3.bottom/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305946" />
     <state width="1300" height="374" key="GridCell.Tab.3.bottom/70.23.1722.1097@70.23.1722.1097" timestamp="1598931659637" />
-    <state width="1322" height="374" key="GridCell.Tab.3.bottom/70.23.2490.1417@70.23.2490.1417" timestamp="1599097989340" />
-    <state width="1322" height="374" key="GridCell.Tab.3.center" timestamp="1599097989340">
+    <state width="1322" height="440" key="GridCell.Tab.3.bottom/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319943" />
+    <state width="1322" height="440" key="GridCell.Tab.3.center" timestamp="1599100319943">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.3.center/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358071" />
@@ -283,8 +285,8 @@
     <state width="849" height="374" key="GridCell.Tab.3.center/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992588" />
     <state width="840" height="374" key="GridCell.Tab.3.center/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305945" />
     <state width="1300" height="374" key="GridCell.Tab.3.center/70.23.1722.1097@70.23.1722.1097" timestamp="1598931659637" />
-    <state width="1322" height="374" key="GridCell.Tab.3.center/70.23.2490.1417@70.23.2490.1417" timestamp="1599097989340" />
-    <state width="1322" height="374" key="GridCell.Tab.3.left" timestamp="1599097989340">
+    <state width="1322" height="440" key="GridCell.Tab.3.center/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319943" />
+    <state width="1322" height="440" key="GridCell.Tab.3.left" timestamp="1599100319943">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.3.left/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358071" />
@@ -295,8 +297,8 @@
     <state width="849" height="374" key="GridCell.Tab.3.left/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992588" />
     <state width="840" height="374" key="GridCell.Tab.3.left/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305945" />
     <state width="1300" height="374" key="GridCell.Tab.3.left/70.23.1722.1097@70.23.1722.1097" timestamp="1598931659637" />
-    <state width="1322" height="374" key="GridCell.Tab.3.left/70.23.2490.1417@70.23.2490.1417" timestamp="1599097989340" />
-    <state width="1322" height="374" key="GridCell.Tab.3.right" timestamp="1599097989340">
+    <state width="1322" height="440" key="GridCell.Tab.3.left/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319943" />
+    <state width="1322" height="440" key="GridCell.Tab.3.right" timestamp="1599100319943">
       <screen x="70" y="23" width="2490" height="1417" />
     </state>
     <state width="840" height="374" key="GridCell.Tab.3.right/0.0.1792.1120@0.0.1792.1120" timestamp="1598115358072" />
@@ -307,7 +309,7 @@
     <state width="849" height="374" key="GridCell.Tab.3.right/62.23.1730.1097@62.23.1730.1097" timestamp="1598899992588" />
     <state width="840" height="374" key="GridCell.Tab.3.right/67.23.1725.1097@67.23.1725.1097" timestamp="1598947305946" />
     <state width="1300" height="374" key="GridCell.Tab.3.right/70.23.1722.1097@70.23.1722.1097" timestamp="1598931659637" />
-    <state width="1322" height="374" key="GridCell.Tab.3.right/70.23.2490.1417@70.23.2490.1417" timestamp="1599097989340" />
+    <state width="1322" height="440" key="GridCell.Tab.3.right/70.23.2490.1417@70.23.2490.1417" timestamp="1599100319943" />
     <state x="161" y="268" width="670" height="676" key="search.everywhere.popup" timestamp="1598787117227">
       <screen x="53" y="23" width="1739" height="1097" />
     </state>
diff --git a/backend/sub-store.js b/backend/sub-store.js
index 0845cb0..7243791 100644
--- a/backend/sub-store.js
+++ b/backend/sub-store.js
@@ -1785,7 +1785,7 @@ function KeywordRenameOperator(keywords) {
         func: (proxies) => {
             return proxies.map((proxy) => {
                 for (const {old, now} of keywords) {
-                    proxy.name = proxy.name.replace(old, now).trim();
+                    proxy.name = proxy.name.replaceAll(old, now).trim();
                 }
                 return proxy;
             });