1 files changed, 84 insertions, 0 deletions
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index 1ecfae57ed..45ca097033 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -1552,3 +1552,87 @@ void mark_mb_adjustpos(buf_T *buf, pos_T *lp)
     }
   }
 }
+
+
+// Add information about mark 'mname' to list 'l'
+static int add_mark(list_T *l, const char *mname, const pos_T *pos, int bufnr,
+                    const char *fname)
+  FUNC_ATTR_NONNULL_ARG(1, 2, 3)
+{
+  if (pos->lnum <= 0) {
+    return OK;
+  }
+
+  dict_T *d = tv_dict_alloc();
+  tv_list_append_dict(l, d);
+
+  list_T *lpos = tv_list_alloc(kListLenMayKnow);
+
+  tv_list_append_number(lpos, bufnr);
+  tv_list_append_number(lpos, pos->lnum);
+  tv_list_append_number(lpos, pos->col + 1);
+  tv_list_append_number(lpos, pos->coladd);
+
+  if (tv_dict_add_str(d, S_LEN("mark"), mname) == FAIL
+      || tv_dict_add_list(d, S_LEN("pos"), lpos) == FAIL
+      || (fname != NULL && tv_dict_add_str(d, S_LEN("file"), fname) == FAIL)) {
+    return FAIL;
+  }
+
+  return OK;
+}
+
+
+/// Get information about marks local to a buffer.
+///
+/// @param[in] buf  Buffer to get the marks from
+/// @param[out] l   List to store marks
+void get_buf_local_marks(const buf_T *buf, list_T *l)
+  FUNC_ATTR_NONNULL_ALL
+{
+  char mname[3] = "' ";
+
+  // Marks 'a' to 'z'
+  for (int i = 0; i < NMARKS; i++) {
+    mname[1] = (char)('a' + i);
+    add_mark(l, mname, &buf->b_namedm[i].mark, buf->b_fnum, NULL);
+  }
+
+  // Mark '' is a window local mark and not a buffer local mark
+  add_mark(l, "''", &curwin->w_pcmark, curbuf->b_fnum, NULL);
+
+  add_mark(l, "'\"", &buf->b_last_cursor.mark, buf->b_fnum, NULL);
+  add_mark(l, "'[", &buf->b_op_start, buf->b_fnum, NULL);
+  add_mark(l, "']", &buf->b_op_end, buf->b_fnum, NULL);
+  add_mark(l, "'^", &buf->b_last_insert.mark, buf->b_fnum, NULL);
+  add_mark(l, "'.", &buf->b_last_change.mark, buf->b_fnum, NULL);
+  add_mark(l, "'<", &buf->b_visual.vi_start, buf->b_fnum, NULL);
+  add_mark(l, "'>", &buf->b_visual.vi_end, buf->b_fnum, NULL);
+}
+
+/// Get information about global marks ('A' to 'Z' and '0' to '9')
+///
+/// @param[out] l  List to store global marks
+void get_global_marks(list_T *l)
+  FUNC_ATTR_NONNULL_ALL
+{
+  char mname[3] = "' ";
+  char *name;
+
+  // Marks 'A' to 'Z' and '0' to '9'
+  for (int i = 0; i < NMARKS + EXTRA_MARKS; i++) {
+    if (namedfm[i].fmark.fnum != 0) {
+      name = (char *)buflist_nr2name(namedfm[i].fmark.fnum, true, true);
+    } else {
+      name = (char *)namedfm[i].fname;
+    }
+    if (name != NULL) {
+      mname[1] = i >= NMARKS ? (char)(i - NMARKS + '0') : (char)(i + 'A');
+
+      add_mark(l, mname, &namedfm[i].fmark.mark, namedfm[i].fmark.fnum, name);
+      if (namedfm[i].fmark.fnum != 0) {
+        xfree(name);
+      }
+    }
+  }
+}