Mercurial Repositories > eric / file comparison
comparison: eric6/QScintilla/Editor.py
eric6/QScintilla/Editor.py
- changeset 7293
- 4738aac944e6
- parent 7278
- 1820a0344b62
- child 7306
- 7cb88e04e4c0
equal
deleted
inserted
replaced
| 7292:06c5b767b010 | 7293:4738aac944e6 |
|---|---|
| 200 # value: list of (warning message, warning type) | 200 # value: list of (warning message, warning type) |
| 201 self.notcoveredMarkers = [] # just a list of marker handles | 201 self.notcoveredMarkers = [] # just a list of marker handles |
| 202 self.showingNotcoveredMarkers = False | 202 self.showingNotcoveredMarkers = False |
| 203 | 203 |
| 204 self.lexer_ = None | 204 self.lexer_ = None |
| 205 self.apiLanguage = '' | |
| 205 | 206 |
| 206 self.__loadEditorConfig() | 207 self.__loadEditorConfig() |
| 207 | 208 |
| 208 self.condHistory = [] | 209 self.condHistory = [] |
| 209 self.__lexerReset = False | 210 self.__lexerReset = False |
| 210 self.completer = None | 211 self.completer = None |
| 211 self.encoding = self.__getEditorConfig("DefaultEncoding") | 212 self.encoding = self.__getEditorConfig("DefaultEncoding") |
| 212 self.apiLanguage = '' | |
| 213 self.lastModified = 0 | 213 self.lastModified = 0 |
| 214 self.line = -1 | 214 self.line = -1 |
| 215 self.inReopenPrompt = False | 215 self.inReopenPrompt = False |
| 216 # true if the prompt to reload a changed source is present | 216 # true if the prompt to reload a changed source is present |
| 217 self.inFileRenamed = False | 217 self.inFileRenamed = False |
| 8426 @return override value; None in case nothing is defined | 8426 @return override value; None in case nothing is defined |
| 8427 @rtype any | 8427 @rtype any |
| 8428 """ | 8428 """ |
| 8429 if option in ("TabWidth", "IndentWidth"): | 8429 if option in ("TabWidth", "IndentWidth"): |
| 8430 overrides = Preferences.getEditor("TabIndentOverride") | 8430 overrides = Preferences.getEditor("TabIndentOverride") |
| 8431 if self.filetype in overrides: | 8431 language = self.filetype or self.apiLanguage |
| 8432 if language in overrides: | |
| 8432 if option == "TabWidth": | 8433 if option == "TabWidth": |
| 8433 return overrides[self.filetype][0] | 8434 return overrides[language][0] |
| 8434 elif option == "IndentWidth": | 8435 elif option == "IndentWidth": |
| 8435 return overrides[self.filetype][1] | 8436 return overrides[language][1] |
| 8436 | 8437 |
| 8437 return None | 8438 return None |
| 8438 | 8439 |
| 8439 def mouseDoubleClickEvent(self, evt): | 8440 def mouseDoubleClickEvent(self, evt): |
| 8440 """ | 8441 """ |
