From 72877bb17d70362f91a60b31bf0244dbf8ed58ae Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 7 Jul 2022 18:53:47 +0200
Subject: feat(runtime)!: enable filetype.lua by default (#19216)

* revert to filetype.vim by setting `g:do_legacy_filetype`
* skip either filetype.lua or filetype.vim via `g:did_load_filetypes`

(Running both is no longer required and therefore no longer supported.)
---
 runtime/filetype.lua | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

(limited to 'runtime/filetype.lua')

diff --git a/runtime/filetype.lua b/runtime/filetype.lua
index f1885a8b95..9f5b5fd0dc 100644
--- a/runtime/filetype.lua
+++ b/runtime/filetype.lua
@@ -1,11 +1,8 @@
-if vim.g.did_load_filetypes and vim.g.did_load_filetypes ~= 0 then
-  return
-end
-
--- For now, make this opt-in with a global variable
-if vim.g.do_filetype_lua ~= 1 then
+-- Skip if legacy filetype is enabled or filetype detection is disabled
+if vim.g.do_legacy_filetype or vim.g.did_load_filetypes then
   return
 end
+vim.g.did_load_filetypes = 1
 
 vim.api.nvim_create_augroup('filetypedetect', { clear = false })
 
@@ -38,21 +35,16 @@ if not vim.g.did_load_ftdetect then
   ]])
 end
 
--- Set a marker so that the ftdetect scripts are not sourced a second time by filetype.vim
-vim.g.did_load_ftdetect = 1
-
--- If filetype.vim is disabled, set up the autocmd to use scripts.vim
-if vim.g.did_load_filetypes then
-  vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
-    group = 'filetypedetect',
-    command = "if !did_filetype() && expand('<amatch>') !~ g:ft_ignore_pat | runtime! scripts.vim | endif",
-  })
+-- Set up the autocmd for user scripts.vim
+vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
+  group = 'filetypedetect',
+  command = "if !did_filetype() && expand('<amatch>') !~ g:ft_ignore_pat | runtime! scripts.vim | endif",
+})
 
-  vim.api.nvim_create_autocmd('StdinReadPost', {
-    group = 'filetypedetect',
-    command = 'if !did_filetype() | runtime! scripts.vim | endif',
-  })
-end
+vim.api.nvim_create_autocmd('StdinReadPost', {
+  group = 'filetypedetect',
+  command = 'if !did_filetype() | runtime! scripts.vim | endif',
+})
 
 if not vim.g.ft_ignore_pat then
   vim.g.ft_ignore_pat = '\\.\\(Z\\|gz\\|bz2\\|zip\\|tgz\\)$'
-- 
cgit