--- a/src/eric7/QScintilla/Editor.py Sat Feb 10 11:28:58 2024 +0100 +++ b/src/eric7/QScintilla/Editor.py Sun Feb 11 18:35:44 2024 +0100 @@ -67,8 +67,8 @@ from eric7.EricWidgets import EricFileDialog, EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.Globals import recentNameBreakpointConditions +from eric7.RemoteServerInterface import EricServerFileDialog from eric7.SystemUtilities import FileSystemUtilities, OSUtilities, PythonUtilities -from eric7.RemoteServerInterface import EricServerFileDialog from eric7.UI import PythonDisViewer from eric7.Utilities import MouseUtilities @@ -269,7 +269,6 @@ "EricServer" ).getServiceInterface("FileSystem") - # clear some variables self.lastHighlight = None # remember the last highlighted line self.lastErrorMarker = None # remember the last error line @@ -487,7 +486,7 @@ self.readFile(self.fileName, createIt=True) elif FileSystemUtilities.isRemoteFileName(self.fileName): - self.readFile(self.fileName, createIt=True, isRemote=True) + self.readFile(self.fileName, createIt=True, isRemote=True) self.__bindLexer(self.fileName) self.__bindCompleter(self.fileName) @@ -3539,8 +3538,8 @@ pass if encoding == "": encoding = self.__getEditorConfig( - "DefaultEncoding", nodefault=True - ) + "DefaultEncoding", nodefault=True + ) if encoding: txt, self.encoding = Utilities.readEncodedFileWithEncoding( fn, encoding @@ -3632,10 +3631,11 @@ @return flag indicating success @rtype bool """ - if self.fileName and fn == self.fileName: - config = None - else: - config = self.__loadEditorConfigObject(fn) + config = ( + None + if self.fileName and fn == self.fileName + else self.__loadEditorConfigObject(fn) + ) eol = self.__getEditorConfig("EOLMode", nodefault=True, config=config) if eol is not None: @@ -8095,7 +8095,8 @@ with contextlib.suppress(AttributeError): self.setCaretWidth(self.caretWidth) - self.__updateReadOnly(False) + if not self.dbs.isDebugging: + self.__updateReadOnly(False) self.setCursorFlashTime(QApplication.cursorFlashTime()) if ( @@ -8380,7 +8381,7 @@ filename = FileSystemUtilities.plainFileName(filename) if self.__remotefsInterface.exists(filename): mtime = self.__remotefsInterface.stat( - FileSystemUtilities.plainFileName(filename), ["st_mtime"] + FileSystemUtilities.plainFileName(filename), ["st_mtime"] )["st_mtime"] self.lastModified = mtime if mtime is not None else 0 else: @@ -8408,7 +8409,10 @@ filename = self.fileName if filename: - if FileSystemUtilities.isRemoteFileName(filename): + if ( + FileSystemUtilities.isRemoteFileName(filename) + and not self.dbs.isDebugging + ): plainFilename = FileSystemUtilities.plainFileName(filename) if self.__remotefsInterface.exists(plainFilename): mtime = self.__remotefsInterface.stat( @@ -8416,9 +8420,11 @@ )["st_mtime"] return mtime != self.lastModified - elif FileSystemUtilities.isPlainFileName(filename): - if pathlib.Path(filename).exists(): - return pathlib.Path(filename).stat().st_mtime != self.lastModified + elif ( + FileSystemUtilities.isPlainFileName(filename) + and pathlib.Path(filename).exists() + ): + return pathlib.Path(filename).stat().st_mtime != self.lastModified return False @@ -9883,16 +9889,6 @@ if config is None: config = self.__editorConfig - ##if not config: - ##if nodefault: - ##return None - ##else: - ##value = self.__getOverrideValue(option) - ##if value is None: - ### no override - ##value = Preferences.getEditor(option) - ##return value -## try: if option == "EOLMode": value = config["end_of_line"]