Stop highlighting unchanged whitespace #1659
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix a regression introduced by feec45b (Fix warning highlight for trailing whitespace (dandavison#1037), 2023-05-17) where trailing space at the end of an unchanged token is highlighted if the token follows an insertion. This happens because when the token is split in two to separate trailing whitespace the two halves end up being tagged with different edit operations. This can be seen in the test changes in `test_infer_edits_14` and `test_infer_edits_16` introduced by feec45b which changed the operation from `PlusNoop` to `Insertion` when splitting trailing whitespace from unchanged tokens. Fix this by using the same operation when adding both halves of a split token and correcting the tests. Fixes dandavison#1658
|
Excellent, thanks very much again @phillipwood. |
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Aug 20, 2024
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [dandavison/delta](https://github.com/dandavison/delta) | minor | `0.17.0` -> `0.18.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>dandavison/delta (dandavison/delta)</summary> ### [`v0.18.0`](https://github.com/dandavison/delta/releases/tag/0.18.0) [Compare Source](dandavison/delta@0.17.0...0.18.0) As usual, tons of excellent contributions, all but one not by me! [@​th1000s](https://github.com/th1000s) has made a huge number of important and difficult improvements to delta and helped with many issues over the few years since the project started, and so I'm happy to say that he's co-maintaining the project with me nowadays. Thanks to all contributors for the improvements below! #### What's Changed - Link to Repository from Manual by [@​bash](https://github.com/bash) in dandavison/delta#1657 - Stop highlighting unchanged whitespace by [@​phillipwood](https://github.com/phillipwood) in dandavison/delta#1659 - Add .gitattributes rules for rust files by [@​phillipwood](https://github.com/phillipwood) in dandavison/delta#1245 - Repair --default-language, and highlight using full filename by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1549 - tests: prevent parallel env var access by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1681 - CI: fix macOS build by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1696 - Only use `nosort` in bash <4.4 by [@​martinml](https://github.com/martinml) in dandavison/delta#1683 - Don't read git files when --no-gitconfig is given + unused variables by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1728 - tests: add insta for snapshot testing by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1739 - tests: set terminal width to 43 by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1741 - Fix panic when blame-palette is empty by [@​thorio](https://github.com/thorio) in dandavison/delta#1737 - Make relative-paths work with binary files by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1740 - Fix github links from master to main by [@​madeddie](https://github.com/madeddie) in dandavison/delta#1709 - Update `terminal-colorsaurus` by [@​bash](https://github.com/bash) in dandavison/delta#1699 - Make less version >= 633 behave like previous versions wrt. Nerd Fonts by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1762 - Update `catppuccin-latte` casing in `LIGHT_SYNTAX_THEMES` list by [@​injust](https://github.com/injust) in dandavison/delta#1745 - deps: bump libc from 0.2.153 to 0.2.155 by [@​wxpppp](https://github.com/wxpppp) in dandavison/delta#1715 - Add missing `--file-*-label` option to `--navigate` docs by [@​injust](https://github.com/injust) in dandavison/delta#1744 - Fix copy-paste typo by [@​injust](https://github.com/injust) in dandavison/delta#1767 - Update syntect to 5.2.0 by [@​timhillgit](https://github.com/timhillgit) in dandavison/delta#1672 - Disable light mode detection in tests by [@​bash](https://github.com/bash) in dandavison/delta#1765 - Add --max-syntax-highlighting-length, set to 400 by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1746 - chore: cleanup brew formula file in favor of core tap by [@​chenrui333](https://github.com/chenrui333) in dandavison/delta#1773 - wrap --help output, fix rust 1.80 build by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1440 - Fix delta-toggle shell script by [@​dandavison](https://github.com/dandavison) in dandavison/delta#1794 - Do not wrap short help (-h) output by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1800 - Implement --diff-args by [@​dandavison](https://github.com/dandavison) in dandavison/delta#1697 - Handle ambiguous diff header, '--- ' can also be present in a minus hunk by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1787 - cd: build binaries targeting GNU libc on ubuntu-20.04, not latest by [@​th1000s](https://github.com/th1000s) in dandavison/delta#1805 #### New Contributors - [@​martinml](https://github.com/martinml) made their first contribution in dandavison/delta#1683 - [@​thorio](https://github.com/thorio) made their first contribution in dandavison/delta#1737 - [@​madeddie](https://github.com/madeddie) made their first contribution in dandavison/delta#1709 - [@​injust](https://github.com/injust) made their first contribution in dandavison/delta#1745 - [@​wxpppp](https://github.com/wxpppp) made their first contribution in dandavison/delta#1715 - [@​timhillgit](https://github.com/timhillgit) made their first contribution in dandavison/delta#1672 - [@​chenrui333](https://github.com/chenrui333) made their first contribution in dandavison/delta#1773 **Full Changelog**: dandavison/delta@0.17.0...0.18.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
renovate bot
referenced
this pull request
in d-issy/dotfiles
Aug 23, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [dandavison/delta](https://github.com/dandavison/delta) | minor | `0.17.0` -> `0.18.0` | --- ### Release Notes <details> <summary>dandavison/delta (dandavison/delta)</summary> ### [`v0.18.0`](https://github.com/dandavison/delta/releases/tag/0.18.0) [Compare Source](https://github.com/dandavison/delta/compare/0.17.0...0.18.0) As usual, tons of excellent contributions, all but one not by me! [@​th1000s](https://github.com/th1000s) has made a huge number of important and difficult improvements to delta and helped with many issues over the few years since the project started, and so I'm happy to say that he's co-maintaining the project with me nowadays. Thanks to all contributors for the improvements below! #### What's Changed - Link to Repository from Manual by [@​bash](https://github.com/bash) in [https://github.com/dandavison/delta/pull/1657](https://github.com/dandavison/delta/pull/1657) - Stop highlighting unchanged whitespace by [@​phillipwood](https://github.com/phillipwood) in [https://github.com/dandavison/delta/pull/1659](https://github.com/dandavison/delta/pull/1659) - Add .gitattributes rules for rust files by [@​phillipwood](https://github.com/phillipwood) in [https://github.com/dandavison/delta/pull/1245](https://github.com/dandavison/delta/pull/1245) - Repair --default-language, and highlight using full filename by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1549](https://github.com/dandavison/delta/pull/1549) - tests: prevent parallel env var access by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1681](https://github.com/dandavison/delta/pull/1681) - CI: fix macOS build by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1696](https://github.com/dandavison/delta/pull/1696) - Only use `nosort` in bash <4.4 by [@​martinml](https://github.com/martinml) in [https://github.com/dandavison/delta/pull/1683](https://github.com/dandavison/delta/pull/1683) - Don't read git files when --no-gitconfig is given + unused variables by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1728](https://github.com/dandavison/delta/pull/1728) - tests: add insta for snapshot testing by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1739](https://github.com/dandavison/delta/pull/1739) - tests: set terminal width to 43 by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1741](https://github.com/dandavison/delta/pull/1741) - Fix panic when blame-palette is empty by [@​thorio](https://github.com/thorio) in [https://github.com/dandavison/delta/pull/1737](https://github.com/dandavison/delta/pull/1737) - Make relative-paths work with binary files by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1740](https://github.com/dandavison/delta/pull/1740) - Fix github links from master to main by [@​madeddie](https://github.com/madeddie) in [https://github.com/dandavison/delta/pull/1709](https://github.com/dandavison/delta/pull/1709) - Update `terminal-colorsaurus` by [@​bash](https://github.com/bash) in [https://github.com/dandavison/delta/pull/1699](https://github.com/dandavison/delta/pull/1699) - Make less version >= 633 behave like previous versions wrt. Nerd Fonts by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1762](https://github.com/dandavison/delta/pull/1762) - Update `catppuccin-latte` casing in `LIGHT_SYNTAX_THEMES` list by [@​injust](https://github.com/injust) in [https://github.com/dandavison/delta/pull/1745](https://github.com/dandavison/delta/pull/1745) - deps: bump libc from 0.2.153 to 0.2.155 by [@​wxpppp](https://github.com/wxpppp) in [https://github.com/dandavison/delta/pull/1715](https://github.com/dandavison/delta/pull/1715) - Add missing `--file-*-label` option to `--navigate` docs by [@​injust](https://github.com/injust) in [https://github.com/dandavison/delta/pull/1744](https://github.com/dandavison/delta/pull/1744) - Fix copy-paste typo by [@​injust](https://github.com/injust) in [https://github.com/dandavison/delta/pull/1767](https://github.com/dandavison/delta/pull/1767) - Update syntect to 5.2.0 by [@​timhillgit](https://github.com/timhillgit) in [https://github.com/dandavison/delta/pull/1672](https://github.com/dandavison/delta/pull/1672) - Disable light mode detection in tests by [@​bash](https://github.com/bash) in [https://github.com/dandavison/delta/pull/1765](https://github.com/dandavison/delta/pull/1765) - Add --max-syntax-highlighting-length, set to 400 by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1746](https://github.com/dandavison/delta/pull/1746) - chore: cleanup brew formula file in favor of core tap by [@​chenrui333](https://github.com/chenrui333) in [https://github.com/dandavison/delta/pull/1773](https://github.com/dandavison/delta/pull/1773) - wrap --help output, fix rust 1.80 build by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1440](https://github.com/dandavison/delta/pull/1440) - Fix delta-toggle shell script by [@​dandavison](https://github.com/dandavison) in [https://github.com/dandavison/delta/pull/1794](https://github.com/dandavison/delta/pull/1794) - Do not wrap short help (-h) output by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1800](https://github.com/dandavison/delta/pull/1800) - Implement --diff-args by [@​dandavison](https://github.com/dandavison) in [https://github.com/dandavison/delta/pull/1697](https://github.com/dandavison/delta/pull/1697) - Handle ambiguous diff header, '--- ' can also be present in a minus hunk by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1787](https://github.com/dandavison/delta/pull/1787) - cd: build binaries targeting GNU libc on ubuntu-20.04, not latest by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1805](https://github.com/dandavison/delta/pull/1805) #### New Contributors - [@​martinml](https://github.com/martinml) made their first contribution in [https://github.com/dandavison/delta/pull/1683](https://github.com/dandavison/delta/pull/1683) - [@​thorio](https://github.com/thorio) made their first contribution in [https://github.com/dandavison/delta/pull/1737](https://github.com/dandavison/delta/pull/1737) - [@​madeddie](https://github.com/madeddie) made their first contribution in [https://github.com/dandavison/delta/pull/1709](https://github.com/dandavison/delta/pull/1709) - [@​injust](https://github.com/injust) made their first contribution in [https://github.com/dandavison/delta/pull/1745](https://github.com/dandavison/delta/pull/1745) - [@​wxpppp](https://github.com/wxpppp) made their first contribution in [https://github.com/dandavison/delta/pull/1715](https://github.com/dandavison/delta/pull/1715) - [@​timhillgit](https://github.com/timhillgit) made their first contribution in [https://github.com/dandavison/delta/pull/1672](https://github.com/dandavison/delta/pull/1672) - [@​chenrui333](https://github.com/chenrui333) made their first contribution in [https://github.com/dandavison/delta/pull/1773](https://github.com/dandavison/delta/pull/1773) **Full Changelog**: dandavison/delta@0.17.0...0.18.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/d-issy/dotfiles). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
izumin5210
referenced
this pull request
in izumin5210/dotfiles
Aug 31, 2024
](https://renovatebot.com){kind=link}
[](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [dandavison/delta](https://github.com/dandavison/delta) | minor | `0.17.0` -> `0.18.0` | --- ### Release Notes <details> <summary>dandavison/delta (dandavison/delta)</summary> ### [`v0.18.0`](https://github.com/dandavison/delta/releases/tag/0.18.0) [Compare Source](https://github.com/dandavison/delta/compare/0.17.0...0.18.0) As usual, tons of excellent contributions, all but one not by me! [@​th1000s](https://github.com/th1000s) has made a huge number of important and difficult improvements to delta and helped with many issues over the few years since the project started, and so I'm happy to say that he's co-maintaining the project with me nowadays. Thanks to all contributors for the improvements below! #### What's Changed - Link to Repository from Manual by [@​bash](https://github.com/bash) in [https://github.com/dandavison/delta/pull/1657](https://github.com/dandavison/delta/pull/1657) - Stop highlighting unchanged whitespace by [@​phillipwood](https://github.com/phillipwood) in [https://github.com/dandavison/delta/pull/1659](https://github.com/dandavison/delta/pull/1659) - Add .gitattributes rules for rust files by [@​phillipwood](https://github.com/phillipwood) in [https://github.com/dandavison/delta/pull/1245](https://github.com/dandavison/delta/pull/1245) - Repair --default-language, and highlight using full filename by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1549](https://github.com/dandavison/delta/pull/1549) - tests: prevent parallel env var access by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1681](https://github.com/dandavison/delta/pull/1681) - CI: fix macOS build by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1696](https://github.com/dandavison/delta/pull/1696) - Only use `nosort` in bash <4.4 by [@​martinml](https://github.com/martinml) in [https://github.com/dandavison/delta/pull/1683](https://github.com/dandavison/delta/pull/1683) - Don't read git files when --no-gitconfig is given + unused variables by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1728](https://github.com/dandavison/delta/pull/1728) - tests: add insta for snapshot testing by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1739](https://github.com/dandavison/delta/pull/1739) - tests: set terminal width to 43 by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1741](https://github.com/dandavison/delta/pull/1741) - Fix panic when blame-palette is empty by [@​thorio](https://github.com/thorio) in [https://github.com/dandavison/delta/pull/1737](https://github.com/dandavison/delta/pull/1737) - Make relative-paths work with binary files by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1740](https://github.com/dandavison/delta/pull/1740) - Fix github links from master to main by [@​madeddie](https://github.com/madeddie) in [https://github.com/dandavison/delta/pull/1709](https://github.com/dandavison/delta/pull/1709) - Update `terminal-colorsaurus` by [@​bash](https://github.com/bash) in [https://github.com/dandavison/delta/pull/1699](https://github.com/dandavison/delta/pull/1699) - Make less version >= 633 behave like previous versions wrt. Nerd Fonts by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1762](https://github.com/dandavison/delta/pull/1762) - Update `catppuccin-latte` casing in `LIGHT_SYNTAX_THEMES` list by [@​injust](https://github.com/injust) in [https://github.com/dandavison/delta/pull/1745](https://github.com/dandavison/delta/pull/1745) - deps: bump libc from 0.2.153 to 0.2.155 by [@​wxpppp](https://github.com/wxpppp) in [https://github.com/dandavison/delta/pull/1715](https://github.com/dandavison/delta/pull/1715) - Add missing `--file-*-label` option to `--navigate` docs by [@​injust](https://github.com/injust) in [https://github.com/dandavison/delta/pull/1744](https://github.com/dandavison/delta/pull/1744) - Fix copy-paste typo by [@​injust](https://github.com/injust) in [https://github.com/dandavison/delta/pull/1767](https://github.com/dandavison/delta/pull/1767) - Update syntect to 5.2.0 by [@​timhillgit](https://github.com/timhillgit) in [https://github.com/dandavison/delta/pull/1672](https://github.com/dandavison/delta/pull/1672) - Disable light mode detection in tests by [@​bash](https://github.com/bash) in [https://github.com/dandavison/delta/pull/1765](https://github.com/dandavison/delta/pull/1765) - Add --max-syntax-highlighting-length, set to 400 by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1746](https://github.com/dandavison/delta/pull/1746) - chore: cleanup brew formula file in favor of core tap by [@​chenrui333](https://github.com/chenrui333) in [https://github.com/dandavison/delta/pull/1773](https://github.com/dandavison/delta/pull/1773) - wrap --help output, fix rust 1.80 build by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1440](https://github.com/dandavison/delta/pull/1440) - Fix delta-toggle shell script by [@​dandavison](https://github.com/dandavison) in [https://github.com/dandavison/delta/pull/1794](https://github.com/dandavison/delta/pull/1794) - Do not wrap short help (-h) output by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1800](https://github.com/dandavison/delta/pull/1800) - Implement --diff-args by [@​dandavison](https://github.com/dandavison) in [https://github.com/dandavison/delta/pull/1697](https://github.com/dandavison/delta/pull/1697) - Handle ambiguous diff header, '--- ' can also be present in a minus hunk by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1787](https://github.com/dandavison/delta/pull/1787) - cd: build binaries targeting GNU libc on ubuntu-20.04, not latest by [@​th1000s](https://github.com/th1000s) in [https://github.com/dandavison/delta/pull/1805](https://github.com/dandavison/delta/pull/1805) #### New Contributors - [@​martinml](https://github.com/martinml) made their first contribution in [https://github.com/dandavison/delta/pull/1683](https://github.com/dandavison/delta/pull/1683) - [@​thorio](https://github.com/thorio) made their first contribution in [https://github.com/dandavison/delta/pull/1737](https://github.com/dandavison/delta/pull/1737) - [@​madeddie](https://github.com/madeddie) made their first contribution in [https://github.com/dandavison/delta/pull/1709](https://github.com/dandavison/delta/pull/1709) - [@​injust](https://github.com/injust) made their first contribution in [https://github.com/dandavison/delta/pull/1745](https://github.com/dandavison/delta/pull/1745) - [@​wxpppp](https://github.com/wxpppp) made their first contribution in [https://github.com/dandavison/delta/pull/1715](https://github.com/dandavison/delta/pull/1715) - [@​timhillgit](https://github.com/timhillgit) made their first contribution in [https://github.com/dandavison/delta/pull/1672](https://github.com/dandavison/delta/pull/1672) - [@​chenrui333](https://github.com/chenrui333) made their first contribution in [https://github.com/dandavison/delta/pull/1773](https://github.com/dandavison/delta/pull/1773) **Full Changelog**: dandavison/delta@0.17.0...0.18.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/izumin5210/dotfiles). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: izumin5210-update-aqua-checksum[bot] <169593670+izumin5210-update-aqua-checksum[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix a regression introduced by feec45b (Fix warning highlight for trailing whitespace (#1037), 2023-05-17) where trailing space at the end of an unchanged token is highlighted if the token follows an insertion. This happens because when the token is split in two to separate trailing whitespace the two halves end up being tagged with different edit operations. This can be seen in the test changes in
test_infer_edits_14andtest_infer_edits_16introduced by feec45b which changed the operation fromPlusNooptoInsertionwhen splitting trailing whitespace from unchanged tokens. Fix this by using the same operation when adding both halves of a split token and correcting the tests.Fixes #1658