Fix expression builder highlighting (#4913)

wonder-sk · wonder-sk · commit f854acb1b0db · 2012-01-31T11:18:01.000+01:00
diff --git a/src/gui/qgsexpressionhighlighter.cpp b/src/gui/qgsexpressionhighlighter.cpp
@@ -50,6 +50,8 @@ void QgsExpressionHighlighter::addFields( QStringList fieldList )
   HighlightingRule rule;
   foreach( const QString field, fieldList )
   {
+    if ( field.isEmpty() ) // this really happened :)
+      continue;
     rule.pattern = QRegExp( "\\b" + field + "\\b" );
     rule.format = columnNameFormat;
     highlightingRules.append( rule );
@@ -65,6 +67,8 @@ void QgsExpressionHighlighter::highlightBlock( const QString &text )
     while ( index >= 0 )
     {
       int length = expression.matchedLength();
+      if ( length == 0 )
+        break; // avoid infinite loops
       setFormat( index, length, rule.format );
       index = expression.indexIn( text, index + length );
     }

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@ void QgsExpressionHighlighter::addFields( QStringList fieldList )`
`50`	`50`	`HighlightingRule rule;`
`51`	`51`	`foreach( const QString field, fieldList )`
`52`	`52`	`{`
	`53`	`+ if ( field.isEmpty() ) // this really happened :)`
	`54`	`+ continue;`
`53`	`55`	`rule.pattern = QRegExp( "\\b" + field + "\\b" );`
`54`	`56`	`rule.format = columnNameFormat;`
`55`	`57`	`highlightingRules.append( rule );`
`@@ -65,6 +67,8 @@ void QgsExpressionHighlighter::highlightBlock( const QString &text )`
`65`	`67`	`while ( index >= 0 )`
`66`	`68`	`{`
`67`	`69`	`int length = expression.matchedLength();`
	`70`	`+ if ( length == 0 )`
	`71`	`+ break; // avoid infinite loops`
`68`	`72`	`setFormat( index, length, rule.format );`
`69`	`73`	`index = expression.indexIn( text, index + length );`
`70`	`74`	`}`