Skip to content

Commit

Permalink
Fix: Fix 'Add heading' mutation to not strip first line for pages wit…
Browse files Browse the repository at this point in the history 
…hout newline between the page's title and its first line (very rare case) (#116)

Fixes #115

Co-authored-by: Leonard Jonathan Oh <[email protected]>
  • Loading branch information
@mikelehen @leojonathanoh
mikelehen and leojonathanoh authored Jul 7, 2022
1 parent 2e477d7 commit 4e72372
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 33 deletions.
51 changes: 19 additions & 32 deletions ConvertOneNote2MarkDown-v2.Tests.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,6 @@ Describe 'New-SectionGroupConversionConfig' -Tag 'Unit' {
$result.Count | Should -Be 48

foreach ($pageCfg in $result) {
# The first line will be replaced by page header (8 lines)
$fakeMarkdownContent = ''

# Mutate
Expand Down Expand Up @@ -1177,9 +1176,7 @@ Describe 'New-SectionGroupConversionConfig' -Tag 'Unit' {
# 15 pages from 'test' notebook, 15 pages from 'test2' notebook
$result.Count | Should -Be 48

# The first line will be replaced by page header (8 lines)
$fakeMarkdownContent = @"
hello world$( [char]0x00A0 )
- foo
Expand All @@ -1205,7 +1202,7 @@ hello world$( [char]0x00A0 )

# Should remove newlines between bullets, and remove non-breaking spaces. Ignore first 8 lines for page header
$split = $mutated -split "`n"
$expectedBody = $split[8..($split.Count - 1)] -join "`n"
$expectedBody = $split[7..($split.Count - 1)] -join "`n"
$expectedBody | Should -Be $( @"
hello world
- foo
Expand Down Expand Up @@ -1237,7 +1234,7 @@ some other text

# Should keep newlines between bullets, and keep non-breaking spaces. Ignore first 8 lines for page header
$split = $mutated -split "`n"
$expectedBody = $split[8..($split.Count - 1)] -join "`n"
$expectedBody = $split[7..($split.Count - 1)] -join "`n"
$expectedBody | Should -Be $( @"
hello world$( [char]0x00A0 )
- foo
Expand Down Expand Up @@ -1265,9 +1262,7 @@ hello world$( [char]0x00A0 )
$result.Count | Should -Be 48

foreach ($pageCfg in $result) {
# The first line will be replaced by page header (8 lines)
$fakeMarkdownContent = @"
hello\$\^\\\*\_\[\]world
foo\bar\0
"@
Expand All @@ -1281,9 +1276,9 @@ foo\bar\0

# Should remove all backslashes. Ignore first 8 lines for page header
$fakeMarkdownContent = $fakeMarkdownContent -split "`n"
$fakeMarkdownContent.Count | Should -Be 10
$fakeMarkdownContent[8] | Should -Be 'hello$^*_[]world'
$fakeMarkdownContent[9] | Should -Be 'foobar0'
$fakeMarkdownContent.Count | Should -Be 9
$fakeMarkdownContent[7] | Should -Be 'hello$^*_[]world'
$fakeMarkdownContent[8] | Should -Be 'foobar0'
}
$params['Config']['keepescape']['value'] = 2

Expand All @@ -1293,9 +1288,7 @@ foo\bar\0
$result.Count | Should -Be 48

foreach ($pageCfg in $result) {
# The first line will be replaced by page header (8 lines)
$fakeMarkdownContent = @'
hello\$\^\\\*\_\[\]world
foo\bar\0
'@
Expand All @@ -1309,9 +1302,9 @@ foo\bar\0

# Should remove backslashes that precede non-alphanumeric characters. Ignore first 8 lines for page header
$fakeMarkdownContent = $fakeMarkdownContent -split "`n"
$fakeMarkdownContent.Count | Should -Be 10
$fakeMarkdownContent[8] | Should -Be 'hello$^\*_[]world'
$fakeMarkdownContent[9] | Should -Be 'foo\bar\0'
$fakeMarkdownContent.Count | Should -Be 9
$fakeMarkdownContent[7] | Should -Be 'hello$^\*_[]world'
$fakeMarkdownContent[8] | Should -Be 'foo\bar\0'
}

$params['Config']['keepescape']['value'] = 3
Expand All @@ -1322,9 +1315,7 @@ foo\bar\0
$result.Count | Should -Be 48

foreach ($pageCfg in $result) {
# The first line will be replaced by page header (8 lines)
$fakeMarkdownContent = @'
hello\$\^\\\*\_\[\]world
foo\bar\0
'@
Expand All @@ -1338,9 +1329,9 @@ foo\bar\0

# Should keep backslashes. Ignore first 8 lines for page header
$fakeMarkdownContent = $fakeMarkdownContent -split "`n"
$fakeMarkdownContent.Count | Should -Be 10
$fakeMarkdownContent[8] | Should -Be 'hello\$\^\\\*\_\[\]world'
$fakeMarkdownContent[9] | Should -Be 'foo\bar\0'
$fakeMarkdownContent.Count | Should -Be 9
$fakeMarkdownContent[7] | Should -Be 'hello\$\^\\\*\_\[\]world'
$fakeMarkdownContent[8] | Should -Be 'foo\bar\0'
}
}

Expand All @@ -1353,9 +1344,7 @@ foo\bar\0
$result.Count | Should -Be 48

foreach ($pageCfg in $result) {
# The first line will be replaced by page header (8 lines)
$fakeMarkdownContent = @"
foo`r`nbar`r`nbaz
"@

Expand All @@ -1368,10 +1357,10 @@ foo`r`nbar`r`nbaz

# Should remove CRs. Ignore first 8 lines for page header
$fakeMarkdownContent = $fakeMarkdownContent -split "`n"
$fakeMarkdownContent.Count | Should -Be 11
$fakeMarkdownContent[8] | Should -Match '^foo$'
$fakeMarkdownContent[9] | Should -Match '^bar$'
$fakeMarkdownContent[10] | Should -Match '^baz$'`
$fakeMarkdownContent.Count | Should -Be 10
$fakeMarkdownContent[7] | Should -Match '^foo$'
$fakeMarkdownContent[8] | Should -Match '^bar$'
$fakeMarkdownContent[9] | Should -Match '^baz$'`
}

$params['Config']['newlineCharacter']['value'] = 2
Expand All @@ -1382,9 +1371,7 @@ foo`r`nbar`r`nbaz
$result.Count | Should -Be 48

foreach ($pageCfg in $result) {
# The first line will be replaced by page header (8 lines)
$fakeMarkdownContent = @"
foo`r`nbar`r`nbaz
"@
# Mutate
Expand All @@ -1396,10 +1383,10 @@ foo`r`nbar`r`nbaz

# Should retain CRs. Ignore first 8 lines for page header
$fakeMarkdownContent = $fakeMarkdownContent -split "`n"
$fakeMarkdownContent.Count | Should -Be 11
$fakeMarkdownContent[8] | Should -Match "^foo`r$"
$fakeMarkdownContent[9] | Should -Match "^bar`r$"
$fakeMarkdownContent[10] | Should -Match "^baz$"
$fakeMarkdownContent.Count | Should -Be 10
$fakeMarkdownContent[7] | Should -Match "^foo`r$"
$fakeMarkdownContent[8] | Should -Match "^bar`r$"
$fakeMarkdownContent[9] | Should -Match "^baz$"
}
}

Expand Down
2 changes: 1 addition & 1 deletion ConvertOneNote2MarkDown-v2.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ Function New-SectionGroupConversionConfig {
description = 'Add heading'
replacements = @(
@{
searchRegex = '^[^\r\n]*'
searchRegex = '^\s*'
replacement = & {
$heading = "# $( $pageCfg['object'].name )"
if ($config['headerTimestampEnabled']['value'] -eq 1) {
Expand Down

0 comments on commit 4e72372

Please sign in to comment.