diff options
| -rw-r--r-- | src/ScintillaBase.cxx | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index 8cf5b5a2c..c69db0016 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -535,10 +535,7 @@ void ScintillaBase::RightButtonDownWithModifiers(Point pt, unsigned int curTime, namespace Scintilla { class LexState : public LexInterface { - int interfaceVersion; public: - int lexLanguage; - explicit LexState(Document *pdoc_); void SetInstance(ILexer5 *instance_); // Deleted so LexState objects can not be copied. @@ -580,9 +577,6 @@ public: } LexState::LexState(Document *pdoc_) : LexInterface(pdoc_) { - performingStyle = false; - interfaceVersion = lvRelease4; - lexLanguage = 0; } LexState::~LexState() { @@ -627,24 +621,20 @@ void LexState::SetWordList(int n, const char *wl) { int LexState::GetIdentifier() const { if (instance) { - if (instance->Version() >= lvRelease5) { - return instance->GetIdentifier(); - } + return instance->GetIdentifier(); } return 0; } const char *LexState::GetName() const { if (instance) { - if (instance->Version() >= lvRelease5) { - return instance->GetName(); - } + return instance->GetName(); } return ""; } void *LexState::PrivateCall(int operation, void *pointer) { - if (pdoc && instance) { + if (instance) { return instance->PrivateCall(operation, pointer); } else { return nullptr; @@ -817,7 +807,7 @@ const char *LexState::DescriptionOfStyle(int style) { } void ScintillaBase::NotifyStyleToNeeded(Sci::Position endStyleNeeded) { - if (DocumentLexState()->GetIdentifier() != 0) { + if (!DocumentLexState()->UseContainerLexing()) { const Sci::Line lineEndStyled = pdoc->SciLineFromPosition(pdoc->GetEndStyled()); const Sci::Position endStyled = @@ -1035,7 +1025,7 @@ sptr_t ScintillaBase::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lPara return 0; case SCI_COLOURISE: - if (DocumentLexState()->lexLanguage == 0) { + if (DocumentLexState()->UseContainerLexing()) { pdoc->ModifiedAt(static_cast<Sci::Position>(wParam)); NotifyStyleToNeeded((lParam == -1) ? pdoc->Length() : lParam); } else { |