Revision: 5696 http://geany.svn.sourceforge.net/geany/?rev=5696&view=rev Author: colombanw Date: 2011-04-08 00:13:24 +0000 (Fri, 08 Apr 2011)
Log Message: ----------- Make hightlighting of triple-quoted verbatim an option
Backport from Scintilla HG (3602:5536ed81a85b).
Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/lexers/LexCPP.cxx
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-05 16:16:47 UTC (rev 5695) +++ trunk/ChangeLog 2011-04-08 00:13:24 UTC (rev 5696) @@ -1,3 +1,10 @@ +2011-04-08 Colomban Wendling <colomban(at)geany(dot)org> + + * scintilla/lexers/LexCPP.cxx: + Make hightlighting of triple-quoted verbatim an option (Backport + from Scintilla HG 3602:5536ed81a85b). + + 2011-04-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/templates.c:
Modified: trunk/scintilla/lexers/LexCPP.cxx =================================================================== --- trunk/scintilla/lexers/LexCPP.cxx 2011-04-05 16:16:47 UTC (rev 5695) +++ trunk/scintilla/lexers/LexCPP.cxx 2011-04-08 00:13:24 UTC (rev 5696) @@ -208,6 +208,7 @@ bool identifiersAllowDollars; bool trackPreprocessor; bool updatePreprocessor; + bool triplequotedStrings; bool fold; bool foldSyntaxBased; bool foldComment; @@ -224,6 +225,7 @@ identifiersAllowDollars = true; trackPreprocessor = true; updatePreprocessor = true; + triplequotedStrings = false; fold = false; foldSyntaxBased = true; foldComment = false; @@ -263,6 +265,9 @@ DefineProperty("lexer.cpp.update.preprocessor", &OptionsCPP::updatePreprocessor, "Set to 1 to update preprocessor definitions when #define found.");
+ DefineProperty("lexer.cpp.triplequoted.strings", &OptionsCPP::triplequotedStrings, + "Set to 1 to enable highlighting of triple-quoted strings."); + DefineProperty("fold", &OptionsCPP::fold);
DefineProperty("fold.cpp.syntax.based", &OptionsCPP::foldSyntaxBased, @@ -758,7 +763,7 @@ if (sc.Match('@', '"')) { sc.SetState(SCE_C_VERBATIM|activitySet); sc.Forward(); - } else if (sc.Match(""""")) { + } else if (options.triplequotedStrings && sc.Match(""""")) { sc.SetState(SCE_C_TRIPLEVERBATIM|activitySet); sc.Forward(2); } else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.