Mercurial Repositories > eric / file comparison
comparison: eric7/QScintilla/Editor.py
eric7/QScintilla/Editor.py
- branch
- eric7
- changeset 8507
- 2a22d0880d21
- parent 8506
- c64ee71cf27b
- child 8515
- 7e7bebfb21e8
equal
deleted
inserted
replaced
| 8506:c64ee71cf27b | 8507:2a22d0880d21 |
|---|---|
| 1086 menu = QMenu(self.tr("Languages")) | 1086 menu = QMenu(self.tr("Languages")) |
| 1087 | 1087 |
| 1088 self.languagesActGrp = QActionGroup(self) | 1088 self.languagesActGrp = QActionGroup(self) |
| 1089 self.noLanguageAct = menu.addAction( | 1089 self.noLanguageAct = menu.addAction( |
| 1090 UI.PixmapCache.getIcon("fileText"), | 1090 UI.PixmapCache.getIcon("fileText"), |
| 1091 self.tr("No Language")) | 1091 self.tr("Text")) |
| 1092 self.noLanguageAct.setCheckable(True) | 1092 self.noLanguageAct.setCheckable(True) |
| 1093 self.noLanguageAct.setData("None") | 1093 self.noLanguageAct.setData("None") |
| 1094 self.languagesActGrp.addAction(self.noLanguageAct) | 1094 self.languagesActGrp.addAction(self.noLanguageAct) |
| 1095 menu.addSeparator() | 1095 menu.addSeparator() |
| 1096 | 1096 |
| 1536 if ( | 1536 if ( |
| 1537 self.lexer_ is not None and | 1537 self.lexer_ is not None and |
| 1538 (self.lexer_.lexer() == "container" or | 1538 (self.lexer_.lexer() == "container" or |
| 1539 self.lexer_.lexer() is None) | 1539 self.lexer_.lexer() is None) |
| 1540 ): | 1540 ): |
| 1541 self.SCN_STYLENEEDED.disconnect(self.__styleNeeded) | 1541 with contextlib.suppress(TypeError): |
| 1542 self.SCN_STYLENEEDED.disconnect(self.__styleNeeded) | |
| 1542 | 1543 |
| 1543 self.apiLanguage = "" | 1544 self.apiLanguage = "" |
| 1544 self.lexer_ = None | 1545 self.lexer_ = None |
| 1545 self.__lexerReset = True | 1546 self.__lexerReset = True |
| 1546 self.setLexer() | 1547 self.setLexer() |
| 1549 self.completer = None | 1550 self.completer = None |
| 1550 useMonospaced = self.useMonospaced | 1551 useMonospaced = self.useMonospaced |
| 1551 self.__setTextDisplay() | 1552 self.__setTextDisplay() |
| 1552 self.__setMarginsDisplay() | 1553 self.__setMarginsDisplay() |
| 1553 self.setMonospaced(useMonospaced) | 1554 self.setMonospaced(useMonospaced) |
| 1554 self.menuActs["MonospacedFont"].setChecked(self.useMonospaced) | 1555 with contextlib.suppress(AttributeError): |
| 1556 self.menuActs["MonospacedFont"].setChecked(self.useMonospaced) | |
| 1555 | 1557 |
| 1556 self.__docstringGenerator = None | 1558 self.__docstringGenerator = None |
| 1557 | 1559 |
| 1558 if not self.inLanguageChanged and propagate: | 1560 if not self.inLanguageChanged and propagate: |
| 1559 self.inLanguageChanged = True | 1561 self.inLanguageChanged = True |
| 1778 self.project.isProjectFile(filename) | 1780 self.project.isProjectFile(filename) |
| 1779 ): | 1781 ): |
| 1780 language = self.project.getEditorLexerAssoc(basename) | 1782 language = self.project.getEditorLexerAssoc(basename) |
| 1781 if not language: | 1783 if not language: |
| 1782 language = Preferences.getEditorLexerAssoc(basename) | 1784 language = Preferences.getEditorLexerAssoc(basename) |
| 1785 if language == "Text": | |
| 1786 # no highlighting for plain text files | |
| 1787 self.__resetLanguage() | |
| 1788 return | |
| 1789 | |
| 1783 if not language: | 1790 if not language: |
| 1784 bindName = self.__bindName(self.text(0)) | 1791 bindName = self.__bindName(self.text(0)) |
| 1785 if bindName: | 1792 if bindName: |
| 1786 language = Preferences.getEditorLexerAssoc(bindName) | 1793 language = Preferences.getEditorLexerAssoc(bindName) |
| 1787 if language == "Python": | 1794 if language == "Python": |
