refactor: Move filetype detection to config

Also cache already detected filetypes

Author: kristijanhusak

lua/orgmode/config/init.lua

@@ -421,7 +421,7 @@ function Config:setup_ts_predicates()
     if not text or vim.trim(text) == '' then
       return
     end
-    metadata['injection.language'] = utils.detect_filetype(text, true)
+    metadata['injection.language'] = self:detect_filetype(text)
   end, { force = true, all = true })
 
   vim.treesitter.query.add_directive('org-set-inline-block-language!', function(match, _, bufnr, pred, metadata)
@@ -438,7 +438,7 @@ function Config:setup_ts_predicates()
     text = text:sub(5)
     -- Remove opening brackend and parameters: lua[params]{ -> lua
     text = text:gsub('[%{%[].*', '')
-    metadata['injection.language'] = utils.detect_filetype(text, true)
+    metadata['injection.language'] = self:detect_filetype(text)
   end, { force = true, all = true })
 
   vim.treesitter.query.add_predicate('org-is-headline-level?', function(match, _, _, predicate)
@@ -542,6 +542,60 @@ function Config:use_property_inheritance(property_name)
   end
 end
 
+---@param filetype_name string
+---@param use_ftmatch? boolean Use vim.filetype.match to detect filetype
+function Config:detect_filetype(filetype_name, use_ftmatch)
+  local name = filetype_name:lower()
+
+  if not self._ft_map then
+    self._ft_map = {}
+  end
+
+  if self._ft_map[name] then
+    return self._ft_map[name]
+  end
+
+  local filetype = self:_get_filetype_name(name)
+
+  if use_ftmatch then
+    local filename = '__org__detect_filetype__.' .. filetype
+    local ft = vim.filetype.match({ filename = filename })
+    if ft then
+      self._ft_map[name] = ft
+      return ft
+    end
+  end
+
+  self._ft_map[name] = filetype
+  return filetype
+end
+
+---@private
+---@param filetype string
+function Config:_get_filetype_name(filetype)
+  local map = {
+    ['emacs-lisp'] = 'lisp',
+    elisp = 'lisp',
+    js = 'javascript',
+    ts = 'typescript',
+    md = 'markdown',
+    ex = 'elixir',
+    pl = 'perl',
+    sh = 'bash',
+    shell = 'bash',
+    uxn = 'uxntal',
+  }
+  if map[filetype] then
+    return map[filetype]
+  end
+
+  if self.opts.org_edit_src_filetype_map[filetype] then
+    return self.opts.org_edit_src_filetype_map[filetype]
+  end
+
+  return filetype
+end
+
 ---@type OrgConfig
 instance = Config:new()
 return instance

lua/orgmode/files/elements/block.lua

@@ -76,7 +76,7 @@ function Block:get_language()
   if not language or language == '' then
     return nil
   end
-  return utils.detect_filetype(language)
+  return config:detect_filetype(language, true)
 end
 
 ---@return table<string, string>

lua/orgmode/objects/edit_special/types/src.lua

@@ -74,7 +74,7 @@ function EditSpecialSrc:init()
   -- so base the range off of the name of the block
   local ft = self.src_block.children.parameters.text
   if ft then
-    ft = utils.detect_filetype(ft)
+    ft = config:detect_filetype(ft, true)
   end
 
   local bufnr = es_utils.make_temp_buf()

lua/orgmode/utils/init.lua

@@ -560,39 +560,6 @@ function utils.find(entries, check_fn)
   return nil
 end
 
----@param name string
----@param skip_ftmatch? boolean
----@return string
-function utils.detect_filetype(name, skip_ftmatch)
-  local config = require('orgmode.config')
-  local map = {
-    ['emacs-lisp'] = 'lisp',
-    elisp = 'lisp',
-    js = 'javascript',
-    ts = 'typescript',
-    md = 'markdown',
-    ex = 'elixir',
-    pl = 'perl',
-    sh = 'bash',
-    shell = 'bash',
-    uxn = 'uxntal',
-  }
-  if not skip_ftmatch then
-    local filename = '__org__detect_filetype__.' .. (map[name] or name)
-    local ft = vim.filetype.match({ filename = filename })
-    if ft then
-      return ft
-    end
-  end
-  if map[name] then
-    return map[name]
-  end
-  if config.org_edit_src_filetype_map[name] then
-    return config.org_edit_src_filetype_map[name]
-  end
-  return name:lower()
-end
-
 ---@param filename string
 ---@return boolean
 function utils.is_org_file(filename)