1 files changed, 37 insertions, 3 deletions

diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 4483ada3e4..13e8a73af4 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -4809,7 +4809,8 @@ enum {
   QF_GETLIST_IDX = 0x40,
   QF_GETLIST_SIZE = 0x80,
   QF_GETLIST_TICK = 0x100,
-  QF_GETLIST_ALL = 0x1FF
+  QF_GETLIST_FILEWINID = 0x200,
+  QF_GETLIST_ALL = 0x3FF,
 };
 
 /// Parse text from 'di' and return the quickfix list items.
@@ -4865,12 +4866,17 @@ static int qf_winid(qf_info_T *qi)
 }
 
 /// Convert the keys in 'what' to quickfix list property flags.
-static int qf_getprop_keys2flags(dict_T *what)
+static int qf_getprop_keys2flags(const dict_T *what, bool loclist)
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
 {
   int flags = QF_GETLIST_NONE;
 
   if (tv_dict_find(what, S_LEN("all")) != NULL) {
     flags |= QF_GETLIST_ALL;
+    if (!loclist) {
+      // File window ID is applicable only to location list windows
+      flags &= ~QF_GETLIST_FILEWINID;
+    }
   }
   if (tv_dict_find(what, S_LEN("title")) != NULL) {
     flags |= QF_GETLIST_TITLE;
@@ -4899,6 +4905,9 @@ static int qf_getprop_keys2flags(dict_T *what)
   if (tv_dict_find(what, S_LEN("changedtick")) != NULL) {
     flags |= QF_GETLIST_TICK;
   }
+  if (loclist && tv_dict_find(what, S_LEN("filewinid")) != NULL) {
+    flags |= QF_GETLIST_FILEWINID;
+  }
 
   return flags;
 }
@@ -4984,6 +4993,9 @@ static int qf_getprop_defaults(qf_info_T *qi, int flags, dict_T *retdict)
   if ((status == OK) && (flags & QF_GETLIST_TICK)) {
     status = tv_dict_add_nr(retdict, S_LEN("changedtick"), 0);
   }
+  if ((status == OK) && (qi != &ql_info) && (flags & QF_GETLIST_FILEWINID)) {
+    status = tv_dict_add_nr(retdict, S_LEN("filewinid"), 0);
+  }
 
   return status;
 }
@@ -4995,6 +5007,25 @@ static int qf_getprop_title(qf_info_T *qi, int qf_idx, dict_T *retdict)
                            (const char *)qi->qf_lists[qf_idx].qf_title);
 }
 
+// Returns the identifier of the window used to display files from a location
+// list.  If there is no associated window, then returns 0. Useful only when
+// called from a location list window.
+static int qf_getprop_filewinid(const win_T *wp, const qf_info_T *qi,
+                                dict_T *retdict)
+  FUNC_ATTR_NONNULL_ARG(3)
+{
+  handle_T winid = 0;
+
+  if (wp != NULL && IS_LL_WINDOW(wp)) {
+    win_T *ll_wp = qf_find_win_with_loclist(qi);
+    if (ll_wp != NULL) {
+      winid = ll_wp->handle;
+    }
+  }
+
+  return tv_dict_add_nr(retdict, S_LEN("filewinid"), winid);
+}
+
 /// Return the quickfix list items/entries as 'items' in retdict
 static int qf_getprop_items(qf_info_T *qi, int qf_idx, dict_T *retdict)
 {
@@ -5053,7 +5084,7 @@ int qf_get_properties(win_T *wp, dict_T *what, dict_T *retdict)
     qi = GET_LOC_LIST(wp);
   }
 
-  int flags = qf_getprop_keys2flags(what);
+  const int flags = qf_getprop_keys2flags(what, wp != NULL);
 
   if (qi != NULL && qi->qf_listcount != 0) {
     qf_idx = qf_getprop_qfidx(qi, what);
@@ -5093,6 +5124,9 @@ int qf_get_properties(win_T *wp, dict_T *what, dict_T *retdict)
     status = tv_dict_add_nr(retdict, S_LEN("changedtick"),
                             qi->qf_lists[qf_idx].qf_changedtick);
   }
+  if ((status == OK) && (wp != NULL) && (flags & QF_GETLIST_FILEWINID)) {
+    status = qf_getprop_filewinid(wp, qi, retdict);
+  }
 
   return status;
 }