+ fix highlighting of words with numbers

FreeCAD · Apr 10, 2015 · 64b8313 · 64b8313
1 parent 1c79112
commit 64b8313
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/Mod/Fem/Gui/AbaqusHighlighter.cpp b/src/Mod/Fem/Gui/AbaqusHighlighter.cpp
@@ -49,7 +49,7 @@ void AbaqusHighlighter::highlightBlock(const QString &text)
     // Find a syntax file for the Abaqus format here
     // http://notepad-plus.sourceforge.net/commun/userDefinedLang/userDefineLang_Abaqus.xml
     //
-    enum { NormalState = -1, Definition, BeforeKey, InideKey, BeforeValue, InsideValue, Number };
+    enum { NormalState = -1, Definition, BeforeKey, InideKey, BeforeValue, InsideValue, Text, Number };
 
     int state = NormalState;
     int start = 0;
@@ -112,7 +112,7 @@ void AbaqusHighlighter::highlightBlock(const QString &text)
         }
         // Number
         else if (state == Number) {
-            if (!text[i].isNumber()) {
+            if (!text[i].isNumber() && text[i] != QLatin1Char('.')) {
                 QTextCharFormat numberFormat;
                 numberFormat.setForeground(numberColor);
                 setFormat(start, i - start, numberFormat);
@@ -121,7 +121,7 @@ void AbaqusHighlighter::highlightBlock(const QString &text)
                 state = NormalState;
             }
         }
-        else if (text[i].isNumber()) {
+        else if (text[i].isNumber() || text[i] == QLatin1Char('-')) {
             if (state == NormalState) {
                 start = i;
                 state = Number;
@@ -140,6 +140,15 @@ void AbaqusHighlighter::highlightBlock(const QString &text)
             start = i;
             state = Definition;
         }
+        else if (text[i].isLetterOrNumber()) {
+            if (state == NormalState) {
+                start = i;
+                state = Text;
+            }
+        }
+        else {
+            state = NormalState;
+        }
     }
 
     if (state == Definition) {