From c122e314bdb146639cec80be9318d76c79ab4433 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 5 May 2021 16:03:52 +0200 Subject: [PATCH 01/10] Update chroma to latest version v0.8.2-wakatime.7 --- go.mod | 2 +- go.sum | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index c8243efb..0e146139 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( gopkg.in/ini.v1 v1.62.0 ) -replace github.com/alecthomas/chroma => github.com/wakatime/chroma v0.8.2-wakatime.3 +replace github.com/alecthomas/chroma => github.com/wakatime/chroma v0.8.2-wakatime.7 replace github.com/spf13/viper => github.com/wakatime/viper v1.7.1-0.20210127133619-3adac62bd70f diff --git a/go.sum b/go.sum index d28fa3a6..7f0528a6 100644 --- a/go.sum +++ b/go.sum @@ -202,15 +202,14 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/wakatime/chroma v0.8.2-wakatime.3 h1:J/gf6+mW7FmJ653vgU+7zxuN2qzwAU3KNtyIkfDgezI= -github.com/wakatime/chroma v0.8.2-wakatime.3/go.mod h1:Mldbmbb8NHiOz8oC1HKR8xUQ0EPvAjZpKDyQl2nGrnQ= +github.com/wakatime/chroma v0.8.2-wakatime.7 h1:2fXUt39QsD9HwI0X8vMs6hU3lHLGSnsJDj5ZxWW49oM= +github.com/wakatime/chroma v0.8.2-wakatime.7/go.mod h1:Mldbmbb8NHiOz8oC1HKR8xUQ0EPvAjZpKDyQl2nGrnQ= github.com/wakatime/goInfo v0.1.0-wakatime.2 h1:CaPbE4l8yv6s2Oj+yAEkYHfMY6BJ09tNjdGboUvZu4g= github.com/wakatime/goInfo v0.1.0-wakatime.2/go.mod h1:aEt7p9Rvh67BYApmZwNDPpgircTO2kgdmDUoF/1QmwA= github.com/wakatime/viper v1.7.1-0.20210127133619-3adac62bd70f h1:l7cFA661os7j0s1Ub+jJ2Y9icZhfEGXXNa3/D8CFsMg= @@ -292,8 +291,6 @@ golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3 h1:kzM6+9dur93BcC2kVlYl34cHU+TYZLanmpSJHVMmL64= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210218155724-8ebf48af031b h1:lAZ0/chPUDWwjqosYR0X4M490zQhMsiJ4K3DbA7o+3g= -golang.org/x/sys v0.0.0-20210218155724-8ebf48af031b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= From 094b98f5d47eac9ae87d0788ab58a2b7e0fad0a6 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 5 May 2021 17:28:37 +0200 Subject: [PATCH 02/10] Add support for AMPL chroma spelling --- pkg/heartbeat/language.go | 5 +++++ pkg/heartbeat/language_test.go | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pkg/heartbeat/language.go b/pkg/heartbeat/language.go index 57cb6c58..bbff3426 100644 --- a/pkg/heartbeat/language.go +++ b/pkg/heartbeat/language.go @@ -2277,6 +2277,7 @@ const ( ) const ( + languageAMPLChromaStr = "Ampl" languageAssemblyChromaStr = "GAS" languageColdfusionHTMLChromaStr = "Coldfusion HTML" languageFSharpChromaStr = "FSharp" @@ -3837,6 +3838,8 @@ func ParseLanguage(s string) (Language, bool) { // nolint:gocyclo func ParseLanguageFromChroma(lexerName string) (Language, bool) { switch normalizeString(lexerName) { + case normalizeString(languageAMPLChromaStr): + return LanguageAMPL, true case normalizeString(languageAssemblyChromaStr): return LanguageAssembly, true case normalizeString(languageColdfusionHTMLChromaStr): @@ -5435,6 +5438,8 @@ func (l Language) String() string { // nolint:gocyclo func (l Language) StringChroma() string { switch l { + case LanguageAMPL: + return languageAMPLChromaStr case LanguageApacheConfig: return languageApacheConfStr case LanguageAssembly: diff --git a/pkg/heartbeat/language_test.go b/pkg/heartbeat/language_test.go index 08316bb1..02d7aaa6 100644 --- a/pkg/heartbeat/language_test.go +++ b/pkg/heartbeat/language_test.go @@ -857,6 +857,7 @@ func TestParseLanguage_Unknown(t *testing.T) { func TestParseLanguageFromChroma(t *testing.T) { tests := map[string]heartbeat.Language{ + "Ampl": heartbeat.LanguageAMPL, "Base Makefile": heartbeat.LanguageMakefile, "Coldfusion HTML": heartbeat.LanguageColdfusionHTML, "EmacsLisp": heartbeat.LanguageEmacsLisp, @@ -973,6 +974,7 @@ func TestLanguage_String_UnknownLanguage(t *testing.T) { func TestLanguage_StringChroma(t *testing.T) { tests := map[string]heartbeat.Language{ "ApacheConf": heartbeat.LanguageApacheConfig, + "Ampl": heartbeat.LanguageAMPL, "Base Makefile": heartbeat.LanguageMakefile, "Coldfusion HTML": heartbeat.LanguageColdfusionHTML, "EmacsLisp": heartbeat.LanguageEmacsLisp, From 95c77757ad212b16e916b73b25e6de2423f47478 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 5 May 2021 17:33:17 +0200 Subject: [PATCH 03/10] Add support for autohotkey chroma spelling --- pkg/heartbeat/language.go | 5 +++++ pkg/heartbeat/language_test.go | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pkg/heartbeat/language.go b/pkg/heartbeat/language.go index bbff3426..e5f10034 100644 --- a/pkg/heartbeat/language.go +++ b/pkg/heartbeat/language.go @@ -2279,6 +2279,7 @@ const ( const ( languageAMPLChromaStr = "Ampl" languageAssemblyChromaStr = "GAS" + languageAutoHotkeyChromaStr = "autohotkey" languageColdfusionHTMLChromaStr = "Coldfusion HTML" languageFSharpChromaStr = "FSharp" languageEmacsLispChromaStr = "EmacsLisp" @@ -3842,6 +3843,8 @@ func ParseLanguageFromChroma(lexerName string) (Language, bool) { return LanguageAMPL, true case normalizeString(languageAssemblyChromaStr): return LanguageAssembly, true + case normalizeString(languageAutoHotkeyChromaStr): + return LanguageAutoHotkey, true case normalizeString(languageColdfusionHTMLChromaStr): return LanguageColdfusionHTML, true case normalizeString(languageEmacsLispChromaStr): @@ -5444,6 +5447,8 @@ func (l Language) StringChroma() string { return languageApacheConfStr case LanguageAssembly: return languageAssemblyChromaStr + case LanguageAutoHotkey: + return languageAutoHotkeyChromaStr case LanguageColdfusionHTML: return languageColdfusionHTMLChromaStr case LanguageEmacsLisp: diff --git a/pkg/heartbeat/language_test.go b/pkg/heartbeat/language_test.go index 02d7aaa6..a34ef40b 100644 --- a/pkg/heartbeat/language_test.go +++ b/pkg/heartbeat/language_test.go @@ -858,6 +858,7 @@ func TestParseLanguage_Unknown(t *testing.T) { func TestParseLanguageFromChroma(t *testing.T) { tests := map[string]heartbeat.Language{ "Ampl": heartbeat.LanguageAMPL, + "autohotkey": heartbeat.LanguageAutoHotkey, "Base Makefile": heartbeat.LanguageMakefile, "Coldfusion HTML": heartbeat.LanguageColdfusionHTML, "EmacsLisp": heartbeat.LanguageEmacsLisp, @@ -975,6 +976,7 @@ func TestLanguage_StringChroma(t *testing.T) { tests := map[string]heartbeat.Language{ "ApacheConf": heartbeat.LanguageApacheConfig, "Ampl": heartbeat.LanguageAMPL, + "autohotkey": heartbeat.LanguageAutoHotkey, "Base Makefile": heartbeat.LanguageMakefile, "Coldfusion HTML": heartbeat.LanguageColdfusionHTML, "EmacsLisp": heartbeat.LanguageEmacsLisp, From 000bee81d7d2d3fbb9f7eb771c39a118ddbf7e58 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 5 May 2021 17:36:18 +0200 Subject: [PATCH 04/10] Add support for c-objdump chroma spelling --- pkg/heartbeat/language.go | 5 +++++ pkg/heartbeat/language_test.go | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pkg/heartbeat/language.go b/pkg/heartbeat/language.go index e5f10034..fdbd4903 100644 --- a/pkg/heartbeat/language.go +++ b/pkg/heartbeat/language.go @@ -2280,6 +2280,7 @@ const ( languageAMPLChromaStr = "Ampl" languageAssemblyChromaStr = "GAS" languageAutoHotkeyChromaStr = "autohotkey" + languageCObjdumpChromaStr = "c-objdump" languageColdfusionHTMLChromaStr = "Coldfusion HTML" languageFSharpChromaStr = "FSharp" languageEmacsLispChromaStr = "EmacsLisp" @@ -3845,6 +3846,8 @@ func ParseLanguageFromChroma(lexerName string) (Language, bool) { return LanguageAssembly, true case normalizeString(languageAutoHotkeyChromaStr): return LanguageAutoHotkey, true + case normalizeString(languageCObjdumpChromaStr): + return LanguageCObjdump, true case normalizeString(languageColdfusionHTMLChromaStr): return LanguageColdfusionHTML, true case normalizeString(languageEmacsLispChromaStr): @@ -5449,6 +5452,8 @@ func (l Language) StringChroma() string { return languageAssemblyChromaStr case LanguageAutoHotkey: return languageAutoHotkeyChromaStr + case LanguageCObjdump: + return languageCObjdumpChromaStr case LanguageColdfusionHTML: return languageColdfusionHTMLChromaStr case LanguageEmacsLisp: diff --git a/pkg/heartbeat/language_test.go b/pkg/heartbeat/language_test.go index a34ef40b..0fc023c4 100644 --- a/pkg/heartbeat/language_test.go +++ b/pkg/heartbeat/language_test.go @@ -860,6 +860,7 @@ func TestParseLanguageFromChroma(t *testing.T) { "Ampl": heartbeat.LanguageAMPL, "autohotkey": heartbeat.LanguageAutoHotkey, "Base Makefile": heartbeat.LanguageMakefile, + "c-objdump": heartbeat.LanguageCObjdump, "Coldfusion HTML": heartbeat.LanguageColdfusionHTML, "EmacsLisp": heartbeat.LanguageEmacsLisp, "Go HTML Template": heartbeat.LanguageGo, @@ -978,6 +979,7 @@ func TestLanguage_StringChroma(t *testing.T) { "Ampl": heartbeat.LanguageAMPL, "autohotkey": heartbeat.LanguageAutoHotkey, "Base Makefile": heartbeat.LanguageMakefile, + "c-objdump": heartbeat.LanguageCObjdump, "Coldfusion HTML": heartbeat.LanguageColdfusionHTML, "EmacsLisp": heartbeat.LanguageEmacsLisp, "GAS": heartbeat.LanguageAssembly, From 051afc4e1d1686f8c284022810e3a8e4d9f10ee0 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 5 May 2021 17:39:40 +0200 Subject: [PATCH 05/10] Add support for ColdFusion CFC chroma spelling --- pkg/heartbeat/language.go | 5 +++++ pkg/heartbeat/language_test.go | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pkg/heartbeat/language.go b/pkg/heartbeat/language.go index fdbd4903..ee29592e 100644 --- a/pkg/heartbeat/language.go +++ b/pkg/heartbeat/language.go @@ -2281,6 +2281,7 @@ const ( languageAssemblyChromaStr = "GAS" languageAutoHotkeyChromaStr = "autohotkey" languageCObjdumpChromaStr = "c-objdump" + languageColdfusionCFCChromaStr = "Coldfusion CFC" languageColdfusionHTMLChromaStr = "Coldfusion HTML" languageFSharpChromaStr = "FSharp" languageEmacsLispChromaStr = "EmacsLisp" @@ -3848,6 +3849,8 @@ func ParseLanguageFromChroma(lexerName string) (Language, bool) { return LanguageAutoHotkey, true case normalizeString(languageCObjdumpChromaStr): return LanguageCObjdump, true + case normalizeString(languageColdfusionCFCChromaStr): + return LanguageColdfusionCFC, true case normalizeString(languageColdfusionHTMLChromaStr): return LanguageColdfusionHTML, true case normalizeString(languageEmacsLispChromaStr): @@ -5454,6 +5457,8 @@ func (l Language) StringChroma() string { return languageAutoHotkeyChromaStr case LanguageCObjdump: return languageCObjdumpChromaStr + case LanguageColdfusionCFC: + return languageColdfusionCFCChromaStr case LanguageColdfusionHTML: return languageColdfusionHTMLChromaStr case LanguageEmacsLisp: diff --git a/pkg/heartbeat/language_test.go b/pkg/heartbeat/language_test.go index 0fc023c4..93da3667 100644 --- a/pkg/heartbeat/language_test.go +++ b/pkg/heartbeat/language_test.go @@ -861,6 +861,7 @@ func TestParseLanguageFromChroma(t *testing.T) { "autohotkey": heartbeat.LanguageAutoHotkey, "Base Makefile": heartbeat.LanguageMakefile, "c-objdump": heartbeat.LanguageCObjdump, + "Coldfusion CFC": heartbeat.LanguageColdfusionCFC, "Coldfusion HTML": heartbeat.LanguageColdfusionHTML, "EmacsLisp": heartbeat.LanguageEmacsLisp, "Go HTML Template": heartbeat.LanguageGo, @@ -980,6 +981,7 @@ func TestLanguage_StringChroma(t *testing.T) { "autohotkey": heartbeat.LanguageAutoHotkey, "Base Makefile": heartbeat.LanguageMakefile, "c-objdump": heartbeat.LanguageCObjdump, + "Coldfusion CFC": heartbeat.LanguageColdfusionCFC, "Coldfusion HTML": heartbeat.LanguageColdfusionHTML, "EmacsLisp": heartbeat.LanguageEmacsLisp, "GAS": heartbeat.LanguageAssembly, From 187c5bdd437dbd346c8beb52ab18962d2b812efc Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 5 May 2021 17:43:01 +0200 Subject: [PATCH 06/10] Add support for Cpp-ObjDump chroma spelling --- pkg/heartbeat/language.go | 5 +++++ pkg/heartbeat/language_test.go | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pkg/heartbeat/language.go b/pkg/heartbeat/language.go index ee29592e..e813f516 100644 --- a/pkg/heartbeat/language.go +++ b/pkg/heartbeat/language.go @@ -2283,6 +2283,7 @@ const ( languageCObjdumpChromaStr = "c-objdump" languageColdfusionCFCChromaStr = "Coldfusion CFC" languageColdfusionHTMLChromaStr = "Coldfusion HTML" + languageCppObjdumpChromaStr = "cpp-objdump" languageFSharpChromaStr = "FSharp" languageEmacsLispChromaStr = "EmacsLisp" languageGoHTMLTemplateChromaStr = "Go HTML Template" @@ -3853,6 +3854,8 @@ func ParseLanguageFromChroma(lexerName string) (Language, bool) { return LanguageColdfusionCFC, true case normalizeString(languageColdfusionHTMLChromaStr): return LanguageColdfusionHTML, true + case normalizeString(languageCppObjdumpChromaStr): + return LanguageCppObjdump, true case normalizeString(languageEmacsLispChromaStr): return LanguageEmacsLisp, true case normalizeString(languageGoHTMLTemplateChromaStr): @@ -5461,6 +5464,8 @@ func (l Language) StringChroma() string { return languageColdfusionCFCChromaStr case LanguageColdfusionHTML: return languageColdfusionHTMLChromaStr + case LanguageCppObjdump: + return languageCppObjdumpChromaStr case LanguageEmacsLisp: return languageEmacsLispChromaStr case LanguageFSharp: diff --git a/pkg/heartbeat/language_test.go b/pkg/heartbeat/language_test.go index 93da3667..771ae3f0 100644 --- a/pkg/heartbeat/language_test.go +++ b/pkg/heartbeat/language_test.go @@ -863,6 +863,7 @@ func TestParseLanguageFromChroma(t *testing.T) { "c-objdump": heartbeat.LanguageCObjdump, "Coldfusion CFC": heartbeat.LanguageColdfusionCFC, "Coldfusion HTML": heartbeat.LanguageColdfusionHTML, + "cpp-objdump": heartbeat.LanguageCppObjdump, "EmacsLisp": heartbeat.LanguageEmacsLisp, "Go HTML Template": heartbeat.LanguageGo, "Go Text Template": heartbeat.LanguageGo, @@ -983,6 +984,7 @@ func TestLanguage_StringChroma(t *testing.T) { "c-objdump": heartbeat.LanguageCObjdump, "Coldfusion CFC": heartbeat.LanguageColdfusionCFC, "Coldfusion HTML": heartbeat.LanguageColdfusionHTML, + "cpp-objdump": heartbeat.LanguageCppObjdump, "EmacsLisp": heartbeat.LanguageEmacsLisp, "GAS": heartbeat.LanguageAssembly, "FSharp": heartbeat.LanguageFSharp, From d24fe8573c6a492be43b63564ab6a76a0c5a53d0 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 5 May 2021 17:45:29 +0200 Subject: [PATCH 07/10] Add support for Cuda chroma spelling --- pkg/heartbeat/language.go | 5 +++++ pkg/heartbeat/language_test.go | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pkg/heartbeat/language.go b/pkg/heartbeat/language.go index e813f516..3fd495b3 100644 --- a/pkg/heartbeat/language.go +++ b/pkg/heartbeat/language.go @@ -2284,6 +2284,7 @@ const ( languageColdfusionCFCChromaStr = "Coldfusion CFC" languageColdfusionHTMLChromaStr = "Coldfusion HTML" languageCppObjdumpChromaStr = "cpp-objdump" + languageCUDAChromaStr = "CUDA" languageFSharpChromaStr = "FSharp" languageEmacsLispChromaStr = "EmacsLisp" languageGoHTMLTemplateChromaStr = "Go HTML Template" @@ -3856,6 +3857,8 @@ func ParseLanguageFromChroma(lexerName string) (Language, bool) { return LanguageColdfusionHTML, true case normalizeString(languageCppObjdumpChromaStr): return LanguageCppObjdump, true + case normalizeString(languageCUDAChromaStr): + return LanguageCUDA, true case normalizeString(languageEmacsLispChromaStr): return LanguageEmacsLisp, true case normalizeString(languageGoHTMLTemplateChromaStr): @@ -5466,6 +5469,8 @@ func (l Language) StringChroma() string { return languageColdfusionHTMLChromaStr case LanguageCppObjdump: return languageCppObjdumpChromaStr + case LanguageCUDA: + return languageCUDAChromaStr case LanguageEmacsLisp: return languageEmacsLispChromaStr case LanguageFSharp: diff --git a/pkg/heartbeat/language_test.go b/pkg/heartbeat/language_test.go index 771ae3f0..8f92e92b 100644 --- a/pkg/heartbeat/language_test.go +++ b/pkg/heartbeat/language_test.go @@ -864,6 +864,7 @@ func TestParseLanguageFromChroma(t *testing.T) { "Coldfusion CFC": heartbeat.LanguageColdfusionCFC, "Coldfusion HTML": heartbeat.LanguageColdfusionHTML, "cpp-objdump": heartbeat.LanguageCppObjdump, + "CUDA": heartbeat.LanguageCUDA, "EmacsLisp": heartbeat.LanguageEmacsLisp, "Go HTML Template": heartbeat.LanguageGo, "Go Text Template": heartbeat.LanguageGo, @@ -985,6 +986,7 @@ func TestLanguage_StringChroma(t *testing.T) { "Coldfusion CFC": heartbeat.LanguageColdfusionCFC, "Coldfusion HTML": heartbeat.LanguageColdfusionHTML, "cpp-objdump": heartbeat.LanguageCppObjdump, + "CUDA": heartbeat.LanguageCUDA, "EmacsLisp": heartbeat.LanguageEmacsLisp, "GAS": heartbeat.LanguageAssembly, "FSharp": heartbeat.LanguageFSharp, From 3a9da15915eeb025b9df006924de1051f5c55140 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 5 May 2021 17:48:15 +0200 Subject: [PATCH 08/10] Add support for JSONLD chroma spelling --- pkg/heartbeat/language.go | 3 +++ pkg/heartbeat/language_test.go | 2 ++ 2 files changed, 5 insertions(+) diff --git a/pkg/heartbeat/language.go b/pkg/heartbeat/language.go index 3fd495b3..04aef4d5 100644 --- a/pkg/heartbeat/language.go +++ b/pkg/heartbeat/language.go @@ -2290,6 +2290,7 @@ const ( languageGoHTMLTemplateChromaStr = "Go HTML Template" languageGoTextTemplateChromaStr = "Go Text Template" languageJSXChromaStr = "react" + languageJSONLDChromaStr = "JSON-LD" languageLessChromaStr = "LessCss" languageLiquidChromaStr = "liquid" languageMakefileChromaStr = "Base Makefile" @@ -5477,6 +5478,8 @@ func (l Language) StringChroma() string { return languageFSharpChromaStr case LanguageFStar: return languageFStarLiteralStr + case LanguageJSONLD: + return languageJSONLDChromaStr case LanguageJSX: return languageJSXChromaStr case LanguageLess: diff --git a/pkg/heartbeat/language_test.go b/pkg/heartbeat/language_test.go index 8f92e92b..c2b3796f 100644 --- a/pkg/heartbeat/language_test.go +++ b/pkg/heartbeat/language_test.go @@ -870,6 +870,7 @@ func TestParseLanguageFromChroma(t *testing.T) { "Go Text Template": heartbeat.LanguageGo, "FSharp": heartbeat.LanguageFSharp, "GAS": heartbeat.LanguageAssembly, + "JSON-LD": heartbeat.LanguageJSONLD, "LessCss": heartbeat.LanguageLess, "liquid": heartbeat.LanguageLiquid, "markdown": heartbeat.LanguageMarkdown, @@ -992,6 +993,7 @@ func TestLanguage_StringChroma(t *testing.T) { "FSharp": heartbeat.LanguageFSharp, "FStar": heartbeat.LanguageFStar, "Go": heartbeat.LanguageGo, + "JSON-LD": heartbeat.LanguageJSONLD, "LessCss": heartbeat.LanguageLess, "liquid": heartbeat.LanguageLiquid, "markdown": heartbeat.LanguageMarkdown, From 0947c9ed273ba51814d23d1a14f6957bc468e578 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 5 May 2021 17:51:14 +0200 Subject: [PATCH 09/10] Add support for HXML chroma spelling --- pkg/heartbeat/language.go | 5 +++++ pkg/heartbeat/language_test.go | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pkg/heartbeat/language.go b/pkg/heartbeat/language.go index 04aef4d5..a3ed69fd 100644 --- a/pkg/heartbeat/language.go +++ b/pkg/heartbeat/language.go @@ -2289,6 +2289,7 @@ const ( languageEmacsLispChromaStr = "EmacsLisp" languageGoHTMLTemplateChromaStr = "Go HTML Template" languageGoTextTemplateChromaStr = "Go Text Template" + languageHxmlChromaStr = "Hxml" languageJSXChromaStr = "react" languageJSONLDChromaStr = "JSON-LD" languageLessChromaStr = "LessCss" @@ -3868,6 +3869,8 @@ func ParseLanguageFromChroma(lexerName string) (Language, bool) { return LanguageGo, true case normalizeString(languageFSharpChromaStr): return LanguageFSharp, true + case normalizeString(languageHxmlChromaStr): + return LanguageHxml, true case normalizeString(languageJSXChromaStr): return LanguageJSX, true case normalizeString(languageLessChromaStr): @@ -5478,6 +5481,8 @@ func (l Language) StringChroma() string { return languageFSharpChromaStr case LanguageFStar: return languageFStarLiteralStr + case LanguageHxml: + return languageHxmlChromaStr case LanguageJSONLD: return languageJSONLDChromaStr case LanguageJSX: diff --git a/pkg/heartbeat/language_test.go b/pkg/heartbeat/language_test.go index c2b3796f..fff3e5e0 100644 --- a/pkg/heartbeat/language_test.go +++ b/pkg/heartbeat/language_test.go @@ -870,6 +870,7 @@ func TestParseLanguageFromChroma(t *testing.T) { "Go Text Template": heartbeat.LanguageGo, "FSharp": heartbeat.LanguageFSharp, "GAS": heartbeat.LanguageAssembly, + "Hxml": heartbeat.LanguageHxml, "JSON-LD": heartbeat.LanguageJSONLD, "LessCss": heartbeat.LanguageLess, "liquid": heartbeat.LanguageLiquid, @@ -993,6 +994,7 @@ func TestLanguage_StringChroma(t *testing.T) { "FSharp": heartbeat.LanguageFSharp, "FStar": heartbeat.LanguageFStar, "Go": heartbeat.LanguageGo, + "Hxml": heartbeat.LanguageHxml, "JSON-LD": heartbeat.LanguageJSONLD, "LessCss": heartbeat.LanguageLess, "liquid": heartbeat.LanguageLiquid, From 71568a227e4101935b749635f946c9d65c910af6 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 5 May 2021 17:53:50 +0200 Subject: [PATCH 10/10] Add support for ooc chroma spelling --- pkg/heartbeat/language.go | 5 +++++ pkg/heartbeat/language_test.go | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pkg/heartbeat/language.go b/pkg/heartbeat/language.go index a3ed69fd..d7a52b2b 100644 --- a/pkg/heartbeat/language.go +++ b/pkg/heartbeat/language.go @@ -2299,6 +2299,7 @@ const ( languageNewLispChromaStr = "NewLisp" languageNimrodChromaStr = "Nim" languagePython3ChromaStr = "Python 3" + languageOocChromaStr = "Ooc" languageOrgChromaStr = "Org Mode" languageRChromaStr = "R" languageReasonMLChromaStr = "ReasonML" @@ -3885,6 +3886,8 @@ func ParseLanguageFromChroma(lexerName string) (Language, bool) { return LanguageNewLisp, true case normalizeString(languageNimrodChromaStr): return LanguageNimrod, true + case normalizeString(languageOocChromaStr): + return LanguageOoc, true case normalizeString(languageOrgChromaStr): return LanguageOrg, true case normalizeString(languagePython3ChromaStr): @@ -5499,6 +5502,8 @@ func (l Language) StringChroma() string { return languageNewLispChromaStr case LanguageNimrod: return languageNimrodChromaStr + case LanguageOoc: + return languageOocChromaStr case LanguageOrg: return languageOrgChromaStr case LanguageReasonML: diff --git a/pkg/heartbeat/language_test.go b/pkg/heartbeat/language_test.go index fff3e5e0..e3d19c4e 100644 --- a/pkg/heartbeat/language_test.go +++ b/pkg/heartbeat/language_test.go @@ -877,6 +877,7 @@ func TestParseLanguageFromChroma(t *testing.T) { "markdown": heartbeat.LanguageMarkdown, "NewLisp": heartbeat.LanguageNewLisp, "Nim": heartbeat.LanguageNimrod, + "Ooc": heartbeat.LanguageOoc, "Org Mode": heartbeat.LanguageOrg, "plaintext": heartbeat.LanguageText, "Python 3": heartbeat.LanguagePython, @@ -1000,6 +1001,7 @@ func TestLanguage_StringChroma(t *testing.T) { "liquid": heartbeat.LanguageLiquid, "markdown": heartbeat.LanguageMarkdown, "Nim": heartbeat.LanguageNimrod, + "Ooc": heartbeat.LanguageOoc, "Org Mode": heartbeat.LanguageOrg, "plaintext": heartbeat.LanguageText, "R": heartbeat.LanguageS,