Merge pull request #323 from wakatime/feature/custom-languages

Add support for custom languages

Author: dron22

Makefile

@@ -110,11 +110,6 @@ build-binary-windows:
 		-ldflags "${LD_FLAGS} -X ${REPO}/pkg/version.OS=$(GOOS) -X ${REPO}/pkg/version.Arch=$(GOARCH)" \
 		-o ./build/$(BINARY_NAME)-$(GOOS)-$(GOARCH).exe
 
-# generate plugin language mapping code
-.PHONY: generate
-generate:
-	go run ./cmd/generate/main.go
-
 # install linter
 .PHONY: install-linter
 install-linter:
@@ -129,5 +124,5 @@ lint: install-linter
 	golangci-lint run ./...
 
 .PHONY: test
-test: generate
+test:
 	go test -cover -race ./...

cmd/generate/main.go

@@ -140,6 +140,7 @@ func SendHeartbeats(v *viper.Viper, queueFilepath string) error {
 			params.EntityType,
 			params.IsWrite,
 			params.Language,
+			params.LanguageAlternate,
 			params.LineNumber,
 			params.LocalFile,
 			params.Project.Alternate,
@@ -160,6 +161,7 @@ func SendHeartbeats(v *viper.Viper, queueFilepath string) error {
 				h.EntityType,
 				h.IsWrite,
 				h.Language,
+				"",
 				h.LineNumber,
 				h.LocalFile,
 				h.ProjectAlternate,

cmd/legacy/heartbeat/heartbeat.go

@@ -80,6 +80,7 @@ func TestSendHeartbeats(t *testing.T) {
 	v.Set("entity-type", "file")
 	v.Set("key", "00000000-0000-4000-8000-000000000000")
 	v.Set("language", "Go")
+	v.Set("alternate-language", "Golang")
 	v.Set("hide-branch-names", "true")
 	v.Set("project", "wakatime-cli")
 	v.Set("lineno", 13)
@@ -223,6 +224,7 @@ func TestSendHeartbeats_ExtraHeartbeats(t *testing.T) {
 	v.Set("hide-branch-names", "true")
 	v.Set("project", "wakatime-cli")
 	v.Set("language", "Go")
+	v.Set("alternate-language", "Golang")
 	v.Set("lineno", 13)
 	v.Set("plugin", plugin)
 	v.Set("time", 1585598059.1)