Skip to content

Commit

Permalink
Merge #8555
Browse files Browse the repository at this point in the history
8555: Bump markdown from 0.2.0 to 0.3.1 r=vlad20012 a=dependabot[bot]

Bumps [markdown](https://github.com/JetBrains/markdown) from 0.2.0 to 0.3.1.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/JetBrains/markdown/commits">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.jetbrains:markdown&package-manager=gradle&previous-version=0.2.0&new-version=0.3.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

changelog: Fix parsing/highlighting of doc comment headers in some corner cases

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Arseniy Pendryak <a.pendryak@yandex.ru>
  • Loading branch information
3 people committed Mar 30, 2022
2 parents 5654112 + a4d7bc5 commit abbfca4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ project(":") {
}

dependencies {
implementation("org.jetbrains:markdown:0.2.0") {
implementation("org.jetbrains:markdown:0.3.1") {
exclude(module = "kotlin-runtime")
exclude(module = "kotlin-stdlib")
exclude(module = "kotlin-stdlib-common")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class RsDocHighlightingAnnotatorTest : RsAnnotatorTestBase(RsDocHighlightingAnno
/// ####### foo
/// #5 bolt
/// #hashtag
/// # there is tab here
/// <DOC_HEADING># there is tab here</DOC_HEADING>
/// \## foo
/// <DOC_HEADING> ### foo</DOC_HEADING>
/// <DOC_HEADING> ## foo</DOC_HEADING>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/// ###### Header 6
/// ####### Not a header
/// #not_a_header
/// # there is a tab here (not a header)
/// # there is a tab here
/// \## not a header
/// # Header 1 (offset 1)
/// # Header 1 (offset 2)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ FILE
PsiWhiteSpace('\n')
PsiElement(<DOC_GAP>)('///')
PsiWhiteSpace(' ')
PsiElement(<DOC_DATA>)('#\tthere is a tab here (not a header)')
RsDocAtxHeadingImpl(<DOC_ATX_HEADING>)
PsiElement(<DOC_DATA>)('#\tthere is a tab here')
PsiWhiteSpace('\n')
PsiElement(<DOC_GAP>)('///')
PsiWhiteSpace(' ')
Expand Down

0 comments on commit abbfca4

Please sign in to comment.