C++: Take multiline strings into account when preprocessing

It was creating extra line(s)...

Change-Id: If28a9ccf16195c71747479db838a5589ea6683a0
Reviewed-by: Roberto Raggi <[email protected]>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 303205408ae..45cf36f5882 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -1137,9 +1137,9 @@ void Preprocessor::trackExpansionCycles(PPToken *tk)
     }
 }
 
-static void adjustForCommentNewlines(unsigned *currentLine, const PPToken &tk)
+static void adjustForCommentOrStringNewlines(unsigned *currentLine, const PPToken &tk)
 {
-    if (tk.is(T_COMMENT) || tk.is(T_DOXY_COMMENT))
+    if (tk.is(T_COMMENT) || tk.is(T_DOXY_COMMENT) || tk.isStringLiteral())
         (*currentLine) += tk.asByteArrayRef().count('\n');
 }
 
@@ -1147,7 +1147,7 @@ void Preprocessor::synchronizeOutputLines(const PPToken &tk, bool forceLine)
 {
     if (m_state.m_expansionStatus != NotExpanding
             || (!forceLine && m_env->currentLine == tk.lineno)) {
-        adjustForCommentNewlines(&m_env->currentLine, tk);
+        adjustForCommentOrStringNewlines(&m_env->currentLine, tk);
         return;
     }
 
@@ -1164,7 +1164,7 @@ void Preprocessor::synchronizeOutputLines(const PPToken &tk, bool forceLine)
     }
 
     m_env->currentLine = tk.lineno;
-    adjustForCommentNewlines(&m_env->currentLine, tk);
+    adjustForCommentOrStringNewlines(&m_env->currentLine, tk);
 }
 
 void Preprocessor::removeTrailingOutputLines()