Merge branch 'master' into support_sheband_and_tangle_mode_header_tag

Author: SjB

doc/orgmode.txt

@@ -600,7 +600,7 @@ Determine whether properties of one headline are inherited by sub-headlines.
 - `string` - only properties matching the given regex are inherited
 
 Note that for a select few properties, the inheritance behavior is hard-coded
-withing their special applications. See Property Inheritance
+within their special applications. See Property Inheritance
 <https://orgmode.org/manual/Property-Inheritance.html> for details.
 
 
@@ -623,8 +623,8 @@ Available options:
 - `0` - start week on Sunday
 - `1` - start week on Monday
 
-Determine on which day the week will start in calendar modal
-(ex:|orgmode-changing-the-date-under-cursor|)
+Determine on which day the week will start in calendar modal (ex:
+|orgmode-changing-the-date-under-cursor|)
 
 
 emacs_config                                            *orgmode-emacs_config*
@@ -789,7 +789,7 @@ org_agenda_sorting_strategy              *orgmode-org_agenda_sorting_strategy*
 
 - Type:
 
-`table<'agenda' | 'todo' | 'tags', OrgAgendaSortingStrategy[]><`
+`table<'agenda' | 'todo' | 'tags', OrgAgendaSortingStrategy[]>`
 
 - Default:
 

docs/configuration.org

@@ -544,7 +544,7 @@ Determine whether properties of one headline are inherited by sub-headlines.
 - =string[]= - only the properties named in the given list are inherited
 - =string= - only properties matching the given regex are inherited
 
-Note that for a select few properties, the inheritance behavior is hard-coded withing their special applications.
+Note that for a select few properties, the inheritance behavior is hard-coded within their special applications.
 See [[https://orgmode.org/manual/Property-Inheritance.html][Property Inheritance]] for details.
 
 *** org_babel_default_header_args
@@ -566,7 +566,7 @@ Available options:
 - =0= - start week on Sunday
 - =1= - start week on Monday
 
-Determine on which day the week will start in calendar modal (ex:[[#org_change_date][changing the date under cursor]])
+Determine on which day the week will start in calendar modal (ex: [[#org_change_date][changing the date under cursor]])
 
 *** emacs_config
 :PROPERTIES:
@@ -736,7 +736,7 @@ These arguments are shared between all of the agenda types:
 :CUSTOM_ID: org_agenda_sorting_strategy
 :END:
 - Type:
-=table<'agenda' | 'todo' | 'tags', OrgAgendaSortingStrategy[]><=
+=table<'agenda' | 'todo' | 'tags', OrgAgendaSortingStrategy[]>=
 - Default:
 ~{ agenda = {'time-up', 'priority-down', 'category-keep'}, todo = {'priority-down', 'category-keep'}, tags = {'priority-down', 'category-keep'}}~
 List of sorting strategies to apply to a given view. Available

docs/index.org

@@ -26,7 +26,7 @@ To view this documentation offline in Neovim, run =:Org help=. More info in [[#g
     end,
   }
   #+end_src
-- Capture youf first note with =<leader>oc=
+- Capture your first note with =<leader>oc=
 - Open up the prompt for agenda with =<leader>oa=
 
 For more details about the installation and usage, check [[./installation.org][Installation page]].

ftplugin/org.lua

@@ -71,3 +71,9 @@ vim.b.undo_ftplugin = table.concat({
   'indentkeys<',
   '| unlet! b:org_tmp_edit_window',
 }, ' ')
+
+-- Manually attach Snacks.image module to ensure that images are shown.
+-- Snacks usually handles this automatically, but if Orgmode plugin is loaded after Snacks, it will not pick it up.
+if vim.tbl_get(_G, 'Snacks', 'image', 'config', 'enabled') and vim.tbl_get(_G, 'Snacks', 'image', 'config', 'doc', 'enabled') then
+  require('snacks.image.doc').attach(bufnr)
+end

lua/orgmode/org/indent.lua

@@ -62,8 +62,10 @@ local function get_indent_for_match(matches, linenr, mode, bufnr)
     end
     return indent
   end
-  if mode:match('^[iR]') and prev_line_match.type == 'listitem' and linenr - prev_linenr < 3 then
-    -- In insert mode, we also count the non-listitem line *after* a listitem as
+  -- node type is nil while inserting!
+  local is_inserting = (not match.type) or mode:match('^[iR]')
+  if is_inserting and prev_line_match.type == 'listitem' and linenr - prev_linenr < 3 then
+    -- While inserting, we also count the non-listitem line *after* a listitem as
     -- part of the listitem. Keep in mind that double empty lines end a list as
     -- per Orgmode syntax.
     --
@@ -217,6 +219,9 @@ local get_matches = ts_utils.memoize_by_buf_tick(function(bufnr)
       end
     elseif type == 'paragraph' or type == 'drawer' or type == 'property_drawer' then
       opts.indent_type = 'other'
+      for i = range.start.line, range['end'].line - 1 do
+        matches[i + 1] = opts
+      end
     end
   end
 
@@ -254,9 +259,7 @@ local function indentexpr(linenr, bufnr)
   end
 
   local indentexpr_cache = buf_indentexpr_cache[bufnr] or { prev_linenr = -1 }
-  if indentexpr_cache.prev_linenr ~= linenr - 1 or not mode:lower():find('n') then
-    indentexpr_cache.matches = get_matches(bufnr)
-  end
+  indentexpr_cache.matches = get_matches(bufnr)
 
   -- Treesitter failed to parse the document (due to errors or missing tree)
   -- So we just fallback to autoindent

queries/org/images.scm

@@ -1,6 +1,6 @@
 (link url: (expr) @image.src
   (#gsub! @image.src "^file:" "")
-  (#match? @image.src "(png|jpg|jpeg|gif|bmp|webp|tiff|heic|avif|mp4|mov|avi|mkv|webm|pdf)$")
+  (#match? @image.src "(png|jpg|jpeg|gif|bmp|webp|tiff|heic|avif|mp4|mov|avi|mkv|webm|pdf|svg)$")
 )
 
 (block

tests/plenary/org/indent_spec.lua

@@ -237,6 +237,19 @@ local function test_add_line_breaks_to_existing_file()
   expect_whole_buffer(expected)
 end
 
+local function test_insertion_from_normal_mode()
+  helpers.create_file({ '- first item' })
+  vim.cmd([[normal! o]])
+  local user_input = vim.api.nvim_replace_termcodes('i- second item<Esc>ocontent', true, true, true)
+  vim.api.nvim_feedkeys(user_input, 'ntix', false)
+  local expected = {
+    '- first item',
+    '- second item',
+    '  content',
+  }
+  expect_whole_buffer(expected)
+end
+
 -- The actual tests are here.
 
 describe('with "indent",', function()
@@ -259,6 +272,10 @@ describe('with "indent",', function()
   it('adding line breaks to list items maintains indent', function()
     test_add_line_breaks_to_existing_file()
   end)
+
+  it('inserting content from nomral mode is well indented', function()
+    test_insertion_from_normal_mode()
+  end)
 end)
 
 describe('with "noindent",', function()