Merge pull request #1231 from wakatime/develop

Release v1.130.4

Author: alanhamlett

pkg/language/language.go

@@ -125,6 +125,10 @@ func detectSpecialCases(ctx context.Context, fp string) (heartbeat.Language, boo
 		return heartbeat.LanguageObjectiveCPP, true
 	}
 
+	if ext == ".pas" && folderContainsDelphiFiles(ctx, dir) {
+		return heartbeat.LanguageDelphi, true
+	}
+
 	return heartbeat.LanguageUnknown, false
 }
 
@@ -186,7 +190,7 @@ func folderContainsCFiles(ctx context.Context, dir string) bool {
 	return false
 }
 
-// folderContainsCFiles returns true, if filder contains c++ files.
+// folderContainsCPPFiles returns true, if filder contains c++ files.
 func folderContainsCPPFiles(ctx context.Context, dir string) bool {
 	if dir == "" {
 		return false
@@ -212,6 +216,32 @@ func folderContainsCPPFiles(ctx context.Context, dir string) bool {
 	return false
 }
 
+// folderContainsDelphiFiles returns true, if filder contains Delphi files.
+func folderContainsDelphiFiles(ctx context.Context, dir string) bool {
+	if dir == "" {
+		return false
+	}
+
+	logger := log.Extract(ctx)
+
+	extensions, err := loadFolderExtensions(dir)
+	if err != nil {
+		logger.Warnf("failed loading folder extensions: %s", err)
+		return false
+	}
+
+	expectedExtensions := []string{".fmx", ".dfm", ".dproj"}
+	for _, ext := range expectedExtensions {
+		for _, e := range extensions {
+			if e == ext {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
 // correspondingFileExists returns true if corresponding file with the provided extension exists.
 // E.g. will return true, if called with "/tmp/file.go" and "txt" and /tmp/file.txt existis.
 func correspondingFileExists(fp string, extension string) bool {

pkg/language/language_test.go

@@ -257,6 +257,13 @@ func TestDetect_FSharp_Over_Forth(t *testing.T) {
 	assert.Equal(t, heartbeat.LanguageFSharp, lang)
 }
 
+func TestDetect_Delphi_FMX_FileInFolder(t *testing.T) {
+	lang, err := language.Detect(t.Context(), "testdata/codefiles/pas_with_fmx_file/delphi.pas", false)
+	require.NoError(t, err)
+
+	assert.Equal(t, heartbeat.LanguageDelphi, lang)
+}
+
 func TestDetect_ChromaTopLanguagesRetrofit(t *testing.T) {
 	err := lexer.RegisterAll()
 	require.NoError(t, err)