Merge from 3.x: PR #4603

Fixes #4595
spyder-ide · Jun 15, 2017 · f0107b5 · f0107b5
2 parents 8422957 + 6e9eba2
commit f0107b5
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/spyder/utils/syntaxhighlighters.py b/spyder/utils/syntaxhighlighters.py
@@ -1028,7 +1028,10 @@ def highlightBlock(self, text):
         self.setCurrentBlockState(previous_state)
 
         match = self.PROG.search(text)
-        while match:
+        match_count = 0
+        n_characters = len(text)
+
+        while match and match_count< n_characters:
             for key, value in list(match.groupdict().items()):
                 start, end = match.span(key)
 
@@ -1053,6 +1056,7 @@ def highlightBlock(self, text):
                     self.setFormat(start, end - start, self.formats[key])
 
             match = self.PROG.search(text, match.end())
+            match_count += 1
 
         self.highlight_spaces(text)