From daaf909b82ab26e66d54e939693092e26994656b Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Fri, 13 May 2022 01:54:44 +0200
Subject: [PATCH] fix(windows): stdpath("state") => "nvim-data" #18546

This was missed in https://github.com/neovim/neovim/pull/15583
---
 src/nvim/os/stdpaths.c                    | 3 ++-
 test/functional/options/defaults_spec.lua | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c
index 5d6ffc1db18e32..faeb2fe829c99d 100644
--- a/src/nvim/os/stdpaths.c
+++ b/src/nvim/os/stdpaths.c
@@ -103,7 +103,8 @@ char *get_xdg_home(const XDGVarType idx)
   if (dir) {
 #if defined(WIN32)
     dir = concat_fnames_realloc(dir,
-                                (idx == kXDGDataHome ? "nvim-data" : "nvim"),
+                                ((idx == kXDGDataHome
+                                  || idx == kXDGStateHome) ? "nvim-data" : "nvim"),
                                 true);
 #else
     dir = concat_fnames_realloc(dir, "nvim", true);
diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua
index 36a53d8d268399..4731df7b955659 100644
--- a/test/functional/options/defaults_spec.lua
+++ b/test/functional/options/defaults_spec.lua
@@ -206,7 +206,7 @@ describe('startup defaults', function()
 
   describe('$NVIM_LOG_FILE', function()
     local xdgdir = 'Xtest-startup-xdg-logpath'
-    local xdgstatedir = xdgdir..'/nvim'
+    local xdgstatedir = iswin() and xdgdir..'/nvim-data' or xdgdir..'/nvim'
     after_each(function()
       os.remove('Xtest-logpath')
       rmdir(xdgdir)