Squashed commit of the following:

commit 95479c8ad744db48386a5c78e54ef8da80e9120b
Author: Chris Lane <chris@chris-allen-lane.com>
Date:   Wed Apr 28 12:26:32 2021 -0400

    chore(version): bump version to 4.2.1

commit 6956f51cae
Author: Chris Lane <chris@chris-allen-lane.com>
Date:   Wed Apr 28 12:24:21 2021 -0400

    fix(Makefile): `vendor-update`

    Update the `vendor-update` build target to run `go mod vendor` after
    updating dependencies.

commit 0aca411279
Author: Chris Lane <chris@chris-allen-lane.com>
Date:   Wed Apr 28 12:23:24 2021 -0400

    chore(deps): update dependencies

commit e847956b02
Author: Chris Lane <chris@chris-allen-lane.com>
Date:   Wed Apr 28 08:26:51 2021 -0400

    chore(deps): build updates

    - Upgrade `go` to `1.16.3`

    - Attempt to fix build errors regarding dependencies
This commit is contained in:
Chris Lane
2021-04-28 12:35:32 -04:00
parent 883a17092f
commit 55b18b4897
495 changed files with 16144 additions and 2927 deletions

View File

@ -7,14 +7,18 @@ import (
)
// Genshi Text lexer.
var GenshiText = internal.Register(MustNewLexer(
var GenshiText = internal.Register(MustNewLazyLexer(
&Config{
Name: "Genshi Text",
Aliases: []string{"genshitext"},
Filenames: []string{},
MimeTypes: []string{"application/x-genshi-text", "text/x-genshi"},
},
Rules{
genshiTextRules,
))
func genshiTextRules() Rules {
return Rules{
"root": {
{`[^#$\s]+`, Other, nil},
{`^(\s*)(##.*)$`, ByGroups(Text, Comment), nil},
@ -33,11 +37,11 @@ var GenshiText = internal.Register(MustNewLexer(
{`(?<!\$)(\$\{)(.+?)(\})`, ByGroups(CommentPreproc, Using(Python), CommentPreproc), nil},
{`(?<!\$)(\$)([a-zA-Z_][\w.]*)`, NameVariable, nil},
},
},
))
}
}
// Html+Genshi lexer.
var GenshiHTMLTemplate = internal.Register(MustNewLexer(
var GenshiHTMLTemplate = internal.Register(MustNewLazyLexer(
&Config{
Name: "Genshi HTML",
Aliases: []string{"html+genshi", "html+kid"},
@ -50,7 +54,7 @@ var GenshiHTMLTemplate = internal.Register(MustNewLexer(
))
// Genshi lexer.
var Genshi = internal.Register(MustNewLexer(
var Genshi = internal.Register(MustNewLazyLexer(
&Config{
Name: "Genshi",
Aliases: []string{"genshi", "kid", "xml+genshi", "xml+kid"},
@ -62,53 +66,55 @@ var Genshi = internal.Register(MustNewLexer(
genshiMarkupRules,
))
var genshiMarkupRules = Rules{
"root": {
{`[^<$]+`, Other, nil},
{`(<\?python)(.*?)(\?>)`, ByGroups(CommentPreproc, Using(Python), CommentPreproc), nil},
{`<\s*(script|style)\s*.*?>.*?<\s*/\1\s*>`, Other, nil},
{`<\s*py:[a-zA-Z0-9]+`, NameTag, Push("pytag")},
{`<\s*[a-zA-Z0-9:.]+`, NameTag, Push("tag")},
Include("variable"),
{`[<$]`, Other, nil},
},
"pytag": {
{`\s+`, Text, nil},
{`[\w:-]+\s*=`, NameAttribute, Push("pyattr")},
{`/?\s*>`, NameTag, Pop(1)},
},
"pyattr": {
{`(")(.*?)(")`, ByGroups(LiteralString, Using(Python), LiteralString), Pop(1)},
{`(')(.*?)(')`, ByGroups(LiteralString, Using(Python), LiteralString), Pop(1)},
{`[^\s>]+`, LiteralString, Pop(1)},
},
"tag": {
{`\s+`, Text, nil},
{`py:[\w-]+\s*=`, NameAttribute, Push("pyattr")},
{`[\w:-]+\s*=`, NameAttribute, Push("attr")},
{`/?\s*>`, NameTag, Pop(1)},
},
"attr": {
{`"`, LiteralString, Push("attr-dstring")},
{`'`, LiteralString, Push("attr-sstring")},
{`[^\s>]*`, LiteralString, Pop(1)},
},
"attr-dstring": {
{`"`, LiteralString, Pop(1)},
Include("strings"),
{`'`, LiteralString, nil},
},
"attr-sstring": {
{`'`, LiteralString, Pop(1)},
Include("strings"),
{`'`, LiteralString, nil},
},
"strings": {
{`[^"'$]+`, LiteralString, nil},
Include("variable"),
},
"variable": {
{`(?<!\$)(\$\{)(.+?)(\})`, ByGroups(CommentPreproc, Using(Python), CommentPreproc), nil},
{`(?<!\$)(\$)([a-zA-Z_][\w\.]*)`, NameVariable, nil},
},
func genshiMarkupRules() Rules {
return Rules{
"root": {
{`[^<$]+`, Other, nil},
{`(<\?python)(.*?)(\?>)`, ByGroups(CommentPreproc, Using(Python), CommentPreproc), nil},
{`<\s*(script|style)\s*.*?>.*?<\s*/\1\s*>`, Other, nil},
{`<\s*py:[a-zA-Z0-9]+`, NameTag, Push("pytag")},
{`<\s*[a-zA-Z0-9:.]+`, NameTag, Push("tag")},
Include("variable"),
{`[<$]`, Other, nil},
},
"pytag": {
{`\s+`, Text, nil},
{`[\w:-]+\s*=`, NameAttribute, Push("pyattr")},
{`/?\s*>`, NameTag, Pop(1)},
},
"pyattr": {
{`(")(.*?)(")`, ByGroups(LiteralString, Using(Python), LiteralString), Pop(1)},
{`(')(.*?)(')`, ByGroups(LiteralString, Using(Python), LiteralString), Pop(1)},
{`[^\s>]+`, LiteralString, Pop(1)},
},
"tag": {
{`\s+`, Text, nil},
{`py:[\w-]+\s*=`, NameAttribute, Push("pyattr")},
{`[\w:-]+\s*=`, NameAttribute, Push("attr")},
{`/?\s*>`, NameTag, Pop(1)},
},
"attr": {
{`"`, LiteralString, Push("attr-dstring")},
{`'`, LiteralString, Push("attr-sstring")},
{`[^\s>]*`, LiteralString, Pop(1)},
},
"attr-dstring": {
{`"`, LiteralString, Pop(1)},
Include("strings"),
{`'`, LiteralString, nil},
},
"attr-sstring": {
{`'`, LiteralString, Pop(1)},
Include("strings"),
{`'`, LiteralString, nil},
},
"strings": {
{`[^"'$]+`, LiteralString, nil},
Include("variable"),
},
"variable": {
{`(?<!\$)(\$\{)(.+?)(\})`, ByGroups(CommentPreproc, Using(Python), CommentPreproc), nil},
{`(?<!\$)(\$)([a-zA-Z_][\w\.]*)`, NameVariable, nil},
},
}
}