feedback

cli/lakeflags/datadir.go

@@ -34,23 +34,15 @@ func getDefaultDataDir() string {
 	}
 	switch runtime.GOOS {
 	case "windows":
-		// Windows XP and before didn't have a LOCALAPPDATA, so fallback
-		// to regular APPDATA when LOCALAPPDATA is not set.
-		appData := os.Getenv("LOCALAPPDATA")
-		if appData == "" {
-			appData = os.Getenv("APPDATA")
-		}
-		if appData != "" {
+		if appData := os.Getenv("LOCALAPPDATA"); appData != "" {
 			return filepath.Join(appData, "zed")
 		}
-	case "darwin":
-		if homeDir != "" {
-			return filepath.Join(homeDir, "Library",
-				"Application Support", "zed")
-		}
 	default:
 		if homeDir != "" {
-			return filepath.Join(homeDir, ".zed")
+			// For linux and windows follow the XDG spec which states:
+			// If $XDG_DATA_HOME is either not set or empty, a default equal to
+			// $HOME/.local/share should be used.
+			return filepath.Join(homeDir, ".local", "share", "zed")
 		}
 	}
 	// Return an empty string which will cause an error if a default data

cli/lakeflags/flags.go

@@ -70,7 +70,7 @@ func portInUse(port string) bool {
 func (l *Flags) Open(ctx context.Context) (api.Interface, error) {
 	// If the lake is the defaultDataDir, first check if a service is running
 	// on port 9867 and if so, use this as the lake location.
-	if l.Lake == defaultDataDir && !portInUse("9867") {
+	if l.Lake == defaultDataDir && portInUse("9867") {
 		l.Lake = "http://localhost:9867"
 	}
 	uri, err := l.URI()