Mercurial Repositories > eric / file comparison
comparison: QScintilla/Editor.py
QScintilla/Editor.py
- branch
- 6_0_x
- changeset 4228
- 5c7842cbe108
- parent 4203
- d18603cecdaa
- child 4377
- 4bae1fa50c68
equal
deleted
inserted
replaced
| 4226:ebb5b03f0d30 | 4228:5c7842cbe108 |
|---|---|
| 1498 if self.lexer_ is not None and \ | 1498 if self.lexer_ is not None and \ |
| 1499 (self.lexer_.lexer() == "container" or self.lexer_.lexer() is None): | 1499 (self.lexer_.lexer() == "container" or self.lexer_.lexer() is None): |
| 1500 self.SCN_STYLENEEDED.disconnect(self.__styleNeeded) | 1500 self.SCN_STYLENEEDED.disconnect(self.__styleNeeded) |
| 1501 | 1501 |
| 1502 language = "" | 1502 language = "" |
| 1503 basename = os.path.basename(filename) | |
| 1504 if not self.filetype: | 1503 if not self.filetype: |
| 1505 if self.project.isOpen() and self.project.isProjectFile(filename): | 1504 if filename: |
| 1506 language = self.project.getEditorLexerAssoc(basename) | 1505 basename = os.path.basename(filename) |
| 1507 if not language: | 1506 if self.project.isOpen() and \ |
| 1508 language = Preferences.getEditorLexerAssoc(basename) | 1507 self.project.isProjectFile(filename): |
| 1508 language = self.project.getEditorLexerAssoc(basename) | |
| 1509 if not language: | |
| 1510 language = Preferences.getEditorLexerAssoc(basename) | |
| 1509 if not language: | 1511 if not language: |
| 1510 bindName = self.__bindName(self.text(0)) | 1512 bindName = self.__bindName(self.text(0)) |
| 1511 if bindName: | 1513 if bindName: |
| 1512 language = Preferences.getEditorLexerAssoc(bindName) | 1514 language = Preferences.getEditorLexerAssoc(bindName) |
| 1513 if language == "Python": | 1515 if language == "Python": |
| 3907 self.lexer_.initProperties() | 3909 self.lexer_.initProperties() |
| 3908 | 3910 |
| 3909 self.lexer_.setDefaultColor(self.lexer_.color(0)) | 3911 self.lexer_.setDefaultColor(self.lexer_.color(0)) |
| 3910 self.lexer_.setDefaultPaper(self.lexer_.paper(0)) | 3912 self.lexer_.setDefaultPaper(self.lexer_.paper(0)) |
| 3911 | 3913 |
| 3914 self.__bindLexer(self.fileName) | |
| 3915 self.recolor() | |
| 3916 | |
| 3912 # read the typing completer settings | 3917 # read the typing completer settings |
| 3913 if self.completer is not None: | 3918 if self.completer is not None: |
| 3914 self.completer.readSettings() | 3919 self.completer.readSettings() |
| 3915 | 3920 |
| 3916 # set the margins layout | 3921 # set the margins layout |
