storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove re.sub

Browse Source
This commit is contained in:
chrys 2017-11-10 20:08:58 +01:00
parent 553f5dc456
commit 09a07ab11e
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fenrir/commands/onCursorChange/65000-char_delete_echo.py
View File

@ -24,8 +24,9 @@ class command():
return return
# More than just a deletion happend # More than just a deletion happend
if self.env['runtime']['screenManager'].isDelta(): if self.env['runtime']['screenManager'].isDelta(ignoreSpace=True):
return return
# no deletion # no deletion
if not self.env['runtime']['screenManager'].isNegativeDelta(): if not self.env['runtime']['screenManager'].isNegativeDelta():
return return
@ -33,7 +34,8 @@ class command():
# too much for a single backspace... # too much for a single backspace...
# word begin produce a diff wiht len == 2 |a | others with 1 |a| # word begin produce a diff wiht len == 2 |a | others with 1 |a|
if len(self.env['screen']['newNegativeDelta']) > 2: if len(self.env['screen']['newNegativeDelta']) > 2:
return return
currNegativeDelta = self.env['screen']['newNegativeDelta'] currNegativeDelta = self.env['screen']['newNegativeDelta']
if len(currNegativeDelta.strip()) != len(currNegativeDelta) and \ if len(currNegativeDelta.strip()) != len(currNegativeDelta) and \
currNegativeDelta.strip() != '': currNegativeDelta.strip() != '':

7
src/fenrir/core/screenManager.py
View File

@ -66,8 +66,11 @@ class screenManager():
if not self.env['screen']['oldTTY']: if not self.env['screen']['oldTTY']:
return False return False
return self.env['screen']['newTTY'] != self.env['screen']['oldTTY'] return self.env['screen']['newTTY'] != self.env['screen']['oldTTY']
def isDelta(self): def isDelta(self, ignoreSpace=False):
return self.env['screen']['newDelta'] != '' newDelta = self.env['screen']['newDelta']
if ignoreSpace:
newDelta = newDelta.strip()
return newDelta != ''
def isNegativeDelta(self): def isNegativeDelta(self):
return self.env['screen']['newNegativeDelta'] != '' return self.env['screen']['newNegativeDelta'] != ''
def getWindowAreaInText(self, text): def getWindowAreaInText(self, text):

4
src/fenrir/screenDriver/vcsaDriver.py
View File

@ -348,9 +348,9 @@ class driver(screenDriver):
if cursorLineEnd > cursorLineStart + self.env['screen']['newCursor']['x'] + 3: if cursorLineEnd > cursorLineStart + self.env['screen']['newCursor']['x'] + 3:
cursorLineEndOffset = cursorLineStart + self.env['screen']['newCursor']['x'] + 3 cursorLineEndOffset = cursorLineStart + self.env['screen']['newCursor']['x'] + 3
oldScreenText = self.env['screen']['oldContentText'][cursorLineStartOffset:cursorLineEndOffset] oldScreenText = self.env['screen']['oldContentText'][cursorLineStartOffset:cursorLineEndOffset]
oldScreenText = re.sub(' +',' ',oldScreenText) # oldScreenText = re.sub(' +',' ',oldScreenText)
newScreenText = self.env['screen']['newContentText'][cursorLineStartOffset:cursorLineEndOffset] newScreenText = self.env['screen']['newContentText'][cursorLineStartOffset:cursorLineEndOffset]
newScreenText = re.sub(' +',' ',newScreenText) #newScreenText = re.sub(' +',' ',newScreenText)
diff = difflib.ndiff(oldScreenText, newScreenText) diff = difflib.ndiff(oldScreenText, newScreenText)
typing = True typing = True
else: else: