From 4183d56ab806affddce6256d7572daf2d4f6836e Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Tue, 15 Aug 2023 20:33:16 +0200 Subject: [PATCH] Upgrade chroma to fix Hax language detection --- go.mod | 2 +- go.sum | 4 ++-- pkg/heartbeat/language.go | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2f988b0b..c333ed32 100644 --- a/go.mod +++ b/go.mod @@ -50,6 +50,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/alecthomas/chroma => github.com/wakatime/chroma v0.10.0-wakatime.1 +replace github.com/alecthomas/chroma => github.com/wakatime/chroma v0.11.1-wakatime.1 replace github.com/matishsiao/goInfo => github.com/wakatime/goInfo v0.1.0-wakatime.8 diff --git a/go.sum b/go.sum index 5203fc2d..ac02bf8b 100644 --- a/go.sum +++ b/go.sum @@ -268,8 +268,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/wakatime/chroma v0.10.0-wakatime.1 h1:S3XwuOsibZY0hQlUyoJ9mak7K2kbrrfTh1X6XD2DK4c= -github.com/wakatime/chroma v0.10.0-wakatime.1/go.mod h1:OSQG4slLkpoTtTCq3MKBL8aAWm7MpXpc+EiNmYMZ2pE= +github.com/wakatime/chroma v0.11.1-wakatime.1 h1:OzURAeb27zHHupCmn4mtFsSEEj5RPlHGfZMDaXmpx2o= +github.com/wakatime/chroma v0.11.1-wakatime.1/go.mod h1:OSQG4slLkpoTtTCq3MKBL8aAWm7MpXpc+EiNmYMZ2pE= github.com/wakatime/goInfo v0.1.0-wakatime.8 h1:MgyeRnCkynEmUxLKXnYUAP5Dd+vhKxhqg6Nx1PdAZy4= github.com/wakatime/goInfo v0.1.0-wakatime.8/go.mod h1:aEt7p9Rvh67BYApmZwNDPpgircTO2kgdmDUoF/1QmwA= github.com/yookoala/realpath v1.0.0 h1:7OA9pj4FZd+oZDsyvXWQvjn5oBdcHRTV44PpdMSuImQ= diff --git a/pkg/heartbeat/language.go b/pkg/heartbeat/language.go index 0c3aee58..13416d5e 100644 --- a/pkg/heartbeat/language.go +++ b/pkg/heartbeat/language.go @@ -1087,6 +1087,8 @@ const ( LanguageRascal // LanguageRawToken represents the RawToken programming language. LanguageRawToken + // LanguageRazor represents the Razor programming language. + LanguageRazor // LanguageRConsole represents the RConsole programming language. LanguageRConsole // LanguageRd represents the Rd programming language. @@ -1225,6 +1227,8 @@ const ( LanguageSlice // LanguageSlim represents the Slim programming language. LanguageSlim + // LanguageSlint represents the Slint programming language. + LanguageSlint // LanguageSlurm represents the Slurm programming language. LanguageSlurm // LanguageSmali represents the Smali programming language. @@ -2076,6 +2080,7 @@ const ( languageRAMLStr = "RAML" languageRascalStr = "Rascal" languageRawTokenStr = "Raw token data" // nolint:gosec + languageRazorStr = "Razor" languageRConsoleStr = "RConsole" languageRdStr = "Rd" languageRDocStr = "RDoc" @@ -2146,6 +2151,7 @@ const ( languageSlashStr = "Slash" languageSliceStr = "Slice" languageSlimStr = "Slim" + languageSlintStr = "Slint" languageSlurmStr = "Slurm" languageSmaliStr = "Smali" languageSmalltalkStr = "Smalltalk" @@ -3431,6 +3437,8 @@ func ParseLanguage(s string) (Language, bool) { return LanguageRascal, true case normalizeString(languageRawTokenStr): return LanguageRawToken, true + case normalizeString(languageRazorStr): + return LanguageRazor, true case normalizeString(languageRConsoleStr): return LanguageRConsole, true case normalizeString(languageRdStr): @@ -3571,6 +3579,8 @@ func ParseLanguage(s string) (Language, bool) { return LanguageSlice, true case normalizeString(languageSlimStr): return LanguageSlim, true + case normalizeString(languageSlintStr): + return LanguageSlint, true case normalizeString(languageSlurmStr): return LanguageSlurm, true case normalizeString(languageSmaliStr): @@ -5069,6 +5079,8 @@ func (l Language) String() string { return languageRascalStr case LanguageRawToken: return languageRawTokenStr + case LanguageRazor: + return languageRazorStr case LanguageRConsole: return languageRConsoleStr case LanguageRd: @@ -5207,6 +5219,8 @@ func (l Language) String() string { return languageSliceStr case LanguageSlim: return languageSlimStr + case LanguageSlint: + return languageSlintStr case LanguageSlurm: return languageSlurmStr case LanguageSmali: