fix - fix incorrect method name and displaced comment

Author: kaerumm

lua/flutter-tools/lsp/init.lua

@@ -3,7 +3,6 @@ local utils = lazy.require("flutter-tools.utils") ---@module "flutter-tools.util
 local path = lazy.require("flutter-tools.utils.path") ---@module "flutter-tools.utils.path"
 local color = lazy.require("flutter-tools.lsp.color") ---@module "flutter-tools.lsp.color"
 local lsp_utils = lazy.require("flutter-tools.lsp.utils") ---@module "flutter-tools.lsp.utils"
-local fvm_utils = lazy.require("flutter-tools.lsp.fvm_utils") ---@module "flutter-tools.lsp.fvm_utils"
 
 local api = vim.api
 local lsp = vim.lsp
@@ -168,14 +167,16 @@ end
 ---@return string?
 function M.get_project_root_dir()
   local conf = require("flutter-tools.config")
-  local current_buffer_path = lsp_utils.current_buffer_path_if_valid()
+  local current_buffer_path = path.current_buffer_path()
+  local root_path = lsp_utils.is_valid_path(current_buffer_path) and
+      path.find_root(conf.root_patterns, current_buffer_path)
 
-  if (current_buffer_path == nil) then
-    local client = lsp_utils.get_dartls_client()
-    return client and client.config.root_dir or nil
+  if (root_path ~= nil) then
+    return root_path
   end
 
-  return path.find_root(conf.root_patterns, current_buffer_path) or current_buffer_path
+  local client = lsp_utils.get_dartls_client()
+  return client and client.config.root_dir or nil
 end
 
 -- FIXME: I'm not sure how to correctly wait till a server is ready before
@@ -242,18 +243,6 @@ local function get_server_config(user_config, callback)
     config.on_init = function(client, _)
       return client.notify("workspace/didChangeConfiguration", { settings = config.settings })
     end
-    -- TODO: flag something such that we only call attach on exit that has been flagged to
-    -- re attach.
-    config.on_exit = function()
-      if not M.pending_reattach then
-        return
-      end
-      M.pending_reattach = false
-      -- vim.schedule does not work, it executes attach too soon and
-      -- instead of creating a new client, the lsp implementation tries
-      -- to use the old, stopped client.
-      vim.defer_fn(M.attach, 0)
-    end
     callback(config, paths)
   end)
 end

lua/flutter-tools/lsp/utils.lua

@@ -4,12 +4,12 @@ local lazy = require("flutter-tools.lazy")
 
 local lsp = vim.lsp
 
+-- TODO: Remove after compatibility with Neovim=0.9 is dropped
 local get_clients = vim.fn.has("nvim-0.10") == 1 and lsp.get_clients or lsp.get_active_clients
 local utils = lazy.require("flutter-tools.utils") ---@module "flutter-tools.utils"
 
 M.SERVER_NAME = "dartls"
 
--- TODO: Remove after compatibility with Neovim=0.9 is dropped
 
 ---@param bufnr number?
 ---@return vim.lsp.Client?

lua/flutter-tools/utils/init.lua

@@ -151,18 +151,4 @@ M.islist = vim.fn.has("nvim-0.10") == 1 and vim.islist or vim.tbl_islist
 local flatten = function(t) return vim.iter(t):flatten():totable() end
 M.flatten = vim.fn.has("nvim-0.11") == 1 and flatten or vim.tbl_flatten
 
----@generic T
----@param t T[]
----@param t2 T[]
----@param compare fun(a: T, b: T): boolean
-function M.compare(t, t2, compare)
-  if #t2 ~= #t then return false end
-  for index, _ in ipairs(t) do
-    if not compare(t[index], t2[index]) then
-      return false
-    end
-  end
-  return true
-end
-
 return M