Skip to content
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.

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

Fix double backticks #827

Merged
merged 1 commit into from
Dec 31, 2024
Merged

Conversation

QichenZhu
Copy link
Contributor

@QichenZhu QichenZhu commented Dec 30, 2024

This PR fixes the issue that the inline code block regex doesn't match two backticks with no content between them.

For example, in

 `hello` `` hi`

the two backticks in the middle are not regarded as a pair, which causes the word hi after them to be part of the code block. However, the user expects the word hi not to be part of the code block.

Fixed Issues

$ Expensify/App#53573

A similar issue is also mentioned in this comment.

Tests

  1. What unit/integration tests cover your change? What autoQA tests cover your change?

New test case added

Test string: "`hello` `` hi`"
Expected result: "<code>hello</code> &#x60;&#x60; hi&#x60;"

Existing test cases updated

Test inline code blocks with double backticks
Expected result before: "My favorite language is <code>&#x60;JavaScript&#x60;</code>. How about you?"
Expected result after: "My favorite language is &#x60;&#x60;JavaScript&#x60;&#x60;. How about you?"
Test inline code blocks with triple backticks
Expected result before: "My favorite language is <code>&#x60;&#x60;JavaScript&#x60;&#x60;</code>. How about you?"
Expected result after: "My favorite language is &#x60;&#x60;<code>JavaScript</code>&#x60;&#x60;. How about you?"
Test inline code blocks with two backticks
Expected result before: "<code>&#x60;JavaScript&#x60;</code>"
Expected result after: "&#x60;&#x60;JavaScript&#x60;&#x60;"
Test for backticks only tab characters inside it
Expected result before: "&#x60;	&#x60;"
Expected result after: "<code>	</code>"
Test for inline code block with triple backtick with spaces as content
Expected result before: "<code>&#x60;&#x60;   &#x60;&#x60;</code>"
Expected result after: "&#x60;&#x60;<code>&nbsp;&nbsp;&nbsp;</code>&#x60;&#x60;"
  1. What tests did you perform that validates your changed worked?
  • Send the below message in Expensify.

    hello `` hi`

  • Verify that the word hi is not rendered as part of a code block.

QA

  1. What does QA need to do to validate your changes?
  • Send the below message in Expensify.

    hello `` hi`

  • Verify that the word hi is not rendered as part of a code block.

  1. What areas to they need to test for regressions?
  • Test with inline code blocks. Be aware of the changed expected behaviors described in Tests section.

@QichenZhu QichenZhu requested a review from a team as a code owner December 30, 2024 09:49
Copy link

github-actions bot commented Dec 30, 2024

All contributors have signed the CLA ✍️ ✅
Posted by the CLA Assistant Lite bot.

@melvin-bot melvin-bot bot requested review from madmax330 and removed request for a team December 30, 2024 09:50
@QichenZhu
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA

CLABotify added a commit to Expensify/CLA that referenced this pull request Dec 30, 2024
@allroundexperts
Copy link
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@madmax330
Copy link
Contributor

@QichenZhu can you update the QA section?

@QichenZhu
Copy link
Contributor Author

@madmax330 Thanks, done!

@madmax330 madmax330 merged commit df44105 into Expensify:main Dec 31, 2024
6 checks passed
@os-botify
Copy link
Contributor

os-botify bot commented Dec 31, 2024

🚀 Published to npm in 2.0.113 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants