eric: comparison QScintilla/MiniEditor.py

-:a5b9f6a38faf
+:cbd34d558bd9
 """
 self.mw.editorActGrp.setEnabled(False)
 self.setCaretWidth(0)
 super(MiniScintilla, self).focusOutEvent(event)
+def removeTrailingWhitespace(self):
+"""
+Public method to remove trailing whitespace.
+"""
+searchRE = r"[ \t]+$"    # whitespace at the end of a line
+ok = self.findFirstTarget(searchRE, True, False, False, 0, 0)
+self.beginUndoAction()
+while ok:
+self.replaceTarget("")
+ok = self.findNextTarget()
+self.endUndoAction()
 class MiniEditor(E5MainWindow):
 """
 Class implementing a minimalistic editor for simple editing tasks.
 self.__replaceWidget.hide()
 self.lexer_ = None
 self.apiLanguage = ""
 self.filetype = ""
+self.__curFile = filename
+self.__loadEditorConfig(filename)
 self.__createActions()
 self.__createMenus()
 self.__createToolBars()
 self.__createStatusBar()
 Private method to load the given file.
 @param fileName name of the file to load (string)
 @param filetype type of the source file (string)
 """
+QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
 self.__loadEditorConfig(fileName=fileName)
-QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
 try:
 encoding = self.__getEditorConfig("DefaultEncoding",
 nodefault=True)
 if encoding:
 '<p>Reason: {1}</p>')
 .format(fileName, str(why)))
 QApplication.restoreOverrideCursor()
 return
+modified = False
+if (not self.__getEditorConfig("TabForIndentation")) and \
+Preferences.getEditor("ConvertTabsOnLoad") and \
+not (self.lexer_ and
+self.lexer_.alwaysKeepTabs()):
+txtExpanded = txt.expandtabs(self.__getEditorConfig("TabWidth"))
+if txtExpanded != txt:
+modified = True
+txt = txtExpanded
 self.__textEdit.setText(txt)
 QApplication.restoreOverrideCursor()
+self.__textEdit.setModified(modified)
+self.setWindowModified(modified)
 if filetype is None:
 self.filetype = ""
 else:
 self.filetype = filetype
 self.__setCurrentFile(fileName)
-fileEol = self.__textEdit.detectEolString(txt)
+self.__textEdit.setModified(modified)
-# TODO: editorconfig: end_of_line
+self.setWindowModified(modified)
-self.__textEdit.setEolModeByEolString(fileEol)
+eolMode = self.__getEditorConfig("EOLMode", nodefault=True)
+if eolMode is None:
+fileEol = self.__textEdit.detectEolString(txt)
+self.__textEdit.setEolModeByEolString(fileEol)
+else:
+self.__textEdit.convertEols(eolMode)
 self.__statusBar.showMessage(self.tr("File loaded"), 2000)
 def __saveFile(self, fileName):
 """
 @param fileName name of the file to be written to
 @type str
 @return flag indicating success
 @rtype bool
 """
-# TODO: editorconfig: apply end_of_line, trim_trailing_whitespace,
+QApplication.setOverrideCursor(Qt.WaitCursor)
-#       insert_final_newline
 config = self.__loadEditorConfigObject(fileName)
-QApplication.setOverrideCursor(Qt.WaitCursor)
+eol = self.__getEditorConfig("EOLMode", nodefault=True, config=config)
+if eol is not None:
+self.__textEdit.convertEols(eol)
+if self.__getEditorConfig("StripTrailingWhitespace", config=config):
+self.__textEdit.removeTrailingWhitespace()
 txt = self.__textEdit.text()
-# TODO: editorconfig: insert_final_newline
+if self.__getEditorConfig("InsertFinalNewline", config=config):
+eol = self.__textEdit.getLineSeparator()
+if eol:
+if len(txt) >= len(eol):
+if txt[-len(eol):] != eol:
+txt += eol
+else:
+txt += eol
+# now write text to the file
 try:
 editorConfigEncoding = self.__getEditorConfig(
 "DefaultEncoding", nodefault=True, config=config)
 self.encoding = Utilities.writeEncodedFile(
 fileName, txt, self.encoding,
 linenoMargin = Preferences.getEditor("LinenoMargin")
 if linenoMargin:
 self.__textEdit.setMarginWidth(
 0, '8' * (len(str(self.__textEdit.lines())) + 1))
-def __setTextDisplay(self):
+def __setTabAndIndent(self):
 """
-Private method to configure the text display.
+Private method to set indentation size and style and tab width.
 """
-# TODO: editorconfig: move these to separate method called, when
+self.__textEdit.setTabWidth(self.__getEditorConfig("TabWidth"))
-#   EditorConfig has been loaded
-# TODO: editorconfig: tab_width
-self.__textEdit.setTabWidth(Preferences.getEditor("TabWidth"))
-# TODO: editorconfig: indent_size
 self.__textEdit.setIndentationWidth(
-Preferences.getEditor("IndentWidth"))
+self.__getEditorConfig("IndentWidth"))
-# TODO: editorconfig: indent_style
 if self.lexer_ and self.lexer_.alwaysKeepTabs():
 self.__textEdit.setIndentationsUseTabs(True)
 else:
 self.__textEdit.setIndentationsUseTabs(
-Preferences.getEditor("TabForIndentation"))
+self.__getCurrentWord("TabForIndentation"))
+def __setTextDisplay(self):
+"""
+Private method to configure the text display.
+"""
+self.__setTabAndIndent()
 self.__textEdit.setTabIndents(Preferences.getEditor("TabIndents"))
 self.__textEdit.setBackspaceUnindents(
 Preferences.getEditor("TabIndents"))
 self.__textEdit.setIndentationGuides(
 Preferences.getEditor("IndentationGuides"))
 def __setEolMode(self):
 """
 Private method to configure the eol mode of the editor.
 """
-# TODO: editorconfig: end_of_line
+eolMode = self.__getEditorConfig("EOLMode")
-eolMode = Preferences.getEditor("EOLMode")
 eolMode = QsciScintilla.EolMode(eolMode)
 self.__textEdit.setEolMode(eolMode)
 def __setMonospaced(self, on):
 """
 if filetype is None:
 self.filetype = ""
 else:
 self.filetype = filetype
-# TODO: editorconfig: end_of_line
+eolMode = self.__getEditorConfig("EOLMode", nodefault=True)
-fileEol = self.__textEdit.detectEolString(txt)
+if eolMode is None:
-self.__textEdit.setEolModeByEolString(fileEol)
+fileEol = self.__textEdit.detectEolString(txt)
+self.__textEdit.setEolModeByEolString(fileEol)
+else:
+self.__textEdit.convertEols(eolMode)
 self.__textEdit.setModified(False)
+self.setWindowModified(False)
 #######################################################################
 ## Methods implementing the interface to EditorConfig
 #######################################################################
 """
 if not fileName:
 fileName = self.__curFile
 self.__editorConfig = self.__loadEditorConfigObject(fileName)
+if fileName:
+self.__setTabAndIndent()
 def __loadEditorConfigObject(self, fileName):
 """
 Private method to load the EditorConfig properties for the given
 file name.
 value = QsciScintilla.EolMac
 else:
 value = None
 elif option == "DefaultEncoding":
 value = config["charset"]
+elif option == "InsertFinalNewline":
+value = Utilities.toBool(config["insert_final_newline"])
+elif option == "StripTrailingWhitespace":
+value = Utilities.toBool(config["trim_trailing_whitespace"])
+elif option == "TabWidth":
+value = int(config["tab_width"])
+elif option == "IndentWidth":
+value = config["indent_size"]
+if value == "tab":
+value = self.__getEditorConfig("TabWidth", config=config)
+else:
+value = int(value)
+elif option == "TabForIndentation":
+value = config["indent_style"] == "tab"
 except KeyError:
 value = None
 if value is None and not nodefault:
-# use Preferences in case of error
+# use Preferences as default in case of error
 value = Preferences.getEditor(option)
 return value

Mercurial Repositories > eric / file comparison

comparison: QScintilla/MiniEditor.py

QScintilla/MiniEditor.py