go/chroma
1
0
Fork 0
mirror of https://github.com/alecthomas/chroma.git synced 2025-07-03 00:37:01 +02:00
Code Issues Releases Activity

Invert default "ensure newline" behaviour so that it is opt-in.

Browse Source 
See #47.
This commit is contained in:
Alec Thomas
2017-09-30 14:40:39 +10:00
parent 573c1d157d
commit ce3d6bf527
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coalesce_test.go
View File

@ -7,7 +7,7 @@ import (
) )
func TestCoalesce(t *testing.T) { func TestCoalesce(t *testing.T) {
lexer := Coalesce(MustNewLexer(&Config{DontEnsureNL: true}, Rules{ lexer := Coalesce(MustNewLexer(nil, Rules{
"root": []Rule{ "root": []Rule{
{`[!@#$%^&*()]`, Punctuation, nil}, {`[!@#$%^&*()]`, Punctuation, nil},
}, },

4
lexer.go
View File

@ -44,9 +44,9 @@ type Config struct {
// Strip all leading and trailing whitespace from the input // Strip all leading and trailing whitespace from the input
// StripAll bool // StripAll bool
// Make sure that the input does not end with a newline. This // Make sure that the input ends with a newline. This
// is required for some lexers that consume input linewise. // is required for some lexers that consume input linewise.
DontEnsureNL bool EnsureNL bool
// If given and greater than 0, expand tabs in the input. // If given and greater than 0, expand tabs in the input.
// TabSize int // TabSize int

1
lexers/make.go
View File

@ -11,6 +11,7 @@ var Makefile = Register(MustNewLexer(
Aliases: []string{"make", "makefile", "mf", "bsdmake"}, Aliases: []string{"make", "makefile", "mf", "bsdmake"},
Filenames: []string{"*.mak", "*.mk", "Makefile", "makefile", "Makefile.*", "GNUmakefile"}, Filenames: []string{"*.mak", "*.mk", "Makefile", "makefile", "Makefile.*", "GNUmakefile"},
MimeTypes: []string{"text/x-makefile"}, MimeTypes: []string{"text/x-makefile"},
EnsureNL: true,
}, },
Rules{ Rules{
"root": { "root": {

2
mutators_test.go
View File

@ -44,7 +44,7 @@ func TestInclude(t *testing.T) {
} }
func TestCombine(t *testing.T) { func TestCombine(t *testing.T) {
l := MustNewLexer(&Config{DontEnsureNL: true}, Rules{ l := MustNewLexer(nil, Rules{
"root": {{`hello`, String, Combined("world", "bye", "space")}}, "root": {{`hello`, String, Combined("world", "bye", "space")}},
"world": {{`world`, Name, nil}}, "world": {{`world`, Name, nil}},
"bye": {{`bye`, Name, nil}}, "bye": {{`bye`, Name, nil}},

2
regexp.go
View File

@ -300,7 +300,7 @@ func (r *RegexLexer) Tokenise(options *TokeniseOptions, text string) (Iterator,
if options == nil { if options == nil {
options = defaultOptions options = defaultOptions
} }
if !r.config.DontEnsureNL && !strings.HasSuffix(text, "\n") { if r.config.EnsureNL && !strings.HasSuffix(text, "\n") {
text += "\n" text += "\n"
} }
state := &LexerState{ state := &LexerState{

2
remap_test.go
View File

@ -7,7 +7,7 @@ import (
) )
func TestRemappingLexer(t *testing.T) { func TestRemappingLexer(t *testing.T) {
var lexer Lexer = MustNewLexer(&Config{DontEnsureNL: true}, Rules{ var lexer Lexer = MustNewLexer(nil, Rules{
"root": { "root": {
{`\s+`, Whitespace, nil}, {`\s+`, Whitespace, nil},
{`\w+`, Name, nil}, {`\w+`, Name, nil},