after/ftplugin/cpp.lua

@@ -1,4 +1,3 @@
-vim.opt.commentstring = '//%s'
+vim.bo.commentstring = '//%s'
-vim.opt.matchpairs:append('<:>')
 
 require('build').create_commands()

lua/commands.lua

@@ -15,33 +15,17 @@ end, { nargs = 1 })
 -- vim.loop.fs_rename
 
 -- :Remove the file associated with the current buffer, then delete the buffer
-vim.api.nvim_create_user_command('Remove', function(opts)
+vim.api.nvim_create_user_command('Remove', function()
   local path = vim.fn.expand('%:p')
-  -- Using opts.bang in the callback can cause a SEGFAULT, instead use it
+  vim.loop.fs_unlink(path, function(err, success)
-  -- before invoking the async unlink to select which callback should be called
+    if success then
-  -- on completion.
+      vim.schedule(function()
-  local callback = nil
+        vim.api.nvim_buf_delete(vim.api.nvim_get_current_buf(), {})
-  if opts.bang then
+      end)
-    -- Invoked as :Remove! so also delete the buffer.
+    else
-    callback = function(err, success)
+      error(err)
-      if success then
-        vim.schedule(function()
-          vim.api.nvim_buf_delete(vim.api.nvim_get_current_buf(), {})
-        end)
-      else
-        error(err)
-      end
     end
-  else
+  end)
-    -- Invoked as :Remove so don't delete the buffer.
+end, {})
-    callback = function(err, success)
-      if not success then
-        error(err)
-      end
-    end
-  end
-  -- Actually remove the file using the selecte callback.
-  vim.loop.fs_unlink(path, callback)
-end, { bang = true })
 
 -- TODO: :Move