Fix indent and agenda sorting

Author: kristijanhusak

lua/orgmode/agenda/views/agenda.lua

@@ -8,12 +8,12 @@ local AgendaFilter = require('orgmode.agenda.filter')
 local utils = require('orgmode.utils')
 
 local function sort_by_date_or_priority_or_category(a, b)
-  if not a.headline_date:is_same(b.headline_date) then
-    return a.headline_date:is_before(b.headline_date)
-  end
   if a.headline:get_priority_sort_value() ~= b.headline:get_priority_sort_value() then
     return a.headline:get_priority_sort_value() > b.headline:get_priority_sort_value()
   end
+  if not a.headline_date:is_same(b.headline_date, 'day') then
+    return a.headline_date:is_before(b.headline_date)
+  end
   return a.index < b.index
 end
 
@@ -22,13 +22,10 @@ end
 local function sort_agenda_items(agenda_items)
   table.sort(agenda_items, function(a, b)
     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 a.headline_date.date_only then
+      if not a.headline_date.date_only and b.headline_date.date_only then
         return true
       end
-      if not b.headline_date.date_only then
+      if not b.headline_date.date_only and a.headline_date.date_only then
         return false
       end
       return sort_by_date_or_priority_or_category(a, b)

lua/orgmode/org/indent.lua

@@ -129,17 +129,17 @@ local function indentexpr()
   match = match or {}
   prev_line_match = prev_line_match or {}
 
-  if match.type == 'headline' then
-    return 0
-  end
-
   if prev_line_match.type == 'headline' then
-    if noindent_mode then
+    if noindent_mode or (match.type == 'headline' and match.stars > 0) then
       return 0
     end
     return prev_line_match.indent
   end
 
+  if match.type == 'headline' then
+    return 0
+  end
+
   if match.type == 'list' and prev_line_match.type == 'list' then
     local prev_line_list_item = get_is_list_item(vim.fn.getline(prev_linenr))
     local cur_line_list_item = get_is_list_item(vim.fn.getline(vim.v.lnum))