From ab9214768de4ce10032d3fe7ec8c7b2932ead892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Franc=CC=A7ois=20YUEN?= Date: Mon, 19 Nov 2018 17:33:54 +0100 Subject: [PATCH] importer: fix jekyll import highlight options --- commands/import_jekyll.go | 47 +++++++++++++++++++++++++++++++++- commands/import_jekyll_test.go | 3 +++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/commands/import_jekyll.go b/commands/import_jekyll.go index fc3a84027..6a708ac06 100644 --- a/commands/import_jekyll.go +++ b/commands/import_jekyll.go @@ -25,6 +25,7 @@ import ( "strconv" "strings" "time" + "unicode" "github.com/gohugoio/hugo/parser/metadecoders" @@ -545,7 +546,6 @@ func convertJekyllContent(m interface{}, content string) string { }{ {regexp.MustCompile("(?i)"), ""}, {regexp.MustCompile(`\{%\s*raw\s*%\}\s*(.*?)\s*\{%\s*endraw\s*%\}`), "$1"}, - {regexp.MustCompile(`{%\s*highlight\s*(.*?)\s*%}`), "{{< highlight $1 >}}"}, {regexp.MustCompile(`{%\s*endhighlight\s*%}`), "{{< / highlight >}}"}, } @@ -559,6 +559,7 @@ func convertJekyllContent(m interface{}, content string) string { }{ // Octopress image tag: http://octopress.org/docs/plugins/image-tag/ {regexp.MustCompile(`{%\s+img\s*(.*?)\s*%}`), replaceImageTag}, + {regexp.MustCompile(`{%\s*highlight\s*(.*?)\s*%}`), replaceHighlightTag}, } for _, replace := range replaceListFunc { @@ -568,6 +569,50 @@ func convertJekyllContent(m interface{}, content string) string { return content } +func replaceHighlightTag(match string) string { + r := regexp.MustCompile(`{%\s*highlight\s*(.*?)\s*%}`) + parts := r.FindStringSubmatch(match) + lastQuote := rune(0) + f := func(c rune) bool { + switch { + case c == lastQuote: + lastQuote = rune(0) + return false + case lastQuote != rune(0): + return false + case unicode.In(c, unicode.Quotation_Mark): + lastQuote = c + return false + default: + return unicode.IsSpace(c) + } + } + // splitting string by space but considering quoted section + items := strings.FieldsFunc(parts[1], f) + + result := bytes.NewBufferString("{{< highlight ") + result.WriteString(items[0]) // language + options := items[1:] + for i, opt := range options { + opt = strings.Replace(opt, "\"", "", -1) + if opt == "linenos" { + opt = "linenos=table" + } + if i == 0 { + opt = " \"" + opt + } + if i < len(options)-1 { + opt += "," + } else if i == len(options)-1 { + opt += "\"" + } + result.WriteString(opt) + } + + result.WriteString(" >}}") + return result.String() +} + func replaceImageTag(match string) string { r := regexp.MustCompile(`{%\s+img\s*(\p{L}*)\s+([\S]*/[\S]+)\s+(\d*)\s*(\d*)\s*(.*?)\s*%}`) result := bytes.NewBufferString("{{< figure ") diff --git a/commands/import_jekyll_test.go b/commands/import_jekyll_test.go index cb22e9cd7..e0402a7a6 100644 --- a/commands/import_jekyll_test.go +++ b/commands/import_jekyll_test.go @@ -97,6 +97,9 @@ func TestConvertJekyllContent(t *testing.T) { {map[interface{}]interface{}{}, "{% highlight go %}\nvar s int\n{% endhighlight %}", "{{< highlight go >}}\nvar s int\n{{< / highlight >}}"}, + {map[interface{}]interface{}{}, + "{% highlight go linenos hl_lines=\"1 2\" %}\nvar s string\nvar i int\n{% endhighlight %}", + "{{< highlight go \"linenos=table,hl_lines=1 2\" >}}\nvar s string\nvar i int\n{{< / highlight >}}"}, // Octopress image tag {map[interface{}]interface{}{},