Skip to content

Commit

Permalink
Moved lexers into alphabetical sub-packages.
Browse files Browse the repository at this point in the history
This was done to speed up incremental compilation when working on
lexers. That is, modifying a single lexer will no longer require
recompiling all lexers.

This is a (slightly) backwards breaking change in that lexers are no
longer exported directly in the lexers package. The registry API is
"aliased" at the old location.
  • Loading branch information
alecthomas committed Feb 15, 2018
1 parent 50a6b50 commit 563aadc
Show file tree
Hide file tree
Showing 158 changed files with 566 additions and 424 deletions.
2 changes: 1 addition & 1 deletion formatters/html/html_test.go
Expand Up @@ -23,7 +23,7 @@ func BenchmarkHTMLFormatter(b *testing.B) {
formatter := New()
b.ResetTimer()
for i := 0; i < b.N; i++ {
it, err := lexers.Go.Tokenise(nil, "package main\nfunc main()\n{\nprintln(`hello world`)\n}\n")
it, err := lexers.Get("go").Tokenise(nil, "package main\nfunc main()\n{\nprintln(`hello world`)\n}\n")
assert.NoError(b, err)
err = formatter.Format(ioutil.Discard, styles.Fallback, it)
assert.NoError(b, err)
Expand Down
5 changes: 3 additions & 2 deletions lexers/abnf.go → lexers/a/abnf.go
@@ -1,11 +1,12 @@
package lexers
package a

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Abnf lexer.
var Abnf = Register(MustNewLexer(
var Abnf = internal.Register(MustNewLexer(
&Config{
Name: "ABNF",
Aliases: []string{"abnf"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/actionscript.go → lexers/a/actionscript.go
@@ -1,11 +1,12 @@
package lexers
package a

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Actionscript lexer.
var Actionscript = Register(MustNewLexer(
var Actionscript = internal.Register(MustNewLexer(
&Config{
Name: "ActionScript",
Aliases: []string{"as", "actionscript"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/actionscript3.go → lexers/a/actionscript3.go
@@ -1,11 +1,12 @@
package lexers
package a

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Actionscript 3 lexer.
var Actionscript3 = Register(MustNewLexer(
var Actionscript3 = internal.Register(MustNewLexer(
&Config{
Name: "ActionScript 3",
Aliases: []string{"as3", "actionscript3"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/ada.go → lexers/a/ada.go
@@ -1,11 +1,12 @@
package lexers
package a

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Ada lexer.
var Ada = Register(MustNewLexer(
var Ada = internal.Register(MustNewLexer(
&Config{
Name: "Ada",
Aliases: []string{"ada", "ada95", "ada2005"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/angular2.go → lexers/a/angular2.go
@@ -1,11 +1,12 @@
package lexers
package a

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Angular2 lexer.
var Angular2 = Register(MustNewLexer(
var Angular2 = internal.Register(MustNewLexer(
&Config{
Name: "Angular2",
Aliases: []string{"ng2"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/antlr.go → lexers/a/antlr.go
@@ -1,11 +1,12 @@
package lexers
package a

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// ANTLR lexer.
var ANTLR = Register(MustNewLexer(
var ANTLR = internal.Register(MustNewLexer(
&Config{
Name: "ANTLR",
Aliases: []string{"antlr"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/apache.go → lexers/a/apache.go
@@ -1,11 +1,12 @@
package lexers
package a

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Apacheconf lexer.
var Apacheconf = Register(MustNewLexer(
var Apacheconf = internal.Register(MustNewLexer(
&Config{
Name: "ApacheConf",
Aliases: []string{"apacheconf", "aconf", "apache"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/apl.go → lexers/a/apl.go
@@ -1,11 +1,12 @@
package lexers
package a

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Apl lexer.
var Apl = Register(MustNewLexer(
var Apl = internal.Register(MustNewLexer(
&Config{
Name: "APL",
Aliases: []string{"apl"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/applescript.go → lexers/a/applescript.go
@@ -1,11 +1,12 @@
package lexers
package a

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Applescript lexer.
var Applescript = Register(MustNewLexer(
var Applescript = internal.Register(MustNewLexer(
&Config{
Name: "AppleScript",
Aliases: []string{"applescript"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/awk.go → lexers/a/awk.go
@@ -1,11 +1,12 @@
package lexers
package a

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Awk lexer.
var Awk = Register(MustNewLexer(
var Awk = internal.Register(MustNewLexer(
&Config{
Name: "Awk",
Aliases: []string{"awk", "gawk", "mawk", "nawk"},
Expand Down
33 changes: 0 additions & 33 deletions lexers/api_test.go

This file was deleted.

5 changes: 3 additions & 2 deletions lexers/bash.go → lexers/b/bash.go
@@ -1,15 +1,16 @@
package lexers
package b

import (
"regexp"

. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

var bashAnalyserRe = regexp.MustCompile(`(?m)^#!.*/bin/(?:env |)(?:bash|zsh|sh|ksh)`)

// Bash lexer.
var Bash = Register(MustNewLexer(
var Bash = internal.Register(MustNewLexer(
&Config{
Name: "Bash",
Aliases: []string{"bash", "sh", "ksh", "zsh", "shell"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/batch.go → lexers/b/batch.go
@@ -1,11 +1,12 @@
package lexers
package b

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Batchfile lexer.
var Batchfile = Register(MustNewLexer(
var Batchfile = internal.Register(MustNewLexer(
&Config{
Name: "Batchfile",
Aliases: []string{"bat", "batch", "dosbatch", "winbatch"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/blitz.go → lexers/b/blitz.go
@@ -1,11 +1,12 @@
package lexers
package b

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Blitzbasic lexer.
var Blitzbasic = Register(MustNewLexer(
var Blitzbasic = internal.Register(MustNewLexer(
&Config{
Name: "BlitzBasic",
Aliases: []string{"blitzbasic", "b3d", "bplus"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/bnf.go → lexers/b/bnf.go
@@ -1,11 +1,12 @@
package lexers
package b

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Bnf lexer.
var Bnf = Register(MustNewLexer(
var Bnf = internal.Register(MustNewLexer(
&Config{
Name: "BNF",
Aliases: []string{"bnf"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/brainfuck.go → lexers/b/brainfuck.go
@@ -1,11 +1,12 @@
package lexers
package b

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Brainfuck lexer.
var Brainfuck = Register(MustNewLexer(
var Brainfuck = internal.Register(MustNewLexer(
&Config{
Name: "Brainfuck",
Aliases: []string{"brainfuck", "bf"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/c.go → lexers/c/c.go
@@ -1,11 +1,12 @@
package lexers
package c

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// C lexer.
var C = Register(MustNewLexer(
var C = internal.Register(MustNewLexer(
&Config{
Name: "C",
Aliases: []string{"c"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/capnproto.go → lexers/c/capnproto.go
@@ -1,11 +1,12 @@
package lexers
package c

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Cap'N'Proto Proto lexer.
var CapNProto = Register(MustNewLexer(
var CapNProto = internal.Register(MustNewLexer(
&Config{
Name: "Cap'n Proto",
Aliases: []string{"capnp"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/ceylon.go → lexers/c/ceylon.go
@@ -1,11 +1,12 @@
package lexers
package c

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Ceylon lexer.
var Ceylon = Register(MustNewLexer(
var Ceylon = internal.Register(MustNewLexer(
&Config{
Name: "Ceylon",
Aliases: []string{"ceylon"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/cfengine3.go → lexers/c/cfengine3.go
@@ -1,11 +1,12 @@
package lexers
package c

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Cfengine3 lexer.
var Cfengine3 = Register(MustNewLexer(
var Cfengine3 = internal.Register(MustNewLexer(
&Config{
Name: "CFEngine3",
Aliases: []string{"cfengine3", "cf3"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/chaiscript.go → lexers/c/chaiscript.go
@@ -1,11 +1,12 @@
package lexers
package c

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Chaiscript lexer.
var Chaiscript = Register(MustNewLexer(
var Chaiscript = internal.Register(MustNewLexer(
&Config{
Name: "ChaiScript",
Aliases: []string{"chai", "chaiscript"},
Expand Down
6 changes: 4 additions & 2 deletions lexers/cheetah.go → lexers/c/cheetah.go
@@ -1,11 +1,13 @@
package lexers
package c

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
. "github.com/alecthomas/chroma/lexers/p" // nolint
)

// Cheetah lexer.
var Cheetah = Register(MustNewLexer(
var Cheetah = internal.Register(MustNewLexer(
&Config{
Name: "Cheetah",
Aliases: []string{"cheetah", "spitfire"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/cl.go → lexers/c/cl.go
@@ -1,11 +1,12 @@
package lexers
package c

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Common Lisp lexer.
var CommonLisp = Register(MustNewLexer(
var CommonLisp = internal.Register(MustNewLexer(
&Config{
Name: "Common Lisp",
Aliases: []string{"common-lisp", "cl", "lisp"},
Expand Down
5 changes: 3 additions & 2 deletions lexers/clojure.go → lexers/c/clojure.go
@@ -1,11 +1,12 @@
package lexers
package c

import (
. "github.com/alecthomas/chroma" // nolint
"github.com/alecthomas/chroma/lexers/internal"
)

// Clojure lexer.
var Clojure = Register(MustNewLexer(
var Clojure = internal.Register(MustNewLexer(
&Config{
Name: "Clojure",
Aliases: []string{"clojure", "clj"},
Expand Down

0 comments on commit 563aadc

Please sign in to comment.