From ba23bed340bab31b8c233f27acb181516f9de60c Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 7 Mar 2000 16:25:11 +0000 Subject: [PATCH] Tweak the goto file/line command (in the right button menu in PyShell and output windows) so that it if it doesn't succeed with the line at the cursor, it tries the line before that. This is handy with tracebacks, where my natural tendency is to click in the displayed source line rather than in the file/line indicator just above it. Now I can indulge this tendency. I factored out a helper and changed the error handling so that a non-existing file is treated as if the line didn't match -- this is handy because some function calls (e.g. "foo.bar(1)") match the grep pattern. --- Tools/idle/OutputWindow.py | 39 ++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/Tools/idle/OutputWindow.py b/Tools/idle/OutputWindow.py index f03aaee15f..0c36a881f5 100644 --- a/Tools/idle/OutputWindow.py +++ b/Tools/idle/OutputWindow.py @@ -67,30 +67,41 @@ class OutputWindow(EditorWindow): # x, y = self.event.x, self.event.y # self.text.mark_set("insert", "@%d,%d" % (x, y)) line = self.text.get("insert linestart", "insert lineend") + result = self._file_line_helper(line) + if not result: + # Try the previous line. This is handy e.g. in tracebacks, + # where you tend to right-click on the displayed source line + line = self.text.get("insert -1line linestart", + "insert -1line lineend") + result = self._file_line_helper(line) + if not result: + tkMessageBox.showerror( + "No special line", + "The line you point at doesn't look like " + "a valid file name followed by a line number.", + master=self.text) + return + filename, lineno = result + edit = self.flist.open(filename) + edit.gotoline(lineno) + + def _file_line_helper(self, line): for prog in self.file_line_progs: m = prog.search(line) if m: break else: - tkMessageBox.showerror("No special line", - "The line you point at doesn't look like " - "a file name followed by a line number.", - master=self.text) - return + return None filename, lineno = m.group(1, 2) try: f = open(filename, "r") f.close() - except IOError, msg: - self.text.bell() - return - edit = self.flist.open(filename) + except IOError: + return None try: - lineno = int(lineno) - except ValueError, msg: - self.text.bell() - return - edit.gotoline(lineno) + return filename, int(lineno) + except TypeError: + return None # These classes are currently not used but might come in handy -- 2.40.0