feat: Supports unicode diacritical marks when rendering line diff (fixes #169)

CHANGELOG.md

@@ -1,17 +1,3 @@
-## [5.3.1](https://github.com/wickedest/Mergely/compare/v5.3.0...v5.3.1) (2024-06-19)
-
-
-### Bug Fixes
-
-* Fixed a regression rendering inline markup for numbers, punctuation, and symbols ([#199](https://github.com/wickedest/Mergely/issues/199)) ([c40672c](https://github.com/wickedest/Mergely/commit/c40672c458723bdd0d9a0062ef1457e435866765))
-
-# [5.3.0](https://github.com/wickedest/Mergely/compare/v5.2.0...v5.3.0) (2024-06-16)
-
-
-### Features
-
-* Supports unicode diacritical marks when rendering line diff (fixes [#169](https://github.com/wickedest/Mergely/issues/169)) ([#197](https://github.com/wickedest/Mergely/issues/197)) ([a469a65](https://github.com/wickedest/Mergely/commit/a469a6510122356a7cae3fb1259e999e6cc34c94))
-
 # [5.2.0](https://github.com/wickedest/Mergely/compare/v5.1.4...v5.2.0) (2024-06-09)
 
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "mergely",
-  "version": "5.3.1",
+  "version": "5.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "mergely",
-      "version": "5.3.1",
+      "version": "5.2.0",
       "license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
       "devDependencies": {
         "@babel/core": "^7.1.6",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mergely",
-  "version": "5.3.1",
+  "version": "5.2.0",
   "description": "A javascript UI for diff/merge",
   "license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
   "author": {

src/diff.js

@@ -241,13 +241,11 @@ function CodeifyText(lhs, rhs, options) {
 	this.ctxs = {};
 	this.options = options;
 	this.options.split = this.options.split || 'lines';
-	const exp = /\p{Letter}\p{Mark}*|\p{Number}\p{Mark}*|\p{Punctuation}\p{Mark}*|\p{Symbol}\p{Mark}*|\p{White_Space}/gu;
 
 	if (typeof lhs === 'string') {
 		if (this.options.split === 'chars') {
-			console.log('HERE')
 			// split characters and include their diacritical marks
-			this.lhs = lhs.match(exp) || [];
+			this.lhs = lhs.match(/\p{Letter}\p{Mark}*|\p{White_Space}/gu) || [];
 			// this.lhs = [...lhs];
 		} else if (this.options.split === 'words') {
 			this.lhs = lhs.split(/\s/);
@@ -260,7 +258,7 @@ function CodeifyText(lhs, rhs, options) {
 	if (typeof rhs === 'string') {
 		if (this.options.split === 'chars') {
 			// split characters and include their diacritical marks
-			this.rhs = rhs.match(exp) || [];
+			this.rhs = rhs.match(/\p{Letter}\p{Mark}*|\p{White_Space}/gu) || [];
 			// this.rhs = [...rhs];
 		} else if (this.options.split === 'words') {
 			this.rhs = rhs.split(/\s/);

src/vdoc.js

@@ -2,9 +2,7 @@ const diff = require('./diff');
 
 const trace = console.log;
 
-const expLetters = new RegExp(
-	/\p{Letter}\p{Mark}*|\p{Number}\p{Mark}*|\p{Punctuation}\p{Mark}*|\p{Symbol}\p{Mark}*|\p{White_Space}/gu
-);
+const expLetters = new RegExp(/\p{Letter}\p{Mark}*|\p{White_Space}/gu);
 
 class VDoc {
 	constructor(options) {

test/markup.spec.js

@@ -42,7 +42,6 @@ describe('markup', () => {
 
 	const LHS_CHANGE_START = '.mergely.lhs.c.CodeMirror-linebackground.start';
 	const LHS_CHANGE_END = '.mergely.lhs.c.CodeMirror-linebackground.end';
-	const LHS_CHANGE_START_AND_END = '.mergely.lhs.c.CodeMirror-linebackground.start.end';
 	const RHS_CHANGE_START = '.mergely.rhs.c.CodeMirror-linebackground.start';
 	const RHS_CHANGE_END = '.mergely.rhs.c.CodeMirror-linebackground.end';
 
@@ -336,31 +335,7 @@ describe('markup', () => {
 				expect(rhs_spans[0].innerText).to.equal('y');
 			}
 		},
-		{
-			name: 'Changes with non-letter chars',
-			lhs: '~# 00 == ! (dog) \n',
-			rhs: '~? 11 ++ ] (fox) .\n',
-			only: true,
-			check: (editor) => {
-				expect(editor.querySelectorAll(LHS_CHANGE_START_AND_END + '.cid-0')).to.have.length(1);
-				expect(editor.querySelectorAll(LHS_INLINE_TEXT + '.cid-0')).to.have.length(6);
-				expect(editor.querySelectorAll(RHS_INLINE_TEXT + '.cid-0')).to.have.length(7);
-				const lhs_changes = editor.querySelectorAll(LHS_INLINE_TEXT + '.cid-0');
-				const rhs_changes = editor.querySelectorAll(RHS_INLINE_TEXT + '.cid-0');
-				const lhs_values = [];
-				for (const value of lhs_changes.values()) {
-					lhs_values.push(value.innerText);
-				}
-				const rhs_values = [];
-				for (const value of rhs_changes.values()) {
-					rhs_values.push(value.innerText);
-				}
-				console.log(lhs_values);
-				console.log(rhs_values);
-				expect(lhs_values).to.deep.equal(['#', '00', '==', '!', 'd', 'g']);
-				expect(rhs_values).to.deep.equal(['?', '11', '++', ']', 'f', 'x', '.']);
-			}
-		},
+
 	];
 
 	// to debug, add `only: true` to the test `opts` above, and run `npm run debug`