Highlight matching and mismatching parentheses, braces and brackets.

OpenModelica · Dec 1, 2015 · 2c0784f · 2c0784f
1 parent 3fbda19
commit 2c0784f
Show file tree

Hide file tree

Showing 5 changed files with 352 additions and 175 deletions.
diff --git a/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointMarker.cpp b/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointMarker.cpp
@@ -92,17 +92,17 @@ bool DocumentMarker::addMark(ITextMark *mark, int line)
   if (line >= 1)
   {
     int blockNumber = line - 1;
-    ModelicaTextDocumentLayout *docLayout = qobject_cast<ModelicaTextDocumentLayout*>(mpTextDocument->documentLayout());
+    BaseEditorDocumentLayout *docLayout = qobject_cast<BaseEditorDocumentLayout*>(mpTextDocument->documentLayout());
     if (!docLayout)
       return false;
     QTextBlock block = mpTextDocument->findBlockByNumber(blockNumber);
     if (block.isValid())
     {
-      TextBlockUserData *userData = ModelicaTextDocumentLayout::userData(block);
+      TextBlockUserData *userData = BaseEditorDocumentLayout::userData(block);
       userData->addMark(mark);
       mark->updateLineNumber(blockNumber + 1);
       mark->updateBlock(block);
-      docLayout->mpHasBreakpoint = true;
+      docLayout->mHasBreakpoint = true;
       docLayout->requestUpdate();
       return true;
     }
@@ -118,7 +118,7 @@ TextMarks DocumentMarker::marksAt(int line) const
     QTextBlock block = mpTextDocument->findBlockByNumber(blockNumber);
     if (block.isValid())
     {
-      if (TextBlockUserData *userData = ModelicaTextDocumentLayout::testUserData(block))
+      if (TextBlockUserData *userData = BaseEditorDocumentLayout::testUserData(block))
         return userData->marks();
     }
   }
@@ -157,7 +157,7 @@ bool DocumentMarker::hasMark(ITextMark *mark) const
 void DocumentMarker::updateMark(ITextMark *mark)
 {
   Q_UNUSED(mark)
-  ModelicaTextDocumentLayout *docLayout = qobject_cast<ModelicaTextDocumentLayout*>(mpTextDocument->documentLayout());
+  BaseEditorDocumentLayout *docLayout = qobject_cast<BaseEditorDocumentLayout*>(mpTextDocument->documentLayout());
   if (docLayout)
     docLayout->requestUpdate();
 }
@@ -167,7 +167,7 @@ void DocumentMarker::updateBreakpointsLineNumber()
     QTextBlock block = mpTextDocument->begin();
     int blockNumber = 0;
     while (block.isValid()) {
-        if (const TextBlockUserData *userData = ModelicaTextDocumentLayout::testUserData(block))
+        if (const TextBlockUserData *userData = BaseEditorDocumentLayout::testUserData(block))
             foreach (ITextMark *mrk, userData->marks()) {
                 mrk->updateLineNumber(blockNumber + 1);
             }
@@ -178,7 +178,7 @@ void DocumentMarker::updateBreakpointsLineNumber()
 
 void DocumentMarker::updateBreakpointsBlock(const QTextBlock &block)
 {
-    if (const TextBlockUserData *userData = ModelicaTextDocumentLayout::testUserData(block))
+    if (const TextBlockUserData *userData = BaseEditorDocumentLayout::testUserData(block))
         foreach (ITextMark *mrk, userData->marks())
             mrk->updateBlock(block);
 }