eric: comparison eric6/QScintilla/MiniEditor.py

-:fb0ef164f536
+:698ae46f40a4
 Module implementing an editor for simple editing tasks.
 """
 import os
 import re
+import contextlib
+import editorconfig
 from PyQt5.QtCore import (
 pyqtSignal, Qt, QSignalMapper, QPoint, QTimer, QFileInfo, QSize,
 QCoreApplication
 )
 from Globals import isMacPlatform
 import Utilities
 import Preferences
-from ThirdParty.EditorConfig import editorconfig
 class MiniScintilla(QsciScintillaCompat):
 """
 Class implementing a QsciScintillaCompat subclass for handling focus
 events.
 Constructor
 @param parent parent widget
 @type QWidget
 """
-super(MiniScintilla, self).__init__(parent)
+super().__init__(parent)
 self.mw = parent
 def getFileName(self):
 """
 matchingPairs = ['()', '[]', '{}', '<>', "''", '""']
 # __IGNORE_WARNING_M613__
 if text in matchingPairs:
 self.delete()
-super(MiniScintilla, self).editorCommand(cmd)
+super().editorCommand(cmd)
 def keyPressEvent(self, ev):
 """
 Protected method to handle the user input a key at a time.
 @param encString string to use to enclose the selection
 (one or two characters)
 @type str
 """
 startChar = encString[0]
-if len(encString) == 2:
+endChar = encString[1] if len(encString) == 2 else startChar
-endChar = encString[1]
-else:
-endChar = startChar
 sline, sindex, eline, eindex = self.getSelection()
 replaceText = startChar + self.selectedText() + endChar
 self.beginUndoAction()
 self.replaceSelectedText(replaceText)
 txt = ev.text()
 # See it is text to insert.
 if len(txt) and txt >= " ":
-if self.hasSelectedText():
+if (
-if txt in MiniScintilla.EncloseChars:
+self.hasSelectedText() and
-encloseSelectedText(MiniScintilla.EncloseChars[txt])
+txt in MiniScintilla.EncloseChars
-ev.accept()
+):
-return
+encloseSelectedText(MiniScintilla.EncloseChars[txt])
+ev.accept()
+return
-super(MiniScintilla, self).keyPressEvent(ev)
+super().keyPressEvent(ev)
 else:
 ev.ignore()
 def focusInEvent(self, event):
 """
 @param event the event object
 @type QFocusEvent
 """
 self.mw.editorActGrp.setEnabled(True)
-try:
+with contextlib.suppress(AttributeError):
 self.setCaretWidth(self.mw.caretWidth)
-except AttributeError:
-pass
 self.setCursorFlashTime(QApplication.cursorFlashTime())
-super(MiniScintilla, self).focusInEvent(event)
+super().focusInEvent(event)
 def focusOutEvent(self, event):
 """
 Protected method called when the editor loses focus.
 @type QFocusEvent
 """
 self.mw.editorActGrp.setEnabled(False)
 self.setCaretWidth(0)
-super(MiniScintilla, self).focusOutEvent(event)
+super().focusOutEvent(event)
 def removeTrailingWhitespace(self):
 """
 Public method to remove trailing whitespace.
 """
 @param filename name of the file to open (string)
 @param filetype type of the source file (string)
 @param parent reference to the parent widget (QWidget)
 @param name object name of the window (string)
 """
-super(MiniEditor, self).__init__(parent)
+super().__init__(parent)
 if name is not None:
 self.setObjectName(name)
 self.setWindowIcon(UI.PixmapCache.getIcon("editor"))
 self.setStyle(Preferences.getUI("Style"),
 @type bool
 """
 if "[*]" not in self.windowTitle():
 self.setWindowTitle(self.tr("[*] - {0}")
 .format(self.tr("Mini Editor")))
-super(MiniEditor, self).setWindowModified(modified)
+super().setWindowModified(modified)
 def __setCurrentFile(self, fileName):
 """
 Private method to register the file name of the current file.
 @param fileName name of the file to register (string)
 """
 self.__curFile = fileName
-if not self.__curFile:
+shownName = (
-shownName = self.tr("Untitled")
+self.tr("Untitled")
-else:
+if not self.__curFile else
-shownName = self.__strippedName(self.__curFile)
+self.__strippedName(self.__curFile)
+)
 self.setWindowTitle(self.tr("{0}[*] - {1}")
 .format(shownName, self.tr("Mini Editor")))
 self.__textEdit.setModified(False)
 # set margin 2 settings
 self.__textEdit.setMarginWidth(2, 16)
 if Preferences.getEditor("FoldingMargin"):
 folding = Preferences.getEditor("FoldingStyle")
-try:
+with contextlib.suppress(AttributeError):
 folding = QsciScintilla.FoldStyle(folding)
-except AttributeError:
-pass
 self.__textEdit.setFolding(folding)
 self.__textEdit.setFoldMarginColors(
 Preferences.getEditorColour("FoldmarginBackground"),
 Preferences.getEditorColour("FoldmarginBackground"))
 self.__textEdit.setFoldMarkersColors(
 self.__textEdit.setLexer(self.lexer_)
 if self.lexer_.lexer() == "container" or self.lexer_.lexer() is None:
 self.__textEdit.SCN_STYLENEEDED.connect(self.__styleNeeded)
 # get the font for style 0 and set it as the default font
-if pyname and pyname.startswith("Pygments|"):
+key = (
-key = 'Scintilla/Guessed/style0/font'
+'Scintilla/Guessed/style0/font'
-else:
+if pyname and pyname.startswith("Pygments|") else
-key = 'Scintilla/{0}/style0/font'.format(self.lexer_.language())
+'Scintilla/{0}/style0/font'.format(self.lexer_.language())
+)
 fdesc = Preferences.Prefs.settings.value(key)
 if fdesc is not None:
 font = QFont(fdesc[0], int(fdesc[1]))
 self.lexer_.setDefaultFont(font)
 self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
 elif self.filetype in ["Python", "Python3", "MicroPython"]:
 bindName = "dummy.py"
 if not bindName and line0.startswith("#!"):
 # #! marker detection
-if "python3" in line0:
+if (
-bindName = "dummy.py"
+"python3" in line0 or
-self.filetype = "Python3"
+"python" in line0
-elif "python" in line0:
+):
 bindName = "dummy.py"
 self.filetype = "Python3"
 elif ("/bash" in line0 or "/sh" in line0):
 bindName = "dummy.sh"
 elif "ruby" in line0:
 if wc is None:
 pattern = r"\b[\w_]+\b"
 else:
 wc = re.sub(r'\w', "", wc)
 pattern = r"\b[\w{0}]+\b".format(re.escape(wc))
-if self.__textEdit.caseSensitive():
+rx = (
-rx = re.compile(pattern)
+re.compile(pattern)
-else:
+if self.__textEdit.caseSensitive() else
-rx = re.compile(pattern, re.IGNORECASE)
+re.compile(pattern, re.IGNORECASE)
+)
 text = self.text(line)
 for match in rx.finditer(text):
 start, end = match.span()
 if start <= index <= end:

Mercurial Repositories > eric / file comparison

comparison: eric6/QScintilla/MiniEditor.py

eric6/QScintilla/MiniEditor.py