Skip to content

[Fix] Non-standard formatted tasklist items are not identified as tasklist items #3972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshblack merged 7 commits into from
Nov 28, 2023
Merged

[Fix] Non-standard formatted tasklist items are not identified as tasklist items #3972

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
66dd4ea
identify multiple spaces in tasklist items
iulia-b Nov 24, 2023
2e20461
Merge branch 'main' into iunia/misspaced-checkboxes
iulia-b Nov 24, 2023
ad9c47f
parity for whitespace support with classic experience
iulia-b Nov 28, 2023
8d676b5
Merge branch 'iunia/misspaced-checkboxes' of https://github.com/prime…
iulia-b Nov 28, 2023
10c0f45
Remove extra space
iulia-b Nov 28, 2023
5d8cc89
chore: add changeset
joshblack Nov 28, 2023
1aad0c1
Merge branch 'main' into iunia/misspaced-checkboxes
joshblack Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/drafts/MarkdownEditor/_useListEditing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const calculateNextListItemStarter = ({leadingWhitespace = '', delimeter, taskBo
* 3. Task box (optional)
* 4. Everything following
*/
export const listItemRegex = /^(\s*)([*-]|(\d+)\.)\s(?:(\[[\sx]\])\s)?(.*)/i
export const listItemRegex = /^(\s*)([*-]|(\d+)\.)(\s{1,2})(?:(\[[\sx]\])\s)?(.*)/i
Copy link
Contributor

@iansan5653 iansan5653 Nov 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are tab characters valid here? Maybe more correct would be space only ( ). Not sure though. It's a minor thing though since that bug would've already been present before this change.

Suggested change
export const listItemRegex = /^(\s*)([*-]|(\d+)\.)(\s{1,2})(?:(\[[\sx]\])\s)?(.*)/i
export const listItemRegex = /^(\s*)([*-]|(\d+)\.)( {1,2})(?:(\[[\sx]\])\s)?(.*)/i

Copy link
Contributor Author

@iulia-b iulia-b Nov 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

\s is identifying tabs as well, i just checked


export type ListItem = {
leadingWhitespace: string
Expand All @@ -45,7 +45,7 @@ const isNumericListItem = (item: ListItem | null): item is NumericListItem => ty
export const parseListItem = (line: string): ListItem | null => {
const result = listItemRegex.exec(line)
if (!result) return null
const [, leadingWhitespace = '', fullDelimeter, itemNumberStr = '', taskBox = null, text] = result
const [, leadingWhitespace = '', fullDelimeter, itemNumberStr = '', , taskBox = null, text] = result
Copy link
Contributor

@iansan5653 iansan5653 Nov 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here you are skipping the capture group for the one or two spaces, meaning that the updated Markdown will always have only one space. Do we maybe want to preserve the number of spaces like we do with leadingWhitespace here?

Copy link
Contributor Author

@iulia-b iulia-b Nov 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in ad9c47f

const itemNumber = Number.parseInt(itemNumberStr, 10)
const delimeter = Number.isNaN(itemNumber) ? (fullDelimeter as '*' | '-') : itemNumber

Expand Down