Merge pull request #134 from FlickerSoul/dev

Fix return line recording

Author: FlickerSoul

backend/bundle/seeker/sight.py

@@ -437,8 +437,7 @@ def trace(self, frame, event, arg):
         #                                                                     #
         # Finished dealing with misplaced function definition. ################
 
-        # TODO remove the if statement
-        if event != 'return':
+        if not (event == 'return' and line_no == self.recorder.get_last_record_line_number()):
             self.recorder.add_record(line_no)
 
         # Reporting newish and modified variables: ############################

backend/bundle/server_utils/params.py

@@ -28,7 +28,7 @@
 REQUEST_GRAPH_NAME: str = 'graph'
 
 REQUEST_VERSION_NAME: str = 'version'
-VERSION: str = '0.2.2'
+VERSION: str = '0.2.3'
 
 SERVER_LOG = None
 

backend/bundle/setup.py

@@ -11,7 +11,7 @@ def read_file(filename):
 
 setuptools.setup(
     name="bundle",
-    version="0.2.2",
+    version="0.2.3",
     packages=setuptools.find_packages(exclude=['tests*']),
     author="Heyuan Zeng",
     author_email="[email protected]",

backend/bundle/utils/recorder.py

@@ -183,6 +183,9 @@ def get_last_record(self) -> MutableMapping:
         """
         return self._changes[-1]
 
+    def get_last_record_line_number(self) -> int:
+        return self.get_last_record()[self._LINE_HEADER]
+
     def get_previous_record(self) -> MutableMapping:
         """Get the second last record in the record list
 

graphery/src/services/params.ts

@@ -21,4 +21,4 @@ def main() -> None:
 # https://github.com/FlickerSoul/Graphery/tree/master/backend/bundle#readme
 `;
 
-export const localServerTargetVersion = '0.2.2';
+export const localServerTargetVersion = '0.2.3';