1 files changed, 12 insertions, 0 deletions
diff --git a/test/functional/lua/filetype_spec.lua b/test/functional/lua/filetype_spec.lua
index 574c837f92..b6011d5268 100644
--- a/test/functional/lua/filetype_spec.lua
+++ b/test/functional/lua/filetype_spec.lua
@@ -161,6 +161,18 @@ describe('vim.filetype', function()
       end
     end
   end)
+
+  it('.get_option() cleans up buffer on error', function()
+    api.nvim_create_autocmd('FileType', { pattern = 'foo', command = 'lua error()' })
+
+    local buf = api.nvim_get_current_buf()
+
+    exec_lua(function()
+      pcall(vim.filetype.get_option, 'foo', 'lisp')
+    end)
+
+    eq(buf, api.nvim_get_current_buf())
+  end)
 end)
 
 describe('filetype.lua', function()