Fix agenda sorting to behave the same as in Emacs orgmode.

Author: kristijanhusak

lua/orgmode/agenda/views/agenda.lua

@@ -11,18 +11,26 @@ local utils = require('orgmode.utils')
 ---@return AgendaItem[]
 local function sort_agenda_items(agenda_items)
   table.sort(agenda_items, function(a, b)
-    if a.is_today and a.is_same_day then
-      if b.is_today and b.is_same_day then
+    if a.is_same_day and b.is_same_day then
+      if not a.headline_date.date_only and not b.headline_date.date_only then
         return a.headline_date:is_before(b.headline_date)
       end
+      if not b.headline_date.date_only then
+        return false
+      end
       return true
     end
 
-    if b.is_today and b.is_same_day then
-      if a.is_today and a.is_same_day then
-        return a.headline_date:is_before(b.headline_date)
+    if a.is_same_day and not b.is_same_day then
+      if not a.headline_date.date_only or (b.headline_date:is_none() and not a.headline_date:is_none()) then
+        return true
+      end
+    end
+
+    if not a.is_same_day and b.is_same_day then
+      if not b.headline_date.date_only or (a.headline_date:is_none() and not b.headline_date:is_none()) then
+        return false
       end
-      return false
     end
 
     if a.headline:get_priority_sort_value() ~= b.headline:get_priority_sort_value() then
@@ -33,14 +41,6 @@ local function sort_agenda_items(agenda_items)
       return a.headline_date:is_before(b.headline_date)
     end
 
-    if a.is_in_date_range and not b.is_in_date_range then
-      return false
-    end
-
-    if not a.is_in_date_range and b.is_in_date_range then
-      return true
-    end
-
     return a.headline_date:is_before(b.headline_date)
   end)
   return agenda_items

lua/orgmode/parser/files.lua

@@ -84,11 +84,14 @@ end
 ---@return File[]
 function Files.all()
   Files.ensure_loaded()
-  local files = vim.tbl_values(Files.orgfiles)
-  table.sort(files, function(a, b)
-    return a.category < b.category
-  end)
-  return files
+  local valid_files = {}
+  local filenames = config:get_all_files()
+  for _, file in ipairs(filenames) do
+    if Files.orgfiles[file] then
+      table.insert(valid_files, Files.orgfiles[file])
+    end
+  end
+  return valid_files
 end
 
 ---@return string[]

tests/minimal_init.vim

@@ -22,7 +22,7 @@ parser_config.org = {
 }
 
 require('orgmode').setup({
-  org_agenda_files = vim.fn.getcwd() .. '/tests/plenary/fixtures/*',
+  org_agenda_files = { vim.fn.getcwd() .. '/tests/plenary/fixtures/*' },
   org_default_notes_file = vim.fn.getcwd() .. '/tests/plenary/fixtures/refile.org',
 })
 EOF

tests/plenary/notifications/notifications_spec.lua

@@ -7,14 +7,17 @@ local config = require('orgmode.config')
 local last_filename = nil
 
 describe('Notifications', function()
+  local default_org_agenda_files = vim.deepcopy(config.org_agenda_files)
   before_each(function()
     Files.loaded = true
   end)
   after_each(function()
     Files.loaded = false
+    config.org_agenda_files = default_org_agenda_files
   end)
   it('should find headlines for notification', function()
-    local filename = vim.fn.tempname()
+    local filename = vim.fn.tempname() .. '.org'
+    vim.fn.writefile({}, filename) -- make sure glob() reads it
     last_filename = filename
     local lines = {
       '* TODO I am the deadline task :OFFICE:',
@@ -27,6 +30,7 @@ describe('Notifications', function()
       '  SCHEDULED: <2021-07-12 Mon 19:30>',
     }
     local orgfile = File.from_content(lines, 'work', filename)
+    table.insert(config.opts.org_agenda_files, filename)
     Files.orgfiles[filename] = orgfile
     local notifications = Notifications:new()
     assert.are.same({}, notifications:get_tasks(Date.from_string('2021-07-11 Sun 12:30')))
@@ -78,7 +82,8 @@ describe('Notifications', function()
       },
     })
 
-    local filename = vim.fn.tempname()
+    local filename = vim.fn.tempname() .. '.org' -- make sure glob() reads it
+    vim.fn.writefile({}, filename)
     last_filename = filename
     local lines = {
       '* TODO I am the deadline task :OFFICE:',
@@ -91,6 +96,7 @@ describe('Notifications', function()
       '  SCHEDULED: <2021-07-14 Wed 19:30>',
     }
     local orgfile = File.from_content(lines, 'work', filename)
+    table.insert(config.opts.org_agenda_files, filename)
     Files.orgfiles[filename] = orgfile
     local notifications = Notifications:new()
     assert.are.same({}, notifications:get_tasks(Date.from_string('2021-07-13 Sun 12:30')))