eric: comparison QScintilla/Editor.py

-:a5b9f6a38faf
+:cbd34d558bd9
 # key:   marker handle
 # value: list of (warning message, warning type)
 self.notcoveredMarkers = []  # just a list of marker handles
 self.showingNotcoveredMarkers = False
+self.lexer_ = None
 self.__loadEditorConfig()
 self.condHistory = []
-self.lexer_ = None
 self.__lexerReset = False
 self.completer = None
 self.encoding = self.__getEditorConfig("DefaultEncoding")
 self.apiLanguage = ''
 self.lastModified = 0
 @keyparam encoding encoding to be used to read the file (string)
 (Note: this parameter overrides encoding detection)
 """
 QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+self.__loadEditorConfig(fileName=fn)
 try:
 if createIt and not os.path.exists(fn):
 f = open(fn, "w")
 f.close()
 if encoding == "":
 self.tr('<p>The file <b>{0}</b> could not be opened.</p>'
 '<p>Reason: {1}</p>')
 .format(fn, str(why)))
 QApplication.restoreOverrideCursor()
 raise
-fileEol = self.detectEolString(txt)
 modified = False
-# TODO: editorconfig: indent_style
-if (not Preferences.getEditor("TabForIndentation")) and \
+if (not self.__getEditorConfig("TabForIndentation")) and \
 Preferences.getEditor("ConvertTabsOnLoad") and \
 not (self.lexer_ and
 self.lexer_.alwaysKeepTabs()):
-txtExpanded = txt.expandtabs(Preferences.getEditor("TabWidth"))
+txtExpanded = txt.expandtabs(self.__getEditorConfig("TabWidth"))
 if txtExpanded != txt:
 modified = True
 txt = txtExpanded
-del txtExpanded
 self.setText(txt)
 # get eric specific flags
 self.__processFlags()
-# perform automatic eol conversion
+# perform automatic EOL conversion
-# TODO: editorconfig: end_of_line
 if self.__getEditorConfig("EOLMode", nodefault=True) or \
 Preferences.getEditor("AutomaticEOLConversion"):
 self.convertEols(self.eolMode())
 else:
+fileEol = self.detectEolString(txt)
 self.setEolModeByEolString(fileEol)
 self.extractTasks()
 QApplication.restoreOverrideCursor()
 @param fn filename to write to (string)
 @param backup flag indicating to save a backup (boolean)
 @return flag indicating success (boolean)
 """
-# TODO: editorconfig: apply end_of_line, trim_trailing_whitespace,
-#       insert_final_newline
 config = self.__loadEditorConfigObject(fn)
-# TODO: editorconfig: trim_trailing_whitespace
+eol = self.__getEditorConfig("EOLMode", nodefault=True, config=config)
-if Preferences.getEditor("StripTrailingWhitespace"):
+if eol is not None:
+self.convertEols(eol)
+if self.__getEditorConfig("StripTrailingWhitespace", config=config):
 self.__removeTrailingWhitespace()
 txt = self.text()
-# work around glitch in scintilla: always make sure,
-# that the last line is terminated properly
+if self.__getEditorConfig("InsertFinalNewline", config=config):
-# TODO: editorconfig: insert_final_newline
+eol = self.getLineSeparator()
-eol = self.getLineSeparator()
+if eol:
-if eol:
+if len(txt) >= len(eol):
-if len(txt) >= len(eol):
+if txt[-len(eol):] != eol:
-if txt[-len(eol):] != eol:
+txt += eol
+else:
 txt += eol
-else:
-txt += eol
 # create a backup file, if the option is set
 createBackup = backup and Preferences.getEditor("CreateBackupFile")
 if createBackup:
 if os.path.islink(fn):
 newName = fn
 # save to project, if a project is loaded
 if self.project.isOpen() and \
 self.project.startswithProjectPath(fn):
-# TODO: check against editorconfig
+editorConfigEol = self.__getEditorConfig(
-self.setEolModeByEolString(self.project.getEolString())
+"EOLMode", nodefault=True,
+config=self.__loadEditorConfigObject(fn))
+if editorConfigEol is not None:
+self.setEolMode(editorConfigEol)
+else:
+self.setEolModeByEolString(self.project.getEolString())
 self.convertEols(self.eolMode())
 else:
 fn = self.fileName
 self.__loadEditorConfig(fn)
 linenoMargin = Preferences.getEditor("LinenoMargin")
 if linenoMargin:
 self.setMarginWidth(
 self.__linenoMargin, '8' * (len(str(self.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: tab_width
+self.setTabWidth(self.__getEditorConfig("TabWidth"))
-self.setTabWidth(Preferences.getEditor("TabWidth"))
+self.setIndentationWidth(self.__getEditorConfig("IndentWidth"))
-# TODO: editorconfig: indent_size
-self.setIndentationWidth(Preferences.getEditor("IndentWidth"))
-# TODO: editorconfig: indent_style
 if self.lexer_ and self.lexer_.alwaysKeepTabs():
 self.setIndentationsUseTabs(True)
 else:
 self.setIndentationsUseTabs(
-Preferences.getEditor("TabForIndentation"))
+self.__getEditorConfig("TabForIndentation"))
+def __setTextDisplay(self):
+"""
+Private method to configure the text display.
+"""
+self.__setTabAndIndent()
 self.setTabIndents(Preferences.getEditor("TabIndents"))
 self.setBackspaceUnindents(Preferences.getEditor("TabIndents"))
 self.setIndentationGuides(Preferences.getEditor("IndentationGuides"))
 self.setIndentationGuidesBackgroundColor(
 Preferences.getEditorColour("IndentationGuidesBackground"))
 Private method to configure the eol mode of the editor.
 """
 if self.fileName and \
 self.project.isOpen() and \
 self.project.isProjectFile(self.fileName):
-# TODO: editorconfig: end_of_line
+eolMode = self.__getEditorConfig("EOLMode", nodefault=True)
-eolMode = self.__getEditorConfig("EOLMode")
 if eolMode is None:
-eolMode = self.project.getEolString()
+eolStr = self.project.getEolString()
-self.setEolModeByEolString(eolMode)
+self.setEolModeByEolString(eolStr)
+else:
+self.setEolMode(eolMode)
 else:
 eolMode = self.__getEditorConfig("EOLMode")
 eolMode = QsciScintilla.EolMode(eolMode)
 self.setEolMode(eolMode)
 self.__eolChanged()
 if self.spell:
 pwl, pel = self.project.getProjectDictionaries()
 self.__setSpellingLanguage(self.project.getProjectSpellLanguage(),
 pwl=pwl, pel=pel)
-self.setEolModeByEolString(self.project.getEolString())
+editorConfigEol = self.__getEditorConfig("EOLMode", nodefault=True)
+if editorConfigEol is not None:
+self.setEolMode(editorConfigEol)
+else:
+self.setEolModeByEolString(self.project.getEolString())
 self.convertEols(self.eolMode())
 def addedToProject(self):
 """
 Public method to signal, that this editor has been added to a project.
 self.__projectPropertiesChanged)
 except TypeError:
 pass
 #######################################################################
-## Spellchecking related methods
+## Spell checking related methods
 #######################################################################
 def __setSpellingLanguage(self, language, pwl="", pel=""):
 """
 Private slot to set the spell checking language.
 """
 if not fileName:
 fileName = self.fileName
 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
 value = Preferences.getEditor(option)
 return value
+def getEditorConfig(self, option):
+"""
+Public method to get the requested option via EditorConfig.
+@param option Preferences option key
+@type str
+@return value of requested setting
+@rtype any
+"""
+return self.__getEditorConfig(option)

Mercurial Repositories > eric / file comparison

comparison: QScintilla/Editor.py

QScintilla/Editor.py