Format unsaved entity file paths

pkg/heartbeat/format.go

@@ -36,14 +36,15 @@ func WithFormatting() HandleOption {
 	}
 }
 
-// Format accepts a heartbeat formats it's filepath and returns the formatted version.
+// Format accepts a heartbeat to format its filepath and returns the formatted version.
 func Format(ctx context.Context, h Heartbeat) Heartbeat {
-	if !h.IsUnsavedEntity && (runtime.GOOS != "windows" || !windows.IsWindowsNetworkMount(h.Entity)) {
-		formatLinuxFilePath(ctx, &h)
-	}
-
 	if runtime.GOOS == "windows" {
 		formatWindowsFilePath(ctx, &h)
+		return h
+	}
+
+	if !windows.IsWindowsNetworkMount(h.Entity) {
+		formatLinuxFilePath(ctx, &h)
 	}
 
 	return h

pkg/heartbeat/format_test.go

@@ -54,6 +54,21 @@ func TestWithFormatting(t *testing.T) {
 	}, result)
 }
 
+func TestFormat_WindowsUnixProjectPathOverride(t *testing.T) {
+	if runtime.GOOS != "windows" {
+		t.Skip("Skipping because OS is not windows.")
+	}
+
+	h := heartbeat.Heartbeat{
+		Entity:     `C:\Users\project\main.go`,
+		EntityType: heartbeat.FileType,
+	}
+
+	formatted := heartbeat.Format(context.Background(), h)
+
+	assert.Equal(t, "C:/Users/project/main.go", formatted.Entity)
+}
+
 func TestFormat_NetworkMount(t *testing.T) {
 	if runtime.GOOS != "windows" {
 		t.Skip("Skipping because OS is not windows.")

pkg/windows/windows.go

@@ -39,7 +39,7 @@ var (
 // FormatFilePath formats a windows filepath by converting backslash to
 // frontslash and ensuring that drive letter is upper case.
 func FormatFilePath(fp string) string {
-	isWindowsNetworkMount := windowsNetworkMountRegex.MatchString(fp)
+	isWindowsNetworkMount := IsWindowsNetworkMount(fp)
 
 	fp = backslashReplaceRegex.ReplaceAllString(fp, "/")