From 4a760c2f7d5263b030b1da845a4622244011e42d Mon Sep 17 00:00:00 2001
From: ActiveState <unknown>
Date: Sat, 23 Apr 2016 09:19:39 +1000
Subject: Fix a bug with multi-line strings with line continuation where the
 string style overflowed after an edit.

---
 doc/ScintillaHistory.html | 4 ++++
 lexers/LexCPP.cxx         | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index b31856873..4ad9fdf22 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -511,6 +511,10 @@
 	<a href="http://sourceforge.net/p/scintilla/feature-requests/1140/">Feature #1140.</a>
 	</li>
 	<li>
+	The C++ lexer fixes a bug with multi-line strings with line continuation where the string style
+	overflowed after an edit.
+	</li>
+	<li>
 	The Python lexer treats '@' as an operator except when it is the first visible character on a line.
 	This is for Python 3.5.
 	</li>
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index 76190002a..4261084d4 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -761,6 +761,9 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 				lineCurrent++;
 				lineEndNext = styler.LineEnd(lineCurrent);
 				vlls.Add(lineCurrent, preproc);
+				if (rawStringTerminator != "") {
+					rawSTNew.Set(lineCurrent-1, rawStringTerminator);
+				}
 				sc.Forward();
 				if (sc.ch == '\r' && sc.chNext == '\n') {
 					// Even in UTF-8, \r and \n are separate
-- 
cgit v1.2.3