self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-03-11 14:09:55 +02:00
Code Issues Releases Activity

Mobile,Desktop: Fixes #11135: Fix incorrect list switching behavior (#11137)

Browse Source
This commit is contained in:
Henry Heino 2024-09-27 13:28:56 -07:00 committed by GitHub
parent eda2c69334
commit 948ca605b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/editor/CodeMirror/markdown/markdownCommands.toggleList.test.ts
View File

@ -232,4 +232,19 @@ describe('markdownCommands.toggleList', () => {
); );
expect(editor.state.selection.main.from).toBe(preSubListText.length); expect(editor.state.selection.main.from).toBe(preSubListText.length);
}); });
it('should not treat a list of IP addresses as a numbered list', async () => {
const initialDocText = '192.168.1.1. This\n127.0.0.1. is\n0.0.0.0. a list';
const editor = await createTestEditor(
initialDocText,
EditorSelection.range(0, initialDocText.length),
[],
);
toggleList(ListType.UnorderedList)(editor);
expect(editor.state.doc.toString()).toBe(
'- 192.168.1.1. This\n- 127.0.0.1. is\n- 0.0.0.0. a list',
);
});
}); });

6
packages/editor/CodeMirror/markdown/markdownCommands.ts
View File

@ -132,9 +132,9 @@ export const toggleList = (listType: ListType): Command => {
// RegExps for different list types. The regular expressions MUST // RegExps for different list types. The regular expressions MUST
// be mutually exclusive. // be mutually exclusive.
// `(?!\[[ xX]+\])` means "not followed by [x] or [ ]". // `(?!\[[ xX]+\])` means "not followed by [x] or [ ]".
const bulletedRegex = /^\s*([-*])\s(?!\[[ xX]+\])/; const bulletedRegex = /^\s*([-*])\s(?!\[[ xX]+\]\s)/;
const checklistRegex = /^\s*[-*]\s\[[ xX]+\]\s?/; const checklistRegex = /^\s*[-*]\s\[[ xX]+\]\s/;
const numberedRegex = /^\s*\d+\.\s?/; const numberedRegex = /^\s*\d+\.\s/;
const listRegexes: Record<ListType, RegExp> = { const listRegexes: Record<ListType, RegExp> = {
[ListType.OrderedList]: numberedRegex, [ListType.OrderedList]: numberedRegex,