Update Scintilla to [c818dc].

scintilla/doc/ScintillaHistory.html

@@ -450,6 +450,23 @@ <h3>
         Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
       </li>
     </ul>
+    <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite338.zip?download">Release 3.3.8</a>
+    </h3>
+    <ul>
+	<li>
+	Released 12 December 2013.
+	</li>
+	<li>
+	C++ lexer fixes bug where keyword followed immediately by quoted string continued
+	keyword style.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1564/">Bug #1564</a>.
+	</li>
+	<li>
+	Fix hotspot clicking where area was off by half a character width.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1562/">Bug #1562</a>.
+	</li>
+    </ul>
     <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite337.zip?download">Release 3.3.7</a>
     </h3>

scintilla/include/SciLexer.h

@@ -1569,7 +1569,6 @@
 #define SCE_COFFEESCRIPT_GLOBALCLASS 19
 #define SCE_COFFEESCRIPT_STRINGRAW 20
 #define SCE_COFFEESCRIPT_TRIPLEVERBATIM 21
-#define SCE_COFFEESCRIPT_HASHQUOTEDSTRING 22
 #define SCE_COFFEESCRIPT_COMMENTBLOCK 22
 #define SCE_COFFEESCRIPT_VERBOSE_REGEX 23
 #define SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT 24

scintilla/include/Scintilla.h

@@ -358,8 +358,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SC_PRINT_COLOURONWHITEDEFAULTBG 4
 #define SCI_SETPRINTCOLOURMODE 2148
 #define SCI_GETPRINTCOLOURMODE 2149
-#define SCFIND_WHOLEWORD 2
-#define SCFIND_MATCHCASE 4
+#define SCFIND_WHOLEWORD 0x2
+#define SCFIND_MATCHCASE 0x4
 #define SCFIND_WORDSTART 0x00100000
 #define SCFIND_REGEXP 0x00200000
 #define SCFIND_POSIX 0x00400000

scintilla/lexers/LexCPP.cxx

@@ -336,7 +336,7 @@ class LexerCPP : public ILexerWithSubStyles {
 	enum { ssIdentifier, ssDocKeyword };
 	SubStyles subStyles;
 public:
-	LexerCPP(bool caseSensitive_) :
+	explicit LexerCPP(bool caseSensitive_) :
 		caseSensitive(caseSensitive_),
 		setWord(CharacterSet::setAlphaNum, "._", 0x80, true),
 		setNegationOp(CharacterSet::setNone, "!"),
@@ -376,7 +376,7 @@ class LexerCPP : public ILexerWithSubStyles {
 
 	int SCI_METHOD LineEndTypesSupported() {
 		return SC_LINE_END_TYPE_UNICODE;
-	};
+	}
 
 	int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) {
 		return subStyles.Allocate(styleBase, numberStyles);
@@ -485,7 +485,7 @@ int SCI_METHOD LexerCPP::WordListSet(int n, const char *wl) {
 // Functor used to truncate history
 struct After {
 	int line;
-	After(int line_) : line(line_) {}
+	explicit After(int line_) : line(line_) {}
 	bool operator()(PPDefinition &p) const {
 		return p.line > line;
 	}
@@ -683,6 +683,8 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
 								sc.ChangeState((raw ? SCE_C_STRINGRAW : SCE_C_STRING)|activitySet);
 							else
 								sc.ChangeState(SCE_C_CHARACTER|activitySet);
+						} else {
+							sc.SetState(SCE_C_DEFAULT | activitySet);
 						}
 					} else {
 						sc.SetState(SCE_C_DEFAULT|activitySet);

scintilla/lexers/LexCoffeeScript.cxx

@@ -397,7 +397,7 @@ static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int init
 					sc.SetState(SCE_COFFEESCRIPT_COMMENTBLOCK);
 					sc.Forward();
 					sc.Forward();
-					
+
 				} else {
 					sc.SetState(SCE_COFFEESCRIPT_COMMENTLINE);
 				}

scintilla/lexers/LexHTML.cxx

@@ -339,9 +339,9 @@ static void classifyWordHTJS(unsigned int start, unsigned int end,
 static int classifyWordHTVB(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, script_mode inScriptType) {
 	char chAttr = SCE_HB_IDENTIFIER;
 	bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.');
-	if (wordIsNumber)
+	if (wordIsNumber) {
 		chAttr = SCE_HB_NUMBER;
-	else {
+	} else {
 		char s[100];
 		GetTextSegment(styler, start, end, s, sizeof(s));
 		if (keywords.InList(s)) {
@@ -385,9 +385,9 @@ static void classifyWordHTPy(unsigned int start, unsigned int end, WordList &key
 static void classifyWordHTPHP(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {
 	char chAttr = SCE_HPHP_DEFAULT;
 	bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.' && start+1 <= end && IsADigit(styler[start+1]));
-	if (wordIsNumber)
+	if (wordIsNumber) {
 		chAttr = SCE_HPHP_NUMBER;
-	else {
+	} else {
 		char s[100];
 		GetTextSegment(styler, start, end, s, sizeof(s));
 		if (keywords.InList(s))
@@ -823,14 +823,14 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 		if (isMako && ch == '#' && chNext == '#') {
 			makoComment = 1;
 		}
-		
+
 		// handle end of Mako comment line
 		else if (isMako && makoComment && (ch == '\r' || ch == '\n')) {
 			makoComment = 0;
 			styler.ColourTo(i, SCE_HP_COMMENTLINE);
 			state = SCE_HP_DEFAULT;
 		}
-		
+
 		// Allow falling through to mako handling code if newline is going to end a block
 		if (((ch == '\r' && chNext != '\n') || (ch == '\n')) &&
 			(!isMako || (0 != strcmp(makoBlockType, "%")))) {

scintilla/lexers/LexOthers.cxx

@@ -1037,8 +1037,9 @@ static int RecogniseErrorListLine(const char *lineBuffer, unsigned int lengthLin
 						!CompareCaseInsensitive(word, "fatal") || !CompareCaseInsensitive(word, "catastrophic") ||
 						!CompareCaseInsensitive(word, "note") || !CompareCaseInsensitive(word, "remark")) {
 						state = stMsVc;
-					} else
+					} else {
 						state = stUnrecognized;
+					}
 				} else {
 					state = stUnrecognized;
 				}

scintilla/lexers/LexPerl.cxx

@@ -1185,7 +1185,7 @@ void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle,
 				}
 				switch (HereDoc.Quote) {
 				case '\'':
-					st_new = SCE_PL_HERE_Q ;
+					st_new = SCE_PL_HERE_Q;
 					break;
 				case '"' :
 					st_new = SCE_PL_HERE_QQ;

scintilla/lexers/LexSQL.cxx

@@ -643,7 +643,7 @@ void SCI_METHOD LexerSQL::Fold(unsigned int startPos, int length, int initStyle,
 			break;
 		}
 	}
-	
+
 	int levelNext = levelCurrent;
 	char chNext = styler[startPos];
 	int styleNext = styler.StyleAt(startPos);

scintilla/lexlib/Accessor.h

@@ -12,7 +12,7 @@
 namespace Scintilla {
 #endif
 
-enum { wsSpace = 1, wsTab = 2, wsSpaceTab = 4, wsInconsistent=8};
+enum { wsSpace=1, wsTab=2, wsSpaceTab=4, wsInconsistent=8 };
 
 class Accessor;
 class WordList;

scintilla/lexlib/LexAccessor.h

@@ -53,13 +53,13 @@ class LexAccessor {
 	}
 
 public:
-	LexAccessor(IDocument *pAccess_) :
+	explicit LexAccessor(IDocument *pAccess_) :
 		pAccess(pAccess_), startPos(extremePosition), endPos(0),
-		codePage(pAccess->CodePage()), 
+		codePage(pAccess->CodePage()),
 		encodingType(enc8bit),
 		lenDoc(pAccess->Length()),
 		mask(127), validLen(0), chFlags(0), chWhile(0),
-		startSeg(0), startPosStyling(0), 
+		startSeg(0), startPosStyling(0),
 		documentVersion(pAccess->Version()) {
 		switch (codePage) {
 		case 65001:

scintilla/lexlib/LexerModule.cxx

@@ -79,7 +79,7 @@ const char *LexerModule::GetWordListDescription(int index) const {
 		return "";
 	} else {
 		return wordListDescriptions[index];
- 	}
+	}
 }
 
 int LexerModule::GetStyleBitsNeeded() const {

scintilla/lexlib/LexerSimple.h

@@ -17,7 +17,7 @@ class LexerSimple : public LexerBase {
 	const LexerModule *module;
 	std::string wordLists;
 public:
-	LexerSimple(const LexerModule *module_);
+	explicit LexerSimple(const LexerModule *module_);
 	const char * SCI_METHOD DescribeWordListSets();
 	void SCI_METHOD Lex(unsigned int startPos, int lengthDoc, int initStyle, IDocument *pAccess);
 	void SCI_METHOD Fold(unsigned int startPos, int lengthDoc, int initStyle, IDocument *pAccess);

scintilla/lexlib/PropSetSimple.cxx

@@ -61,7 +61,7 @@ void PropSetSimple::Set(const char *keyVal) {
 		endVal++;
 	const char *eqAt = strchr(keyVal, '=');
 	if (eqAt) {
-		Set(keyVal, eqAt + 1, static_cast<int>(eqAt-keyVal), 
+		Set(keyVal, eqAt + 1, static_cast<int>(eqAt-keyVal),
 			static_cast<int>(endVal - eqAt - 1));
 	} else if (*keyVal) {	// No '=' so assume '=1'
 		Set(keyVal, "1", static_cast<int>(endVal-keyVal), 1);

scintilla/lexlib/SparseState.h

@@ -38,7 +38,7 @@ class SparseState {
 	}
 
 public:
-	SparseState(int positionFirst_=-1) {
+	explicit SparseState(int positionFirst_=-1) {
 		positionFirst = positionFirst_;
 	}
 	void Set(int position, T value) {

scintilla/lexlib/StyleContext.h

@@ -28,7 +28,7 @@ class StyleContext {
 	IDocumentWithLineEnd *multiByteAccess;
 	unsigned int endPos;
 	unsigned int lengthDocument;
-	
+
 	// Used for optimizing GetRelativeCharacter
 	unsigned int posRelative;
 	unsigned int currentPosLastRelative;
@@ -43,7 +43,7 @@ class StyleContext {
 			chNext = static_cast<unsigned char>(styler.SafeGetCharAt(currentPos+width, 0));
 			widthNext = 1;
 		}
-		// End of line determined from line end position, allowing CR, LF, 
+		// End of line determined from line end position, allowing CR, LF,
 		// CRLF and Unicode line ends as set by document.
 		if (currentLine < lineDocEnd)
 			atLineEnd = static_cast<int>(currentPos) >= (lineStartNext-1);

scintilla/lexlib/SubStyles.h

@@ -20,7 +20,7 @@ class WordClassifier {
 
 public:
 
-	WordClassifier(int baseStyle_) : baseStyle(baseStyle_), firstStyle(0), lenStyles(0) {
+	explicit WordClassifier(int baseStyle_) : baseStyle(baseStyle_), firstStyle(0), lenStyles(0) {
 	}
 
 	void Allocate(int firstStyle_, int lenStyles_) {

scintilla/lexlib/WordList.cxx

@@ -70,7 +70,7 @@ WordList::WordList(bool onlyLineEnds_) :
 	words(0), list(0), len(0), onlyLineEnds(onlyLineEnds_) {
 }
 
-WordList::~WordList() { 
+WordList::~WordList() {
 	Clear();
 }
 

scintilla/lexlib/WordList.h

@@ -22,7 +22,7 @@ class WordList {
 	bool onlyLineEnds;	///< Delimited by any white space or only line ends
 	int starts[256];
 public:
-	WordList(bool onlyLineEnds_ = false);
+	explicit WordList(bool onlyLineEnds_ = false);
 	~WordList();
 	operator bool() const;
 	bool operator!=(const WordList &other) const;

scintilla/src/AutoComplete.h

@@ -71,7 +71,7 @@ class AutoComplete {
 
 	/// The list string contains a sequence of words separated by the separator character
 	void SetList(const char *list);
-	
+
 	/// Return the position of the currently selected list item
 	int GetSelection() const;
 

scintilla/src/CaseConvert.cxx

@@ -510,7 +510,7 @@ void SetupConversions(enum CaseConversion conversion) {
 		int upper = symmetricCaseConversionRanges[i++];
 		int length = symmetricCaseConversionRanges[i++];
 		int pitch = symmetricCaseConversionRanges[i++];
-		for (int j=0;j<length*pitch;j+=pitch) {
+		for (int j=0; j<length*pitch; j+=pitch) {
 			AddSymmetric(conversion, lower+j, upper+j);
 		}
 	}

scintilla/src/CellBuffer.h

@@ -17,8 +17,8 @@ class PerLine {
 public:
 	virtual ~PerLine() {}
 	virtual void Init()=0;
-	virtual void InsertLine(int)=0;
-	virtual void RemoveLine(int)=0;
+	virtual void InsertLine(int line)=0;
+	virtual void RemoveLine(int line)=0;
 };
 
 /**

scintilla/src/Decoration.h

@@ -17,7 +17,7 @@ class Decoration {
 	RunStyles rs;
 	int indicator;
 
-	Decoration(int indicator_);
+	explicit Decoration(int indicator_);
 	~Decoration();
 
 	bool Empty() const;

scintilla/src/Document.cxx

@@ -955,7 +955,7 @@ bool Document::InsertString(int position, const char *s, int insertLength) {
 int SCI_METHOD Document::AddData(char *data, int length) {
 	try {
 		int position = Length();
-		InsertString(position,data, length);
+		InsertString(position, data, length);
 	} catch (std::bad_alloc &) {
 		return SC_STATUS_BADALLOC;
 	} catch (...) {
@@ -1892,7 +1892,7 @@ void SCI_METHOD Document::DecorationFillRange(int position, int value, int fillL
 
 bool Document::AddWatcher(DocWatcher *watcher, void *userData) {
 	WatcherWithUserData wwud(watcher, userData);
-	std::vector<WatcherWithUserData>::iterator it = 
+	std::vector<WatcherWithUserData>::iterator it =
 		std::find(watchers.begin(), watchers.end(), wwud);
 	if (it != watchers.end())
 		return false;
@@ -1901,7 +1901,7 @@ bool Document::AddWatcher(DocWatcher *watcher, void *userData) {
 }
 
 bool Document::RemoveWatcher(DocWatcher *watcher, void *userData) {
-	std::vector<WatcherWithUserData>::iterator it = 
+	std::vector<WatcherWithUserData>::iterator it =
 		std::find(watchers.begin(), watchers.end(), WatcherWithUserData(watcher, userData));
 	if (it != watchers.end()) {
 		watchers.erase(it);
@@ -2103,7 +2103,7 @@ int Document::BraceMatch(int position, int /*maxReStyle*/) {
  */
 class BuiltinRegex : public RegexSearchBase {
 public:
-	BuiltinRegex(CharClassify *charClassTable) : search(charClassTable) {}
+	explicit BuiltinRegex(CharClassify *charClassTable) : search(charClassTable) {}
 
 	virtual ~BuiltinRegex() {
 	}

scintilla/src/Document.h

@@ -32,7 +32,7 @@ class Range {
 	Position start;
 	Position end;
 
-	Range(Position pos=0) :
+	explicit Range(Position pos=0) :
 		start(pos), end(pos) {
 	}
 	Range(Position start_, Position end_) :
@@ -165,7 +165,7 @@ class LexInterface {
 	ILexer *instance;
 	bool performingStyle;	///< Prevent reentrance
 public:
-	LexInterface(Document *pdoc_) : pdoc(pdoc_), instance(0), performingStyle(false) {
+	explicit LexInterface(Document *pdoc_) : pdoc(pdoc_), instance(0), performingStyle(false) {
 	}
 	virtual ~LexInterface() {
 	}
@@ -443,12 +443,12 @@ class UndoGroup {
  */
 class DocModification {
 public:
-  	int modificationType;
+	int modificationType;
 	int position;
- 	int length;
- 	int linesAdded;	/**< Negative if lines deleted. */
- 	const char *text;	/**< Only valid for changes to text, not for changes to style. */
- 	int line;
+	int length;
+	int linesAdded;	/**< Negative if lines deleted. */
+	const char *text;	/**< Only valid for changes to text, not for changes to style. */
+	int line;
 	int foldLevelNow;
 	int foldLevelPrev;
 	int annotationLinesAdded;