diff options
author | Pavel Sountsov <siege@google.com> | 2017-06-07 21:15:46 -0700 |
---|---|---|
committer | Pavel Sountsov <siege@google.com> | 2017-06-07 21:15:46 -0700 |
commit | ee5a2c0f618c5ace63c14323643aa56e8b890769 (patch) | |
tree | 83f3aff27fbbc531ef39cdf2f1ca4ffba0134a29 | |
parent | 647d9951a16f9557df77f3fabc7f671c8b1b5814 (diff) | |
download | scintilla-mirror-ee5a2c0f618c5ace63c14323643aa56e8b890769.tar.gz |
Bug [#1919]. Rust - Update integer suffixes.
-rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
-rw-r--r-- | lexers/LexRust.cxx | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 6c608bdfc..ea6ac5575 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -536,6 +536,10 @@ Support dropped for GTK+ versions before 2.24. </li> <li> + The Rust lexer recognizes 'usize' numeric literal suffixes. + <a href="http://sourceforge.net/p/scintilla/bugs/1919/">Bug #1919</a>. + </li> + <li> On Qt, mouse tracking is reenabled when the window is reshown. <a href="http://sourceforge.net/p/scintilla/bugs/1948/">Bug #1948</a>. </li> diff --git a/lexers/LexRust.cxx b/lexers/LexRust.cxx index 1f2b847d6..4f2c6617a 100644 --- a/lexers/LexRust.cxx +++ b/lexers/LexRust.cxx @@ -271,7 +271,7 @@ static void ScanNumber(Accessor& styler, Sci_Position& pos) { pos++; c = styler.SafeGetCharAt(pos, '\0'); n = styler.SafeGetCharAt(pos + 1, '\0'); - if (c == '8' || c == 's') { + if (c == '8') { pos++; } else if (c == '1' && n == '6') { pos += 2; @@ -279,6 +279,8 @@ static void ScanNumber(Accessor& styler, Sci_Position& pos) { pos += 2; } else if (c == '6' && n == '4') { pos += 2; + } else if (styler.Match(pos, "size")) { + pos += 4; } else { error = true; } |