Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release v1.74.2 #907

Merged
merged 2 commits into from
Aug 15, 2023
Merged

Release v1.74.2 #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4183d56
Upgrade chroma to fix Hax language detection
alanhamlett Aug 15, 2023
cb408d8
Merge pull request #906 from wakatime/bugfix/upgrade-chroma
alanhamlett Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
14 changes: 14 additions & 0 deletions pkg/heartbeat/language.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -2076,6 +2080,7 @@ const (
languageRAMLStr = "RAML"
languageRascalStr = "Rascal"
languageRawTokenStr = "Raw token data" // nolint:gosec
languageRazorStr = "Razor"
languageRConsoleStr = "RConsole"
languageRdStr = "Rd"
languageRDocStr = "RDoc"
Expand Down Expand Up @@ -2146,6 +2151,7 @@ const (
languageSlashStr = "Slash"
languageSliceStr = "Slice"
languageSlimStr = "Slim"
languageSlintStr = "Slint"
languageSlurmStr = "Slurm"
languageSmaliStr = "Smali"
languageSmalltalkStr = "Smalltalk"
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading