From 93a81323b2a10918e6bf01ca1b3329c27764900c Mon Sep 17 00:00:00 2001
From: Jerome St-Louis <jerome@ecere.com>
Date: Sat, 19 Oct 2013 19:24:53 -0400
Subject: [PATCH] ecere/controls/EditBox: (#1032) Fixed syntax Highlighting
 issue with bad nested multi-line comments

---
 ecere/src/gui/controls/EditBox.ec | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/ecere/src/gui/controls/EditBox.ec b/ecere/src/gui/controls/EditBox.ec
index 46818b3..1fb5337 100644
--- a/ecere/src/gui/controls/EditBox.ec
+++ b/ecere/src/gui/controls/EditBox.ec
@@ -99,7 +99,7 @@ class EditBoxBits
    bool noCaret:1, noSelect:1, tabKey:1, useTab:1, tabSel:1, allCaps:1, syntax:1, wrap:1;
 
    // Syntax States
-   bool inMultiLineComment:1, inPrep:1, escaped:1, continuedSingleLineComment:1;
+   bool inMultiLineComment:1, inPrep:1, escaped:1, continuedSingleLineComment:1, wasInMultiLine:1;
 
    bool recomputeSyntax:1;
    bool cursorFollowsView:1;
@@ -1294,6 +1294,7 @@ private:
       if(style.syntax)
       {
          bool inMultiLineComment = reset ? false : style.inMultiLineComment;
+         bool wasInMultiLine = reset ? false : style.wasInMultiLine;
          bool inString = false;
          bool inQuotes = false;
          bool inPrep = reset ? false : style.inPrep;
@@ -1322,8 +1323,10 @@ private:
             {
                bool wasEscaped = escaped;
                bool backLastWasStar = lastWasStar;
+               bool backWasInMultiLine = wasInMultiLine;
                escaped = false;
                lastWasStar = false;
+               wasInMultiLine = inMultiLineComment;
                if(ch == '/')
                {
                   if(!inSingleLineComment && !inMultiLineComment && !inQuotes && !inString)
@@ -1342,7 +1345,7 @@ private:
                }
                else if(ch == '*')
                {
-                  if(!c || text[c-1] != '/') lastWasStar = true;
+                  if(backWasInMultiLine) lastWasStar = true;
                }
                else if(ch == '\"' && !inSingleLineComment && !inMultiLineComment && !inQuotes)
                {
@@ -1384,6 +1387,7 @@ private:
          
          style.continuedSingleLineComment = continuedSingleLineComment;
          style.inMultiLineComment = inMultiLineComment;
+         style.wasInMultiLine = wasInMultiLine;
          style.inPrep = inPrep;
          style.escaped = escaped;
       }
@@ -1447,6 +1451,7 @@ private:
       bool inSingleLineComment = false;
       bool escaped = style.escaped;
       bool continuedSingleLineComment = style.continuedSingleLineComment;
+      bool wasInMultiLine = false;
       // ****** ************* ******
 
       if(!isEnabled)
@@ -1643,6 +1648,7 @@ private:
                      bool backInQuotes = inQuotes;
                      bool backInPrep = inPrep;
                      bool backInSingleLineComment = inSingleLineComment;
+                     bool backWasInMultiLine = wasInMultiLine;
 
                      char * word = line.buffer + c - wordLen;
                      int g,ccc;
@@ -1650,6 +1656,8 @@ private:
                      escaped = false;
                      lastWasStar = false;
 
+                     wasInMultiLine = inMultiLineComment;
+
                      // Determine Syntax Highlighting
                      newTextColor = defaultTextColor;
                      if(style.syntax)
@@ -1690,7 +1698,7 @@ private:
                         }
                         else if(wordLen == 1 && word[0] == '*')
                         {
-                           if(c < 2 || word[-1] != '/')
+                           if(backWasInMultiLine)
                               lastWasStar = true;
                         }
                         else if(!inSingleLineComment && !inMultiLineComment && !inQuotes && wordLen == 1 && word[0] == '\"')
@@ -1786,6 +1794,7 @@ private:
                               inQuotes = backInQuotes;
                               inPrep = backInPrep;
                               inSingleLineComment = backInSingleLineComment;
+                              wasInMultiLine = backWasInMultiLine;
                               break;
                            }
                            else
-- 
1.8.3.1