Merge pull request #27 from derula/dependabot/pip/sievelib-1.2.0

Bump sievelib from 1.1.1 to 1.2.0

strainer/controls/statusbar.py

@@ -91,16 +91,8 @@ def parseScript(self, text=None):
     def getError(self, text):
         if text is None:
             return None, tuple()
-        try:
-            parseResult = self._parser.parse(text)
-        except Exception:
-            # Workaround for sievelib bug #96
-            return (0, 0), 'Error occurred while trying to parse the script.'
+        parseResult = self._parser.parse(text)
         if parseResult:
             return None, 'No errors found in open script.'
-        # Workaround for sievelib bug #93
         errorPos = tuple(x - 1 for x in self._parser.error_pos)
-        error = self._parser.error
-        if len(error) > 200:
-            error = error[:197] + ' [...]'
-        return errorPos, error
+        return errorPos, self._parser.error

strainer/sieve/__init__.py

@@ -1,17 +1,11 @@
-from sievelib.commands import ExistsCommand
 from sievelib.parser import Lexer, Parser
 
 from .connection import SieveConnectionQueue
 
 __all__ = ('SieveConnectionQueue',)
 
-# Patch sievelib bug #90
-ExistsCommand.args_definition[0]['type'].append('string')
-
 
 # Save error line and column on error
-# Due to a problem in sievelib, column number is currently at the _end_ of a token, not the start.
-# Cf. tonioo/sievelib#92 for a fix.
 @property
 def error(self):
     return self._error

strainer/widgets/editor/lexer.py

@@ -127,10 +127,10 @@ def _doStyleText(self, start: int, end: int):
         self._stylingPos = 0
         self.startStyling(start)
         for style, value in self.scan(start):
-            self.setStyling(self._lexer.pos - self._stylingPos - len(value), 0)
+            self.setStyling(self._lexer.pos - self._stylingPos, 0)
             self.setStyling(len(value), style)
-            self._stylingPos = self._lexer.pos
-            if start + self._lexer.pos > end:
+            self._stylingPos = self._lexer.pos + len(value)
+            if start + self._stylingPos > end:
                 break
 
     def scan(self, start):
@@ -145,7 +145,7 @@ def scan(self, start):
                     command = get_command_instance(value.decode('ascii'), checkexists=False)
                     style = self._IDENTIFIER_STYLES[command.get_type()]
             except (UnknownCommand, NotImplementedError, KeyError):
-                value_start = start + self._lexer.pos - len(value)
+                value_start = start + self._lexer.pos
                 editor.SendScintilla(QsciScintilla.SCI_INDICATORFILLRANGE, value_start, len(value))
             yield style, value
 

strainer/widgets/editor/scintilla.py

@@ -86,7 +86,6 @@ def setParseError(self, line, col, length=1):
         self.SendScintilla(QsciScintilla.SCI_SETINDICATORCURRENT, 1)
         self.SendScintilla(QsciScintilla.SCI_INDICATORCLEARRANGE, 0, self.length())
         if line >= 0 and col >= 0:
-            # check if max() is still needed after sievelib #92 is merged
             start = max(self.positionFromLineIndex(line, col) - length, 0)
             self.SendScintilla(QsciScintilla.SCI_INDICATORFILLRANGE, start, length)