2017-09-30 12:44:22 +10:00
|
|
|
package chroma
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
)
|
|
|
|
|
|
|
|
type delegatingLexer struct {
|
|
|
|
root Lexer
|
|
|
|
language Lexer
|
|
|
|
}
|
|
|
|
|
2018-03-18 20:38:29 +11:00
|
|
|
// 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.
|
2017-09-30 12:44:22 +10:00
|
|
|
//
|
|
|
|
// The lexers from the template lexer package use this base lexer.
|
|
|
|
func DelegatingLexer(root Lexer, language Lexer) Lexer {
|
|
|
|
return &delegatingLexer{
|
|
|
|
root: root,
|
|
|
|
language: language,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Version 2 of Chroma
This cleans up the API in general, removing a bunch of deprecated stuff,
cleaning up circular imports, etc.
But the biggest change is switching to an optional XML format for the
regex lexer.
Having lexers defined only in Go is not ideal for a couple of reasons.
Firstly, it impedes a significant portion of contributors who use Chroma
in Hugo, but don't know Go. Secondly, it bloats the binary size of any
project that imports Chroma.
Why XML? YAML is an abomination and JSON is not human editable. XML
also compresses very well (eg. Go template lexer XML compresses from
3239 bytes to 718).
Why a new syntax format? All major existing formats rely on the
Oniguruma regex engine, which is extremely complex and for which there
is no Go port.
Why not earlier? Prior to the existence of fs.FS this was not a viable
option.
Benchmarks:
$ hyperfine --warmup 3 \
'./chroma.master --version' \
'./chroma.xml-pre-opt --version' \
'./chroma.xml --version'
Benchmark 1: ./chroma.master --version
Time (mean ± σ): 5.3 ms ± 0.5 ms [User: 3.6 ms, System: 1.4 ms]
Range (min … max): 4.2 ms … 6.6 ms 233 runs
Benchmark 2: ./chroma.xml-pre-opt --version
Time (mean ± σ): 50.6 ms ± 0.5 ms [User: 52.4 ms, System: 3.6 ms]
Range (min … max): 49.2 ms … 51.5 ms 51 runs
Benchmark 3: ./chroma.xml --version
Time (mean ± σ): 6.9 ms ± 1.1 ms [User: 5.1 ms, System: 1.5 ms]
Range (min … max): 5.7 ms … 19.9 ms 196 runs
Summary
'./chroma.master --version' ran
1.30 ± 0.23 times faster than './chroma.xml --version'
9.56 ± 0.83 times faster than './chroma.xml-pre-opt --version'
A slight increase in init time, but I think this is okay given the
increase in flexibility.
And binary size difference:
$ du -h lexers.test*
$ du -sh chroma* 951371ms
8.8M chroma.master
7.8M chroma.xml
7.8M chroma.xml-pre-opt
Benchmarks:
$ hyperfine --warmup 3 \
'./chroma.master --version' \
'./chroma.xml-pre-opt --version' \
'./chroma.xml --version'
Benchmark 1: ./chroma.master --version
Time (mean ± σ): 5.3 ms ± 0.5 ms [User: 3.6 ms, System: 1.4 ms]
Range (min … max): 4.2 ms … 6.6 ms 233 runs
Benchmark 2: ./chroma.xml-pre-opt --version
Time (mean ± σ): 50.6 ms ± 0.5 ms [User: 52.4 ms, System: 3.6 ms]
Range (min … max): 49.2 ms … 51.5 ms 51 runs
Benchmark 3: ./chroma.xml --version
Time (mean ± σ): 6.9 ms ± 1.1 ms [User: 5.1 ms, System: 1.5 ms]
Range (min … max): 5.7 ms … 19.9 ms 196 runs
Summary
'./chroma.master --version' ran
1.30 ± 0.23 times faster than './chroma.xml --version'
9.56 ± 0.83 times faster than './chroma.xml-pre-opt --version'
Incompatible changes:
- (*RegexLexer).SetAnalyser: changed from func(func(text string) float32) *RegexLexer to func(func(text string) float32) Lexer
- (*TokenType).UnmarshalJSON: removed
- Lexer.AnalyseText: added
- Lexer.SetAnalyser: added
- Lexer.SetRegistry: added
- MustNewLazyLexer: removed
- MustNewLexer: changed from func(*Config, Rules) *RegexLexer to func(*Config, func() Rules) *RegexLexer
- Mutators: changed from func(...Mutator) MutatorFunc to func(...Mutator) Mutator
- NewLazyLexer: removed
- NewLexer: changed from func(*Config, Rules) (*RegexLexer, error) to func(*Config, func() Rules) (*RegexLexer, error)
- Pop: changed from func(int) MutatorFunc to func(int) Mutator
- Push: changed from func(...string) MutatorFunc to func(...string) Mutator
- TokenType.MarshalJSON: removed
- Using: changed from func(Lexer) Emitter to func(string) Emitter
- UsingByGroup: changed from func(func(string) Lexer, int, int, ...Emitter) Emitter to func(int, int, ...Emitter) Emitter
2022-01-03 23:51:17 +11:00
|
|
|
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
|
|
|
|
}
|
|
|
|
|
2017-09-30 12:44:22 +10:00
|
|
|
func (d *delegatingLexer) Config() *Config {
|
|
|
|
return d.language.Config()
|
|
|
|
}
|
|
|
|
|
2018-03-18 20:38:29 +11:00
|
|
|
// An insertion is the character range where language tokens should be inserted.
|
|
|
|
type insertion struct {
|
|
|
|
start, end int
|
2018-11-03 16:22:51 -07:00
|
|
|
tokens []Token
|
2017-09-30 12:44:22 +10:00
|
|
|
}
|
|
|
|
|
2019-10-15 21:01:41 +11:00
|
|
|
func (d *delegatingLexer) Tokenise(options *TokeniseOptions, text string) (Iterator, error) { // nolint: gocognit
|
2018-03-18 20:38:29 +11:00
|
|
|
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
|
2017-09-30 12:44:22 +10:00
|
|
|
offset := 0
|
2018-11-03 16:22:51 -07:00
|
|
|
var last Token
|
2018-03-18 20:38:29 +11:00
|
|
|
for _, t := range tokens {
|
2017-09-30 12:44:22 +10:00
|
|
|
if t.Type == Other {
|
2018-11-03 16:22:51 -07:00
|
|
|
if last != EOF && insert != nil && last.Type != Other {
|
2018-03-18 20:38:29 +11:00
|
|
|
insert.end = offset
|
2017-09-30 12:44:22 +10:00
|
|
|
}
|
2018-03-18 20:38:29 +11:00
|
|
|
others.WriteString(t.Value)
|
2017-09-30 12:44:22 +10:00
|
|
|
} else {
|
2018-11-03 16:22:51 -07:00
|
|
|
if last == EOF || last.Type == Other {
|
2018-03-18 20:38:29 +11:00
|
|
|
insert = &insertion{start: offset}
|
|
|
|
insertions = append(insertions, insert)
|
2017-09-30 12:44:22 +10:00
|
|
|
}
|
2018-03-18 20:38:29 +11:00
|
|
|
insert.tokens = append(insert.tokens, t)
|
2017-09-30 12:44:22 +10:00
|
|
|
}
|
2018-03-18 20:38:29 +11:00
|
|
|
last = t
|
2017-09-30 12:44:22 +10:00
|
|
|
offset += len(t.Value)
|
|
|
|
}
|
|
|
|
|
2018-03-18 20:38:29 +11:00
|
|
|
if len(insertions) == 0 {
|
|
|
|
return d.root.Tokenise(options, text)
|
2017-09-30 12:44:22 +10:00
|
|
|
}
|
2018-03-18 20:38:29 +11:00
|
|
|
|
|
|
|
// Lex the other tokens.
|
2018-03-19 10:32:36 +11:00
|
|
|
rootTokens, err := Tokenise(Coalesce(d.root), options, others.String())
|
2017-09-30 12:44:22 +10:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2018-03-18 20:38:29 +11:00
|
|
|
// Interleave the two sets of tokens.
|
2018-11-03 16:22:51 -07:00
|
|
|
var out []Token
|
2018-03-19 10:32:36 +11:00
|
|
|
offset = 0 // Offset into text.
|
|
|
|
tokenIndex := 0
|
2018-11-03 16:22:51 -07:00
|
|
|
nextToken := func() Token {
|
2018-03-19 10:32:36 +11:00
|
|
|
if tokenIndex >= len(rootTokens) {
|
2018-11-03 16:22:51 -07:00
|
|
|
return EOF
|
2017-09-30 12:44:22 +10:00
|
|
|
}
|
2018-03-19 10:32:36 +11:00
|
|
|
t := rootTokens[tokenIndex]
|
|
|
|
tokenIndex++
|
2018-03-18 20:38:29 +11:00
|
|
|
return t
|
|
|
|
}
|
2018-03-19 10:32:36 +11:00
|
|
|
insertionIndex := 0
|
|
|
|
nextInsertion := func() *insertion {
|
|
|
|
if insertionIndex >= len(insertions) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
i := insertions[insertionIndex]
|
|
|
|
insertionIndex++
|
|
|
|
return i
|
|
|
|
}
|
|
|
|
t := nextToken()
|
|
|
|
i := nextInsertion()
|
2018-11-03 16:22:51 -07:00
|
|
|
for t != EOF || i != nil {
|
2018-03-19 10:32:36 +11:00
|
|
|
// fmt.Printf("%d->%d:%q %d->%d:%q\n", offset, offset+len(t.Value), t.Value, i.start, i.end, Stringify(i.tokens...))
|
2018-11-03 16:22:51 -07:00
|
|
|
if t == EOF || (i != nil && i.start < offset+len(t.Value)) {
|
|
|
|
var l Token
|
2018-03-19 10:32:36 +11:00
|
|
|
l, t = splitToken(t, i.start-offset)
|
2018-11-03 16:22:51 -07:00
|
|
|
if l != EOF {
|
2018-03-19 10:32:36 +11:00
|
|
|
out = append(out, l)
|
|
|
|
offset += len(l.Value)
|
|
|
|
}
|
|
|
|
out = append(out, i.tokens...)
|
|
|
|
offset += i.end - i.start
|
2018-11-03 16:22:51 -07:00
|
|
|
if t == EOF {
|
2018-03-19 10:32:36 +11:00
|
|
|
t = nextToken()
|
|
|
|
}
|
|
|
|
i = nextInsertion()
|
|
|
|
} else {
|
2018-03-18 20:38:29 +11:00
|
|
|
out = append(out, t)
|
|
|
|
offset += len(t.Value)
|
2018-03-19 10:32:36 +11:00
|
|
|
t = nextToken()
|
2018-03-18 20:38:29 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return Literator(out...), nil
|
|
|
|
}
|
2017-09-30 12:44:22 +10:00
|
|
|
|
2018-11-03 16:22:51 -07:00
|
|
|
func splitToken(t Token, offset int) (l Token, r Token) {
|
|
|
|
if t == EOF {
|
|
|
|
return EOF, EOF
|
2018-03-19 10:32:36 +11:00
|
|
|
}
|
2018-03-18 20:38:29 +11:00
|
|
|
if offset == 0 {
|
2018-11-03 16:22:51 -07:00
|
|
|
return EOF, t
|
2018-03-18 20:38:29 +11:00
|
|
|
}
|
2018-03-19 10:32:36 +11:00
|
|
|
if offset == len(t.Value) {
|
2018-11-03 16:22:51 -07:00
|
|
|
return t, EOF
|
2018-03-18 20:38:29 +11:00
|
|
|
}
|
|
|
|
l = t.Clone()
|
|
|
|
r = t.Clone()
|
|
|
|
l.Value = l.Value[:offset]
|
|
|
|
r.Value = r.Value[offset:]
|
|
|
|
return
|
2017-09-30 12:44:22 +10:00
|
|
|
}
|