From 293d3d3091709d3312d22e34c4a81fde3e3f3f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Henrique=20Guard=C3=A3o=20Gandarez?=
 <gandarez@gmail.com>
Date: Sun, 27 Aug 2023 17:57:28 -0300
Subject: [PATCH] remove reference to Chroma v1

---
 go.mod                       |  1 -
 go.sum                       |  3 ---
 pkg/deps/c_test.go           |  4 ++--
 pkg/deps/javascript_test.go  |  4 ++--
 pkg/language/chroma/jsp.go   | 11 +++++++----
 pkg/language/chroma/slurm.go | 11 +++++++----
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/go.mod b/go.mod
index 2d3b7a6b..94b86d60 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,6 @@ go 1.21
 
 require (
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
-	github.com/alecthomas/chroma v0.10.0
 	github.com/alecthomas/chroma/v2 v2.8.0
 	github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964
 	github.com/dlclark/regexp2 v1.10.0
diff --git a/go.sum b/go.sum
index 609db365..f438c3ac 100644
--- a/go.sum
+++ b/go.sum
@@ -44,8 +44,6 @@ github.com/alecthomas/assert v1.0.0 h1:3XmGh/PSuLzDbK3W2gUbRXwgW5lqPkuqvRgeQ30FI
 github.com/alecthomas/assert v1.0.0/go.mod h1:va/d2JC+M7F6s+80kl/R3G7FUiW6JzUO+hPhLyJ36ZY=
 github.com/alecthomas/assert/v2 v2.2.1 h1:XivOgYcduV98QCahG8T5XTezV5bylXe+lBxLG2K2ink=
 github.com/alecthomas/assert/v2 v2.2.1/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
-github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
-github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
 github.com/alecthomas/colour v0.1.0 h1:nOE9rJm6dsZ66RGWYSFrXw461ZIt9A6+nHgL7FRrDUk=
 github.com/alecthomas/colour v0.1.0/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
 github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
@@ -65,7 +63,6 @@ github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0=
 github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
diff --git a/pkg/deps/c_test.go b/pkg/deps/c_test.go
index 910a2b33..043ba66a 100644
--- a/pkg/deps/c_test.go
+++ b/pkg/deps/c_test.go
@@ -6,8 +6,8 @@ import (
 	"github.com/wakatime/wakatime-cli/pkg/deps"
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"
 
-	"github.com/alecthomas/chroma"
-	"github.com/alecthomas/chroma/lexers"
+	"github.com/alecthomas/chroma/v2"
+	"github.com/alecthomas/chroma/v2/lexers"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/pkg/deps/javascript_test.go b/pkg/deps/javascript_test.go
index e45fd19d..189c49f4 100644
--- a/pkg/deps/javascript_test.go
+++ b/pkg/deps/javascript_test.go
@@ -6,8 +6,8 @@ import (
 	"github.com/wakatime/wakatime-cli/pkg/deps"
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"
 
-	"github.com/alecthomas/chroma"
-	"github.com/alecthomas/chroma/lexers"
+	"github.com/alecthomas/chroma/v2"
+	"github.com/alecthomas/chroma/v2/lexers"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/pkg/language/chroma/jsp.go b/pkg/language/chroma/jsp.go
index 4a1caa38..6b2685f9 100644
--- a/pkg/language/chroma/jsp.go
+++ b/pkg/language/chroma/jsp.go
@@ -3,9 +3,11 @@ package chroma
 import (
 	"strings"
 
-	"github.com/alecthomas/chroma/lexers/j"
-	"github.com/alecthomas/chroma/v2"
+	"github.com/wakatime/wakatime-cli/pkg/heartbeat"
 	"github.com/wakatime/wakatime-cli/pkg/xml"
+
+	"github.com/alecthomas/chroma/v2"
+	"github.com/alecthomas/chroma/v2/lexers"
 )
 
 // JSP lexer.
@@ -30,8 +32,9 @@ func (l JSP) Lexer() chroma.Lexer {
 	lexer.SetAnalyser(func(text string) float32 {
 		var result float32
 
-		if analyser, ok := j.Java.(chroma.Analyser); ok {
-			result = analyser.AnalyseText(text) - 0.01
+		java := lexers.Get(heartbeat.LanguageJava.StringChroma())
+		if java != nil {
+			result = java.AnalyseText(text) - 0.01
 		}
 
 		if xml.MatchString(text) {
diff --git a/pkg/language/chroma/slurm.go b/pkg/language/chroma/slurm.go
index 30cb9f86..1ad97e94 100644
--- a/pkg/language/chroma/slurm.go
+++ b/pkg/language/chroma/slurm.go
@@ -1,8 +1,10 @@
 package chroma
 
 import (
-	"github.com/alecthomas/chroma/lexers/b"
+	"github.com/wakatime/wakatime-cli/pkg/heartbeat"
+
 	"github.com/alecthomas/chroma/v2"
+	"github.com/alecthomas/chroma/v2/lexers"
 )
 
 // Slurm lexer. Lexer for (ba|k|z|)sh Slurm scripts.
@@ -24,11 +26,12 @@ func (l Slurm) Lexer() chroma.Lexer {
 	)
 
 	lexer.SetAnalyser(func(text string) float32 {
-		if analyser, ok := b.Bash.(chroma.Analyser); ok {
-			return analyser.AnalyseText(text)
+		bash := lexers.Get(heartbeat.LanguageBash.StringChroma())
+		if bash == nil {
+			return 0
 		}
 
-		return 0
+		return bash.AnalyseText(text)
 	})
 
 	return lexer