mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-07-31 08:12:51 +00:00
Code Issues Releases Wiki Activity

Fix crash with invalid patches

Browse Source 
See https://github.com/Jermolene/TiddlyWiki5/pull/7290#issuecomment-1453155311

Thanks @yaisog
This commit is contained in:
jeremy@jermolene.com 2023-03-03 18:22:35 +00:00
parent d5f0d834bc
commit 0c7e06a10c
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/filters/strings.js
View File

@ -95,8 +95,16 @@ exports.makepatches = makeStringBinaryOperator(
exports.applypatches = makeStringBinaryOperator(
function(a,b) {
var dmpObject = new dmp.diff_match_patch(),
patches;
try {
patches = dmpObject.patch_fromText(b);
return [dmpObject.patch_apply(patches,a)[0]];
} catch(e) {
}
if(patches) {
return [dmpObject.patch_apply(patches,a)[0]];
} else {
return [a];
}
}
);

22
editions/test/tiddlers/tests/data/filters/DiffMergePatch3.tid Normal file
View File

@ -0,0 +1,22 @@
title: Filters/DiffMergePatch3
description: Tests for diff-merge-patch derived operators
type: text/vnd.tiddlywiki-multiple
tags: [[$:/tags/wiki-test-spec]]
title: Output
\whitespace trim
\define text1()
the cat sat on the mat
\end
\define patches()
**NOT A VALID PATCH**
\end
<$text text={{{ [<text1>applypatches<patches>] }}}/>
+
title: ExpectedResult
the cat sat on the mat