Bumps the go-modules-updates group with 11 updates in the /backend directory: | Package | From | To | | --- | --- | --- | | [github.com/PuerkitoBio/goquery](https://github.com/PuerkitoBio/goquery) | `1.10.2` | `1.11.0` | | [github.com/alecthomas/chroma/v2](https://github.com/alecthomas/chroma) | `2.15.0` | `2.20.0` | | [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) | `5.2.1` | `5.2.3` | | [github.com/go-chi/cors](https://github.com/go-chi/cors) | `1.2.1` | `1.2.2` | | [github.com/go-pkgz/jrpc](https://github.com/go-pkgz/jrpc) | `0.3.1` | `0.4.0` | | [github.com/go-pkgz/lgr](https://github.com/go-pkgz/lgr) | `0.12.0` | `0.12.1` | | [github.com/go-pkgz/rest](https://github.com/go-pkgz/rest) | `1.20.3` | `1.20.4` | | [github.com/golang-jwt/jwt/v5](https://github.com/golang-jwt/jwt) | `5.2.2` | `5.3.0` | | [github.com/stretchr/testify](https://github.com/stretchr/testify) | `1.10.0` | `1.11.1` | | [go.etcd.io/bbolt](https://github.com/etcd-io/bbolt) | `1.4.0` | `1.4.3` | | [golang.org/x/image](https://github.com/golang/image) | `0.26.0` | `0.33.0` | Updates `github.com/PuerkitoBio/goquery` from 1.10.2 to 1.11.0 - [Release notes](https://github.com/PuerkitoBio/goquery/releases) - [Commits](https://github.com/PuerkitoBio/goquery/compare/v1.10.2...v1.11.0) Updates `github.com/alecthomas/chroma/v2` from 2.15.0 to 2.20.0 - [Release notes](https://github.com/alecthomas/chroma/releases) - [Commits](https://github.com/alecthomas/chroma/compare/v2.15.0...v2.20.0) Updates `github.com/go-chi/chi/v5` from 5.2.1 to 5.2.3 - [Release notes](https://github.com/go-chi/chi/releases) - [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md) - [Commits](https://github.com/go-chi/chi/compare/v5.2.1...v5.2.3) Updates `github.com/go-chi/cors` from 1.2.1 to 1.2.2 - [Release notes](https://github.com/go-chi/cors/releases) - [Commits](https://github.com/go-chi/cors/compare/v1.2.1...v1.2.2) Updates `github.com/go-pkgz/jrpc` from 0.3.1 to 0.4.0 - [Release notes](https://github.com/go-pkgz/jrpc/releases) - [Commits](https://github.com/go-pkgz/jrpc/compare/v0.3.1...v0.4.0) Updates `github.com/go-pkgz/lgr` from 0.12.0 to 0.12.1 - [Release notes](https://github.com/go-pkgz/lgr/releases) - [Commits](https://github.com/go-pkgz/lgr/compare/v0.12.0...v0.12.1) Updates `github.com/go-pkgz/rest` from 1.20.3 to 1.20.4 - [Release notes](https://github.com/go-pkgz/rest/releases) - [Commits](https://github.com/go-pkgz/rest/compare/v1.20.3...v1.20.4) Updates `github.com/golang-jwt/jwt/v5` from 5.2.2 to 5.3.0 - [Release notes](https://github.com/golang-jwt/jwt/releases) - [Commits](https://github.com/golang-jwt/jwt/compare/v5.2.2...v5.3.0) Updates `github.com/stretchr/testify` from 1.10.0 to 1.11.1 - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.10.0...v1.11.1) Updates `go.etcd.io/bbolt` from 1.4.0 to 1.4.3 - [Release notes](https://github.com/etcd-io/bbolt/releases) - [Commits](https://github.com/etcd-io/bbolt/compare/v1.4.0...v1.4.3) Updates `golang.org/x/image` from 0.26.0 to 0.33.0 - [Commits](https://github.com/golang/image/compare/v0.26.0...v0.33.0) --- updated-dependencies: - dependency-name: github.com/PuerkitoBio/goquery dependency-version: 1.11.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-modules-updates - dependency-name: github.com/alecthomas/chroma/v2 dependency-version: 2.20.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-modules-updates - dependency-name: github.com/go-chi/chi/v5 dependency-version: 5.2.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-modules-updates - dependency-name: github.com/go-chi/cors dependency-version: 1.2.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-modules-updates - dependency-name: github.com/go-pkgz/jrpc dependency-version: 0.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-modules-updates - dependency-name: github.com/go-pkgz/lgr dependency-version: 0.12.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-modules-updates - dependency-name: github.com/go-pkgz/rest dependency-version: 1.20.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-modules-updates - dependency-name: github.com/golang-jwt/jwt/v5 dependency-version: 5.3.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-modules-updates - dependency-name: github.com/stretchr/testify dependency-version: 1.11.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-modules-updates - dependency-name: go.etcd.io/bbolt dependency-version: 1.4.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-modules-updates - dependency-name: golang.org/x/image dependency-version: 0.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-modules-updates ... Signed-off-by: dependabot[bot] <support@github.com>
162 lines
3.7 KiB
Go
162 lines
3.7 KiB
Go
package chroma
|
|
|
|
import (
|
|
"bytes"
|
|
)
|
|
|
|
type delegatingLexer struct {
|
|
root Lexer
|
|
language Lexer
|
|
}
|
|
|
|
// DelegatingLexer combines two lexers to handle the common case of a language embedded inside another, such as PHP
|
|
// inside HTML or PHP inside plain text.
|
|
//
|
|
// It takes two lexer as arguments: a root lexer and a language lexer. First everything is scanned using the language
|
|
// lexer, which must return "Other" for unrecognised tokens. Then all "Other" tokens are lexed using the root lexer.
|
|
// Finally, these two sets of tokens are merged.
|
|
//
|
|
// The lexers from the template lexer package use this base lexer.
|
|
func DelegatingLexer(root Lexer, language Lexer) Lexer {
|
|
return &delegatingLexer{
|
|
root: root,
|
|
language: language,
|
|
}
|
|
}
|
|
|
|
func (d *delegatingLexer) SetTracing(enable bool) {
|
|
if l, ok := d.language.(TracingLexer); ok {
|
|
l.SetTracing(enable)
|
|
}
|
|
if l, ok := d.root.(TracingLexer); ok {
|
|
l.SetTracing(enable)
|
|
}
|
|
}
|
|
|
|
func (d *delegatingLexer) AnalyseText(text string) float32 {
|
|
return d.root.AnalyseText(text)
|
|
}
|
|
|
|
func (d *delegatingLexer) SetAnalyser(analyser func(text string) float32) Lexer {
|
|
d.root.SetAnalyser(analyser)
|
|
return d
|
|
}
|
|
|
|
func (d *delegatingLexer) SetRegistry(r *LexerRegistry) Lexer {
|
|
d.root.SetRegistry(r)
|
|
d.language.SetRegistry(r)
|
|
return d
|
|
}
|
|
|
|
func (d *delegatingLexer) Config() *Config {
|
|
return d.language.Config()
|
|
}
|
|
|
|
// An insertion is the character range where language tokens should be inserted.
|
|
type insertion struct {
|
|
start, end int
|
|
tokens []Token
|
|
}
|
|
|
|
func (d *delegatingLexer) Tokenise(options *TokeniseOptions, text string) (Iterator, error) { // nolint: gocognit
|
|
tokens, err := Tokenise(Coalesce(d.language), options, text)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// Compute insertions and gather "Other" tokens.
|
|
others := &bytes.Buffer{}
|
|
insertions := []*insertion{}
|
|
var insert *insertion
|
|
offset := 0
|
|
var last Token
|
|
for _, t := range tokens {
|
|
if t.Type == Other {
|
|
if last != EOF && insert != nil && last.Type != Other {
|
|
insert.end = offset
|
|
}
|
|
others.WriteString(t.Value)
|
|
} else {
|
|
if last == EOF || last.Type == Other {
|
|
insert = &insertion{start: offset}
|
|
insertions = append(insertions, insert)
|
|
}
|
|
insert.tokens = append(insert.tokens, t)
|
|
}
|
|
last = t
|
|
offset += len(t.Value)
|
|
}
|
|
|
|
if len(insertions) == 0 {
|
|
return d.root.Tokenise(options, text)
|
|
}
|
|
|
|
// Lex the other tokens.
|
|
rootTokens, err := Tokenise(Coalesce(d.root), options, others.String())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Interleave the two sets of tokens.
|
|
var out []Token
|
|
offset = 0 // Offset into text.
|
|
tokenIndex := 0
|
|
nextToken := func() Token {
|
|
if tokenIndex >= len(rootTokens) {
|
|
return EOF
|
|
}
|
|
t := rootTokens[tokenIndex]
|
|
tokenIndex++
|
|
return t
|
|
}
|
|
insertionIndex := 0
|
|
nextInsertion := func() *insertion {
|
|
if insertionIndex >= len(insertions) {
|
|
return nil
|
|
}
|
|
i := insertions[insertionIndex]
|
|
insertionIndex++
|
|
return i
|
|
}
|
|
t := nextToken()
|
|
i := nextInsertion()
|
|
for t != EOF || i != nil {
|
|
// fmt.Printf("%d->%d:%q %d->%d:%q\n", offset, offset+len(t.Value), t.Value, i.start, i.end, Stringify(i.tokens...))
|
|
if t == EOF || (i != nil && i.start < offset+len(t.Value)) {
|
|
var l Token
|
|
l, t = splitToken(t, i.start-offset)
|
|
if l != EOF {
|
|
out = append(out, l)
|
|
offset += len(l.Value)
|
|
}
|
|
out = append(out, i.tokens...)
|
|
offset += i.end - i.start
|
|
if t == EOF {
|
|
t = nextToken()
|
|
}
|
|
i = nextInsertion()
|
|
} else {
|
|
out = append(out, t)
|
|
offset += len(t.Value)
|
|
t = nextToken()
|
|
}
|
|
}
|
|
return Literator(out...), nil
|
|
}
|
|
|
|
func splitToken(t Token, offset int) (l Token, r Token) {
|
|
if t == EOF {
|
|
return EOF, EOF
|
|
}
|
|
if offset == 0 {
|
|
return EOF, t
|
|
}
|
|
if offset == len(t.Value) {
|
|
return t, EOF
|
|
}
|
|
l = t.Clone()
|
|
r = t.Clone()
|
|
l.Value = l.Value[:offset]
|
|
r.Value = r.Value[offset:]
|
|
return
|
|
}
|