Skip to content

Commit 9fdb4f8

Browse files
zeripathlunny
andauthored
Update to go-org 1.3.2 (#12728)
* Update to go-org 1.3.2 Fix #12727 Signed-off-by: Andrew Thornton <[email protected]> * Fix unit test Signed-off-by: Andrew Thornton <[email protected]> Co-authored-by: Lunny Xiao <[email protected]>
1 parent e80eda7 commit 9fdb4f8

File tree

17 files changed

+10290
-9958
lines changed

17 files changed

+10290
-9958
lines changed

go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ require (
2727
github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 // indirect
2828
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc
2929
github.com/dgrijalva/jwt-go v3.2.0+incompatible
30+
github.com/dlclark/regexp2 v1.2.1 // indirect
3031
github.com/dustin/go-humanize v1.0.0
3132
github.com/editorconfig/editorconfig-core-go/v2 v2.1.1
3233
github.com/emirpasic/gods v1.12.0
@@ -73,7 +74,7 @@ require (
7374
github.com/mitchellh/go-homedir v1.1.0
7475
github.com/msteinert/pam v0.0.0-20151204160544-02ccfbfaf0cc
7576
github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5
76-
github.com/niklasfasching/go-org v0.1.9
77+
github.com/niklasfasching/go-org v1.3.2
7778
github.com/oliamb/cutter v0.2.2
7879
github.com/olivere/elastic/v7 v7.0.9
7980
github.com/pkg/errors v0.9.1
@@ -99,7 +100,7 @@ require (
99100
github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691
100101
github.com/yuin/goldmark-meta v0.0.0-20191126180153-f0638e958b60
101102
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
102-
golang.org/x/net v0.0.0-20200707034311-ab3426394381
103+
golang.org/x/net v0.0.0-20200904194848-62affa334b73
103104
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
104105
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae
105106
golang.org/x/text v0.3.3

go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8
194194
github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
195195
github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk=
196196
github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
197+
github.com/dlclark/regexp2 v1.2.1 h1:Ff/S0snjr1oZHUNOkvA/gP6KUaMg5vDDl3Qnhjnwgm8=
198+
github.com/dlclark/regexp2 v1.2.1/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
197199
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
198200
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
199201
github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q=
@@ -705,8 +707,8 @@ github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 h1:BvoENQQU+fZ9uukda/R
705707
github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
706708
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
707709
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
708-
github.com/niklasfasching/go-org v0.1.9 h1:Toz8WMIt+qJb52uYEk1YD/muLuOOmRt1CfkV+bKVMkI=
709-
github.com/niklasfasching/go-org v0.1.9/go.mod h1:AsLD6X7djzRIz4/RFZu8vwRL0VGjUvGZCCH1Nz0VdrU=
710+
github.com/niklasfasching/go-org v1.3.2 h1:ZKTSd+GdJYkoZl1pBXLR/k7DRiRXnmB96TRiHmHdzwI=
711+
github.com/niklasfasching/go-org v1.3.2/go.mod h1:AsLD6X7djzRIz4/RFZu8vwRL0VGjUvGZCCH1Nz0VdrU=
710712
github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
711713
github.com/nwaples/rardecode v1.0.0 h1:r7vGuS5akxOnR4JQSkko62RJ1ReCMXxQRPtxsiFMBOs=
712714
github.com/nwaples/rardecode v1.0.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
@@ -1010,6 +1012,8 @@ golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/
10101012
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
10111013
golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
10121014
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
1015+
golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA=
1016+
golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
10131017
golang.org/x/oauth2 v0.0.0-20180620175406-ef147856a6dd/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
10141018
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
10151019
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=

modules/markup/orgmode/orgmode_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ func TestRender_StandardLinks(t *testing.T) {
2727
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer))
2828
}
2929

30-
googleRendered := "<p>\n<a href=\"https://google.com/\" title=\"https://google.com/\">https://google.com/</a>\n</p>"
30+
googleRendered := "<p><a href=\"https://google.com/\" title=\"https://google.com/\">https://google.com/</a></p>"
3131
test("[[https://google.com/]]", googleRendered)
3232

3333
lnk := util.URLJoin(AppSubURL, "UncycloPage")
3434
test("[[UncycloPage][UncycloPage]]",
35-
"<p>\n<a href=\""+lnk+"\" title=\"UncycloPage\">UncycloPage</a>\n</p>")
35+
"<p><a href=\""+lnk+"\" title=\"UncycloPage\">UncycloPage</a></p>")
3636
}
3737

3838
func TestRender_Images(t *testing.T) {
@@ -48,5 +48,5 @@ func TestRender_Images(t *testing.T) {
4848
result := util.URLJoin(AppSubURL, url)
4949

5050
test("[[file:"+url+"]]",
51-
"<p>\n<img src=\""+result+"\" alt=\""+result+"\" title=\""+result+"\" />\n</p>")
51+
"<p><img src=\""+result+"\" alt=\""+result+"\" title=\""+result+"\" /></p>")
5252
}

vendor/github.com/dlclark/regexp2/.travis.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dlclark/regexp2/regexp.go

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dlclark/regexp2/syntax/parser.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/niklasfasching/go-org/org/block.go

Lines changed: 57 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/niklasfasching/go-org/org/document.go

Lines changed: 15 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/niklasfasching/go-org/org/headline.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)