diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-03-05 16:20:30 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-03-05 16:20:30 +1100 |
| commit | 5607148ff787a9bc5ac3f08bbf935f18d89df442 (patch) | |
| tree | 8ee798a7ca713eff6a6e49afd5f9fc91c72b63c2 | |
| parent | 26537cf9042a01e80b1b6fa750cfb2ecdc46804b (diff) | |
| download | scintilla-mirror-5607148ff787a9bc5ac3f08bbf935f18d89df442.tar.gz | |
Bug [#1999]. Fix hang lexing a Lua label where the range ends before "::".
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | lexlib/StyleContext.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 108b6904c..85beb83f3 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -540,6 +540,10 @@ Released 12 February 2018. </li> <li> + Fix hang in Lua lexer when lexing a label upto the terminating "::". + <a href="http://sourceforge.net/p/scintilla/bugs/1999/">Bug #1999</a>. + </li> + <li> For rectangular selections, pressing Home or End now moves the caret to the Home or End position instead of the limit of the rectangular selection. </li> diff --git a/lexlib/StyleContext.h b/lexlib/StyleContext.h index a76f7f417..1d40825f4 100644 --- a/lexlib/StyleContext.h +++ b/lexlib/StyleContext.h @@ -131,7 +131,12 @@ public: void ForwardBytes(Sci_Position nb) { const Sci_PositionU forwardPos = currentPos + nb; while (forwardPos > currentPos) { + const Sci_PositionU currentPosStart = currentPos; Forward(); + if (currentPos == currentPosStart) { + // Reached end + return; + } } } void ChangeState(int state_) { |