From 018dcc6af877b8b237e060fb24fb2370440cee1f Mon Sep 17 00:00:00 2001 From: uid22944 Date: Thu, 5 Jul 2001 01:19:33 +0000 Subject: Ensured PHP operator style does not continue over whitespace. --- src/LexHTML.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/LexHTML.cxx') diff --git a/src/LexHTML.cxx b/src/LexHTML.cxx index 847c690cb..ac4f85c0d 100644 --- a/src/LexHTML.cxx +++ b/src/LexHTML.cxx @@ -726,10 +726,10 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty case SCE_H_ATTRIBUTE: if (!ishtmlwordchar(ch) && ch != '/' && ch != '-') { if (inScriptType == eNonHtmlScript) { - int scriptLanguagePrev = scriptLanguage; + int scriptLanguagePrev = scriptLanguage; scriptLanguage = segIsScriptingIndicator(styler, styler.GetStartSegment(), i - 1, scriptLanguage); - if ((scriptLanguagePrev != scriptLanguage) && (scriptLanguage == eScriptNone)) - inScriptType = eHtml; + if ((scriptLanguagePrev != scriptLanguage) && (scriptLanguage == eScriptNone)) + inScriptType = eHtml; } classifyAttribHTML(styler.GetStartSegment(), i - 1, keywords, styler); if (ch == '>') { @@ -1272,6 +1272,8 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty state = SCE_HPHP_VARIABLE; } else if (isoperator(ch)) { state = SCE_HPHP_OPERATOR; + } else if ((state == SCE_HPHP_OPERATOR) && (isspacechar(ch))) { + state = SCE_HPHP_DEFAULT; } break; ///////////// end - PHP state handling -- cgit v1.2.3