From 1956eb5c519ec776041da05db55287f30e2ca7b2 Mon Sep 17 00:00:00 2001
From: Pritpal Bedi <bedipritpal@hotmail.com>
Date: Thu, 30 Aug 2012 02:41:04 +0000
Subject: [PATCH] 2012-08-29 19:38 UTC-0800 Pritpal Bedi
 (bedipritpal@hotmail.com)   * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp  
 * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h     + Added:
 METHOD|FUNCTION|PROCEDURE-RETURN pairs.     + Added: #if-#endif pair.      
 TODO: #ifdef-#endif pair.

---
 harbour/ChangeLog                             |   7 +
 .../hbqt/qtgui/hbqt_hbqplaintextedit.cpp      | 136 +++++++++++++++++-
 .../hbqt/qtgui/hbqt_hbqplaintextedit.h        |   1 +
 3 files changed, 137 insertions(+), 7 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5bccde86ac..73c504e8d7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-08-29 19:38 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
+  * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
+    + Added: METHOD|FUNCTION|PROCEDURE-RETURN pairs.
+    + Added: #if-#endif pair.
+      TODO: #ifdef-#endif pair.
+
 2012-08-29 14:16 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/console.prg
     ! Fixed: at some unknown states Console UI Designer was GPFing.
diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
index 72f6997c54..8b8ccd5ad8 100644
--- a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
+++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
@@ -2767,22 +2767,64 @@ void HBQPlainTextEdit::hbBraceHighlight()
    {
       cursor = textCursor();
       cursor.select( QTextCursor::WordUnderCursor );
-      QString brace = cursor.selectedText();
+      QString brace = cursor.selectedText().toUpper();
 
-      if( brace == "IF"       || brace == "ENDIF"     ||
+      if( brace == "IF"       || brace == "ENDIF"     || brace == "IFDEF"  ||
           brace == "FOR"      || brace == "NEXT"      ||
           brace == "SWITCH"   || brace == "ENDSWITCH" ||
-          brace == "DO"       || brace == "ENDCASE"   || brace == "ENDDO" ||
+          brace == "DO"       || brace == "ENDCASE"   || brace == "ENDDO"  ||
           brace == "CLASS"    || brace == "ENDCLASS"  ||
-          brace == "FUNCTION" || brace == "RETURN"     )
+          brace == "FUNCTION" || brace == "RETURN"    || brace == "METHOD" || brace == "PROCEDURE" )
       {
          QString openBrace;
          QString closeBrace;
 
          if( ( brace == "IF" ) || ( brace == "ENDIF" ) )
          {
-            openBrace  = "IF";
-            closeBrace = "ENDIF";
+            QTextCursor c( cursor );
+            c.movePosition( QTextCursor::PreviousWord, QTextCursor::MoveAnchor );
+            c.movePosition( QTextCursor::PreviousWord, QTextCursor::MoveAnchor );
+            c.movePosition( QTextCursor::EndOfWord, QTextCursor::KeepAnchor );
+            QString brc = c.selectedText();
+            if( brc == "#" )
+            {
+               c.movePosition( QTextCursor::EndOfWord, QTextCursor::KeepAnchor );
+               cursor = c;
+               brace = "#" + brace;
+               if( brace == "#IF" )
+               {
+                  openBrace  = "#IF";
+                  closeBrace = "#ENDIF";
+               }
+               else
+               {
+                  QRegExp openBrace( "(#IFDEF|#IF)" );
+                  QRegExp closeBrace( "#ENDIF" );
+                  matchPair( cursor, QRegExp(), openBrace, closeBrace, true, QTextDocument::FindWholeWords, false );
+                  return;
+               }
+            }
+            else
+            {
+               openBrace  = "IF";
+               closeBrace = "ENDIF";
+            }
+         }
+         else if( ( brace == "IFDEF" ) )
+         {
+            QTextCursor c( cursor );
+            c.movePosition( QTextCursor::PreviousWord, QTextCursor::MoveAnchor );
+            c.movePosition( QTextCursor::PreviousWord, QTextCursor::MoveAnchor );
+            c.movePosition( QTextCursor::EndOfWord, QTextCursor::KeepAnchor );
+            QString brc = c.selectedText();
+            if( brc == "#" )
+            {
+               c.movePosition( QTextCursor::EndOfWord, QTextCursor::KeepAnchor );
+               cursor = c;
+               brace = "#" + brace;
+               openBrace  = "#IFDEF";
+               closeBrace = "#ENDIF";
+            }
          }
          else if( ( brace == "FOR" ) || ( brace == "NEXT" ) )
          {
@@ -2823,11 +2865,28 @@ void HBQPlainTextEdit::hbBraceHighlight()
                closeBrace = "ENDDO";
             }
          }
-         else if( ( brace == "FUNCTION" ) || ( brace == "RETURN" ) )
+         else if( ( brace == "FUNCTION" ) )
          {
             openBrace  = "FUNCTION";
             closeBrace = "RETURN";
          }
+         else if( ( brace == "METHOD" ) )
+         {
+            openBrace  = "METHOD";
+            closeBrace = "RETURN";
+         }
+         else if( ( brace == "PROCEDURE" ) )
+         {
+            openBrace  = "PROCEDURE";
+            closeBrace = "RETURN";
+         }
+         else if( ( brace == "RETURN" ) )
+         {
+            QRegExp openBrace( "(FUNCTION|METHOD|PROCEDURE)" );
+            QRegExp closeBrace( "\bRETURN\b" );
+            matchPair( cursor, QRegExp(), openBrace, closeBrace, true, QTextDocument::FindWholeWords, false );
+            return;
+         }
          else if( ( brace == "CLASS" ) || ( brace == "ENDCLASS" ) )
          {
             openBrace  = "CLASS";
@@ -2899,4 +2958,67 @@ void HBQPlainTextEdit::matchPair( QTextCursor cursor, QString brace, QString ope
       setExtraSelections( extraSelections );
    }
 }
+
+/*----------------------------------------------------------------------*/
+
+void HBQPlainTextEdit::matchPair( QTextCursor cursor, QRegExp brace, QRegExp openBrace, QRegExp closeBrace, bool bBraceAll, QTextDocument::FindFlags flags, bool bForward )
+{
+   QTextDocument *doc = document();
+   QTextCursor cursorC;
+   QTextCursor cursorO;
+   QTextCursor matches;
+   Q_UNUSED( brace );
+
+   if( bForward )
+   {
+      cursorC = doc->find( closeBrace, cursor, flags );
+      cursorO = doc->find( openBrace, cursor, flags );
+      if( cursorO.isNull() )
+      {
+         matches = cursorC;
+      }
+      else
+      {
+         while( cursorC.position() > cursorO.position() )
+         {
+            cursorC = doc->find( closeBrace, cursorC, flags );
+            cursorO = doc->find( openBrace, cursorO, flags );
+            if( cursorO.isNull() )
+                break;
+         }
+         matches = cursorC;
+      }
+   }
+   else
+   {
+      cursorO = doc->find( openBrace, cursor, QTextDocument::FindBackward | flags );
+      cursorC = doc->find( closeBrace, cursor, QTextDocument::FindBackward | flags );
+      if( cursorC.isNull() )
+      {
+         matches = cursorO;
+      }
+      else
+      {
+         while( cursorO.position() < cursorC.position() )
+         {
+            cursorO = doc->find( openBrace, cursorO, QTextDocument::FindBackward | flags );
+            cursorC = doc->find( closeBrace, cursorC, QTextDocument::FindBackward | flags );
+            if( cursorC.isNull() )
+                break;
+         }
+         matches = cursorO;
+      }
+   }
+   if( ! matches.isNull() )
+   {
+      if( bBraceAll )
+      {
+         selection.cursor = cursor;
+         extraSelections.append( selection );
+      }
+      selection.cursor = matches;
+      extraSelections.append( selection );
+      setExtraSelections( extraSelections );
+   }
+}
 #endif
diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
index 27b07dc759..af9e89bc8d 100644
--- a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
+++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
@@ -242,6 +242,7 @@ public slots:
    void           hbToggleCodeCompetion() { isCodeCompletionActive = ! isCodeCompletionActive; };
    void           hbToggleCompetionTips() { isCompletionTipsActive = ! isCompletionTipsActive; };
    void           matchPair( QTextCursor cursor, QString brace, QString openBrace, QString closeBrace, bool bBraceAll, QTextDocument::FindFlags flags );
+   void           matchPair( QTextCursor cursor, QRegExp brace, QRegExp openBrace, QRegExp closeBrace, bool bBraceAll, QTextDocument::FindFlags flags, bool bForward );
 
 private slots:
    void           hbSlotCursorPositionChanged();