Move lexers to lexer package

cmd/run.go

@@ -26,7 +26,7 @@ import (
 	"github.com/wakatime/wakatime-cli/pkg/exitcode"
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"
 	"github.com/wakatime/wakatime-cli/pkg/ini"
-	"github.com/wakatime/wakatime-cli/pkg/language/chroma"
+	"github.com/wakatime/wakatime-cli/pkg/lexer"
 	"github.com/wakatime/wakatime-cli/pkg/log"
 	"github.com/wakatime/wakatime-cli/pkg/offline"
 	"github.com/wakatime/wakatime-cli/pkg/vipertools"
@@ -70,7 +70,7 @@ func Run(cmd *cobra.Command, v *viper.Viper) {
 	}
 
 	// register all custom lexers
-	if err := chroma.RegisterAll(); err != nil {
+	if err := lexer.RegisterAll(); err != nil {
 		log.Fatalf("failed to register custom lexers: %s", err)
 	}
 

pkg/language/language_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"
 	"github.com/wakatime/wakatime-cli/pkg/language"
-	"github.com/wakatime/wakatime-cli/pkg/language/chroma"
+	"github.com/wakatime/wakatime-cli/pkg/lexer"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -257,7 +257,7 @@ func TestDetect_FSharp_Over_Forth(t *testing.T) {
 }
 
 func TestDetect_ChromaTopLanguagesRetrofit(t *testing.T) {
-	err := chroma.RegisterAll()
+	err := lexer.RegisterAll()
 	require.NoError(t, err)
 
 	tests := map[string]struct {

pkg/language/chroma/actionscript3.go → pkg/lexer/actionscript3.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"regexp"

pkg/language/chroma/actionscript3_test.go → pkg/lexer/actionscript3_test.go

@@ -1,10 +1,10 @@
-package chroma_test
+package lexer_test
 
 import (
 	"os"
 	"testing"
 
-	"github.com/wakatime/wakatime-cli/pkg/language/chroma"
+	"github.com/wakatime/wakatime-cli/pkg/lexer"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -28,13 +28,13 @@ func TestActionScript3_AnalyseText(t *testing.T) {
 		},
 	}
 
-	l := chroma.ActionScript3{}.Lexer()
-
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
 			data, err := os.ReadFile(test.Filepath)
 			assert.NoError(t, err)
 
+			l := lexer.ActionScript3{}.Lexer()
+
 			assert.Equal(t, test.Expected, l.AnalyseText(string(data)))
 		})
 	}

pkg/language/chroma/adl.go → pkg/lexer/adl.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/agda.go → pkg/lexer/agda.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/aheui.go → pkg/lexer/aheui.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/alloy.go → pkg/lexer/alloy.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/ambienttalk.go → pkg/lexer/ambienttalk.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/ampl.go → pkg/lexer/ampl.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/arrow.go → pkg/lexer/arrow.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/aspectj.go → pkg/lexer/aspectj.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/aspxcsharp.go → pkg/lexer/aspxcsharp.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"regexp"

pkg/language/chroma/aspxcsharp_test.go → pkg/lexer/aspxcsharp_test.go

@@ -1,10 +1,10 @@
-package chroma_test
+package lexer_test
 
 import (
 	"os"
 	"testing"
 
-	"github.com/wakatime/wakatime-cli/pkg/language/chroma"
+	"github.com/wakatime/wakatime-cli/pkg/lexer"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -24,13 +24,13 @@ func TestAspxCSharp_AnalyseText(t *testing.T) {
 		},
 	}
 
-	l := chroma.AspxCSharp{}.Lexer()
-
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
 			data, err := os.ReadFile(test.Filepath)
 			assert.NoError(t, err)
 
+			l := lexer.AspxCSharp{}.Lexer()
+
 			assert.Equal(t, test.Expected, l.AnalyseText(string(data)))
 		})
 	}

pkg/language/chroma/aspxvb.go → pkg/lexer/aspxvb.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"regexp"

pkg/language/chroma/aspxvb_test.go → pkg/lexer/aspxvb_test.go

@@ -1,10 +1,10 @@
-package chroma_test
+package lexer_test
 
 import (
 	"os"
 	"testing"
 
-	"github.com/wakatime/wakatime-cli/pkg/language/chroma"
+	"github.com/wakatime/wakatime-cli/pkg/lexer"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -24,13 +24,13 @@ func TestAspxVBNet_AnalyseText(t *testing.T) {
 		},
 	}
 
-	l := chroma.AspxVBNet{}.Lexer()
-
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
 			data, err := os.ReadFile(test.Filepath)
 			assert.NoError(t, err)
 
+			l := lexer.AspxVBNet{}.Lexer()
+
 			assert.Equal(t, test.Expected, l.AnalyseText(string(data)))
 		})
 	}

pkg/language/chroma/asymptote.go → pkg/lexer/asymptote.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/augeas.go → pkg/lexer/augeas.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/bare.go → pkg/lexer/bare.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/bbcbasic.go → pkg/lexer/bbcbasic.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"strings"

pkg/language/chroma/bbcbasic_test.go → pkg/lexer/bbcbasic_test.go

@@ -1,10 +1,10 @@
-package chroma_test
+package lexer_test
 
 import (
 	"os"
 	"testing"
 
-	"github.com/wakatime/wakatime-cli/pkg/language/chroma"
+	"github.com/wakatime/wakatime-cli/pkg/lexer"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -24,13 +24,13 @@ func TestBBCBasic_AnalyseText(t *testing.T) {
 		},
 	}
 
-	l := chroma.BBCBasic{}.Lexer()
-
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
 			data, err := os.ReadFile(test.Filepath)
 			assert.NoError(t, err)
 
+			l := lexer.BBCBasic{}.Lexer()
+
 			assert.Equal(t, test.Expected, l.AnalyseText(string(data)))
 		})
 	}

pkg/language/chroma/bbcode.go → pkg/lexer/bbcode.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/bc.go → pkg/lexer/bc.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/befunge.go → pkg/lexer/befunge.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/blazor.go → pkg/lexer/blazor.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/blitzmax.go → pkg/lexer/blitzmax.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/boa.go → pkg/lexer/boa.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/boo.go → pkg/lexer/boo.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/boogie.go → pkg/lexer/boogie.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/brainfuck.go → pkg/lexer/brainfuck.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"strings"

pkg/language/chroma/brainfuck_test.go → pkg/lexer/brainfuck_test.go

@@ -1,10 +1,10 @@
-package chroma_test
+package lexer_test
 
 import (
 	"os"
 	"testing"
 
-	"github.com/wakatime/wakatime-cli/pkg/language/chroma"
+	"github.com/wakatime/wakatime-cli/pkg/lexer"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -28,13 +28,13 @@ func TestBrainfuck_AnalyseText(t *testing.T) {
 		},
 	}
 
-	l := chroma.Brainfuck{}.Lexer()
-
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
 			data, err := os.ReadFile(test.Filepath)
 			assert.NoError(t, err)
 
+			l := lexer.Brainfuck{}.Lexer()
+
 			assert.Equal(t, test.Expected, l.AnalyseText(string(data)))
 		})
 	}

pkg/language/chroma/bst.go → pkg/lexer/bst.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"

pkg/language/chroma/bugs.go → pkg/lexer/bugs.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"regexp"

pkg/language/chroma/bugs_test.go → pkg/lexer/bugs_test.go

@@ -1,10 +1,10 @@
-package chroma_test
+package lexer_test
 
 import (
 	"os"
 	"testing"
 
-	"github.com/wakatime/wakatime-cli/pkg/language/chroma"
+	"github.com/wakatime/wakatime-cli/pkg/lexer"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -13,7 +13,7 @@ func TestBBUGS_AnalyseText(t *testing.T) {
 	data, err := os.ReadFile("testdata/bugs_basic.bug")
 	assert.NoError(t, err)
 
-	l := chroma.BUGS{}.Lexer()
+	l := lexer.BUGS{}.Lexer()
 
 	assert.Equal(t, float32(0.7), l.AnalyseText(string(data)))
 }

pkg/language/chroma/c_test.go → pkg/lexer/c_test.go

@@ -1,4 +1,4 @@
-package chroma_test
+package lexer_test
 
 import (
 	"os"

pkg/language/chroma/ca65assembler.go → pkg/lexer/ca65assembler.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"regexp"

pkg/language/chroma/ca65assembler_test.go → pkg/lexer/ca65assembler_test.go

@@ -1,10 +1,10 @@
-package chroma_test
+package lexer_test
 
 import (
 	"os"
 	"testing"
 
-	"github.com/wakatime/wakatime-cli/pkg/language/chroma"
+	"github.com/wakatime/wakatime-cli/pkg/lexer"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -13,7 +13,7 @@ func TestCa65Assembler_AnalyseText(t *testing.T) {
 	data, err := os.ReadFile("testdata/ca65assembler_comment.s")
 	assert.NoError(t, err)
 
-	l := chroma.Ca65Assembler{}.Lexer()
+	l := lexer.Ca65Assembler{}.Lexer()
 
 	assert.Equal(t, float32(0.9), l.AnalyseText(string(data)))
 }

pkg/language/chroma/cadl.go → pkg/lexer/cadl.go

@@ -1,4 +1,4 @@
-package chroma
+package lexer
 
 import (
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"