eric: comparison src/eric7/QScintilla/Editor.py

-:0f9c86561033
+:4e8e63df7893
 "<": "<>",
 ">": "<>",
 }
 def __init__(
-self, dbs, fn="", vm=None, filetype="", editor=None, tv=None, parent=None
+self,
+dbs,
+fn="",
+vm=None,
+filetype="",
+editor=None,
+tv=None,
+assembly=None,
+parent=None,
 ):
 """
 Constructor
 @param dbs reference to the debug server object
 @type DebugServer
 @param fn name of the file to be opened. If it is None, a new (empty)
-editor is opened.
+editor is opened. (defaults to "")
-@type str
+@type str (optional)
-@param vm reference to the view manager object
+@param vm reference to the view manager object (defaults to None)
-@type ViewManager
+@type ViewManager (optional)
-@param filetype type of the source file
+@param filetype type of the source file (defaults to "")
-@type str
+@type str (optional)
 @param editor reference to an Editor object, if this is a cloned view
-@type Editor
+(defaults to None)
-@param tv reference to the task viewer object
+@type Editor (optional)
-@type TaskViewer
+@param tv reference to the task viewer object (defaults to None)
-@param parent reference to the parent widget
+@type TaskViewer (optional)
-@type QWidget
+@param assembly reference to the editor assembly object (defaults to None)
+@type EditorAssembly (optional)
+@param parent reference to the parent widget (defaults to None)
+@type QWidget (optional)
 @exception OSError raised to indicate an issue accessing the file
 """
 super().__init__(parent)
 self.setAttribute(Qt.WidgetAttribute.WA_KeyCompression)
 self.setUtf8(True)
 self.enableMultiCursorSupport()
+self.__assembly = assembly
 self.dbs = dbs
 self.taskViewer = tv
 self.fileName = ""
 self.vm = vm
 self.filetype = filetype
 # true if we are in drop mode
 self.inLinesChanged = False
 # true if we are propagating a lines changed event
 self.__hasTaskMarkers = False
 # no task markers present
+self.__checkExternalModification = True
+# check and reload or warn when modified externally
 self.macros = {}  # list of defined macros
 self.curMacro = None
 self.recording = False
 )
 self.changeMarkersMask = (1 << self.__changeMarkerSaved) | (
 1 << self.__changeMarkerUnsaved
 )
-# configure the margins
-self.__setMarginsDisplay()
-self.linesChanged.connect(self.__resizeLinenoMargin)
-self.marginClicked.connect(self.__marginClicked)
 # set the eol mode
 self.__setEolMode()
 # set the text display
 self.lastModified = editor.lastModified
 self.addClone(editor)
 editor.addClone(self)
+# configure the margins
+self.__setMarginsDisplay()
+self.linesChanged.connect(self.__resizeLinenoMargin)
+self.marginClicked.connect(self.__marginClicked)
 self.gotoLine(1)
 # connect the mouse hover signals
 # mouse hover for the editor margins
 self.SCN_DWELLSTART.connect(self.__marginHoverStart)
 self.grabGesture(Qt.GestureType.PinchGesture)
 self.SCN_ZOOM.connect(self.__markerMap.update)
 self.__markerMap.update()
+def getAssembly(self):
+"""
+Public method to get a reference to the editor assembly object.
+@return reference to the editor assembly object
+@rtype EditorAssembly
+"""
+return self.__assembly
 def setFileName(self, name):
 """
 Public method to set the file name of the current file.
 bindName = self.__bindName(self.text(0))
 if bindName:
 language = Preferences.getEditorLexerAssoc(bindName)
 if language == "Python":
 # correction for Python
-pyVer = PythonUtilities.determinePythonVersion(
+language = "Python3"
-filename, self.text(0), self
-)
-language = "Python{0}".format(pyVer)
 if language in [
 "Python3",
 "MicroPython",
 "Cython",
 "Ruby",
 self.completer = None
 filename = os.path.basename(filename)
 apiLanguage = Preferences.getEditorLexerAssoc(filename)
 if apiLanguage == "":
-pyVer = self.__getPyVersion()
+if PythonUtilities.isPythonSource(self.fileName, self.text(0), self):
-if pyVer:
+apiLanguage = "Python3"
-apiLanguage = "Python{0}".format(pyVer)
 elif self.isRubyFile():
 apiLanguage = "Ruby"
 self.completer = TypingCompleters.getCompleter(apiLanguage, self)
 @return type of the displayed file or an empty string
 @rtype str
 """
 ftype = self.filetype
 if not ftype:
-pyVer = self.__getPyVersion()
+if PythonUtilities.isPythonSource(self.fileName, self.text(0), self):
-if pyVer:
+ftype = "Python3"
-ftype = "Python{0}".format(pyVer)
 elif self.isRubyFile():
 ftype = "Ruby"
 else:
 ftype = ""
 @return current encoding
 @rtype str
 """
 return self.encoding
-def __getPyVersion(self):
-"""
-Private method to return the Python main version or 0 if it's
-not a Python file at all.
-@return Python version or 0 if it's not a Python file
-@rtype int
-"""
-return PythonUtilities.determinePythonVersion(self.fileName, self.text(0), self)
 def isPyFile(self):
 """
 Public method to return a flag indicating a Python (2 or 3) file.
 @return flag indicating a Python3 file
 @rtype bool
 """
-return self.__getPyVersion() == 3
+return PythonUtilities.isPythonSource(self.fileName, self.text(0), self)
 def isPy3File(self):
 """
 Public method to return a flag indicating a Python3 file.
 @return flag indicating a Python3 file
 @rtype bool
 """
-return self.__getPyVersion() == 3
+return PythonUtilities.isPythonSource(self.fileName, self.text(0), self)
 def isMicroPythonFile(self):
 """
 Public method to return a flag indicating a MicroPython file.
 )
 )
 or self.isReadOnly()
 )
+def setCheckExternalModificationEnabled(self, enable):
+"""
+Public method to enable or disable the check for external modifications.
+@param enable flag indicating the new enabled state
+@type bool
+"""
+self.__checkExternalModification = enable
 @pyqtSlot()
 def checkRereadFile(self):
 """
 Public slot to check, if the file needs to be re-read, and refresh it if
 needed.
 """
-if self.checkModificationTime():
+if self.__checkExternalModification and self.checkModificationTime():
 if Preferences.getEditor("AutoReopen") and not self.isModified():
 self.__refresh()
 else:
 msg = self.tr(
 """<p>The file <b>{0}</b> has been changed while it"""

Mercurial Repositories > eric / file comparison

comparison: src/eric7/QScintilla/Editor.py

src/eric7/QScintilla/Editor.py