eric: comparison UI/PythonAstViewer.py

-:faac36ec9d76
+:8a3df4c6ac9a
 except NameError:
 pass
 import ast
-from PyQt5.QtCore import Qt, QTimer
+from PyQt5.QtCore import pyqtSlot, Qt, QTimer
 from PyQt5.QtGui import QCursor, QBrush
 from PyQt5.QtWidgets import QTreeWidget, QApplication, QTreeWidgetItem, \
 QAbstractItemView, QWidget, QVBoxLayout
 from ThirdParty.asttokens.asttokens import ASTTokens
-# TODO: highlight code area in editor when a tree node is clicked
-# TODO: jump to node when a double click in the editor is detected
-#       (rebuild the tree, if the source code has changed)
 class PythonAstViewer(QWidget):
 """
 Class implementing a widget to visualize the Python AST for some Python
 sources.
 """
 self.__astWidget.setSortingEnabled(False)
 self.__astWidget.setSelectionBehavior(QAbstractItemView.SelectRows)
 self.__astWidget.setSelectionMode(QAbstractItemView.SingleSelection)
 self.__astWidget.setAlternatingRowColors(True)
+self.__astWidget.itemClicked.connect(self.__astItemClicked)
 self.__vm.astViewerStateChanged.connect(self.__astViewerStateChanged)
 self.hide()
 def __editorChanged(self, editor):
 @param editor reference to the current editor
 @type Editor
 """
 if editor is not self.__editor:
+if self.__editor:
+self.__editor.clearAllHighlights()
 self.__editor = editor
 if self.__editor:
 self.__loadAST()
 def __editorSaved(self, editor):
 @type Editor
 """
 if editor and editor is self.__editor:
 self.__loadAST()
+def __editorDoubleClicked(self, editor, pos, buttons):
+"""
+Private slot to handle a mouse button double click in the editor.
+@param editor reference to the editor, that emitted the signal
+@type Editor
+@param pos position of the double click
+@type QPoint
+@param buttons mouse buttons that were double clicked
+@type Qt.MouseButtons
+"""
+if editor is self.__editor and buttons == Qt.LeftButton:
+if editor.isModified():
+# reload the source
+QTimer.singleShot(0, self.__loadAST)
+else:
+# highlight the corresponding entry
+QTimer.singleShot(0, self.__selectItemForEditorSelection)
+QTimer.singleShot(0, self.__grabFocus)
 def __lastEditorClosed(self):
 """
 Private slot to handle the last editor closed signal of the view
 manager.
 """
 super(PythonAstViewer, self).show()
 if not self.__vmConnected:
 self.__vm.editorChangedEd.connect(self.__editorChanged)
 self.__vm.editorSavedEd.connect(self.__editorSaved)
+self.__vm.editorDoubleClickedEd.connect(self.__editorDoubleClicked)
 self.__vmConnected = True
 def hide(self):
 """
 Public slot to hide the AST viewer.
 """
 super(PythonAstViewer, self).hide()
+if self.__editor:
+self.__editor.clearAllHighlights()
 if self.__vmConnected:
 self.__vm.editorChangedEd.disconnect(self.__editorChanged)
 self.__vm.editorSavedEd.disconnect(self.__editorSaved)
+self.__vm.editorDoubleClickedEd.disconnect(
+self.__editorDoubleClicked)
 self.__vmConnected = False
 def shutdown(self):
 """
 Public method to perform shutdown actions.
 if editor is not self.__editor:
 self.__editor = editor
 self.show()
 self.__loadAST()
 else:
+self.hide()
 self.__editor = None
-self.hide()
 def __createErrorItem(self, error):
 """
 Private method to create a top level error item.
 """
 if not self.__editor:
 return
 self.__astWidget.clear()
+self.__editor.clearAllHighlights()
 if not self.__editor.isPyFile():
 self.__createErrorItem(self.tr(
 "The current editor text does not contain Python source."
 ))
 QTimer.singleShot(0, self.__resizeColumns)
 self.setUpdatesEnabled(True)
 QApplication.restoreOverrideCursor()
+self.__grabFocus()
 def __populateNode(self, name, nodeOrFields, parent):
 """
 Private method to populate the tree view with a node.
 @param textRange tuple giving the start and end positions
 @type tuple of (int, int, int, int)
 @return best matching node
 @rtype ast.AST
 """
-if textRange == (-1, -1, -1, -1):
+if textRange in [(-1, -1, -1, -1), (0, -1, 0, -1)]:
 # no valid range, i.e. no selection
 return None
 # first look among children
 for child in ast.iter_child_nodes(node):
 @param textRange tuple giving the start and end positions
 @type tuple of (int, int, int, int)
 @return best matching tree item
 @rtype QTreeWidgetItem
 """
-if textRange == (-1, -1, -1, -1):
+if textRange in [(-1, -1, -1, -1), (0, -1, 0, -1)]:
 # no valid range, i.e. no selection
+return None
+lineno = itm.data(0, self.StartLineRole)
+if lineno is not None and not self.__rangeContainsSmallerOrEqual(
+(itm.data(0, self.StartLineRole), itm.data(0, self.StartIndexRole),
+itm.data(0, self.EndLineRole), itm.data(0, self.EndIndexRole)),
+textRange):
 return None
 # first look among children
 for index in range(itm.childCount()):
 child = itm.child(index)
 if result is not None:
 return result
 # no suitable child was found
 lineno = itm.data(0, self.StartLineRole)
-if lineno is not None and self.__rangeContainsSmaller(
+if lineno is not None and self.__rangeContainsSmallerOrEqual(
 (itm.data(0, self.StartLineRole), itm.data(0, self.StartIndexRole),
 itm.data(0, self.EndLineRole), itm.data(0, self.EndIndexRole)),
 textRange):
 return itm
 else:
 (firstStart < secondStart and firstEnd > secondEnd) or
 (firstStart == secondStart and firstEnd > secondEnd) or
 (firstStart < secondStart and firstEnd == secondEnd)
 )
+def __rangeContainsSmallerOrEqual(self, first, second):
+"""
+Private method to check, if second is contained in or equal to first.
+@param first text range to check against
+@type tuple of (int, int, int, int)
+@param second text range to check for
+@type tuple of (int, int, int, int)
+@return flag indicating second is contained in or equal to first
+@rtype bool
+"""
+return first == second or self.__rangeContainsSmaller(first, second)
 def __clearSelection(self):
 """
 Private method to clear all selected items.
 """
 for itm in self.__astWidget.selectedItems():
 self.__astWidget.topLevelItem(0), selection)
 if itm:
 self.__astWidget.scrollToItem(
 itm, QAbstractItemView.PositionAtCenter)
 itm.setSelected(True)
+def __grabFocus(self):
+"""
+Private method to grab the input focus.
+"""
+self.__astWidget.setFocus(Qt.OtherFocusReason)
+@pyqtSlot(QTreeWidgetItem, int)
+def __astItemClicked(self, itm, column):
+"""
+Private slot handling a user click on an AST node item.
+@param itm reference to the clicked item
+@type QTreeWidgetItem
+@param column column number of the click
+@type int
+"""
+self.__editor.clearAllHighlights()
+if itm is not None:
+startLine = itm.data(0, self.StartLineRole)
+if startLine is not None:
+startIndex = itm.data(0, self.StartIndexRole)
+endLine = itm.data(0, self.EndLineRole)
+endIndex = itm.data(0, self.EndIndexRole)
+self.__editor.gotoLine(startLine, firstVisible=True,
+expand=True)
+self.__editor.setHighlight(startLine - 1, startIndex,
+endLine - 1, endIndex)

Mercurial Repositories > eric / file comparison

comparison: UI/PythonAstViewer.py

UI/PythonAstViewer.py