Merge branch 'akinsho:main' into main

Author: theniceboy

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [1.7.0](https://github.com/akinsho/flutter-tools.nvim/compare/v1.6.0...v1.7.0) (2024-01-03)
+
+
+### Features
+
+* add option to configure flutter mode via config ([#314](https://github.com/akinsho/flutter-tools.nvim/issues/314)) ([69466cc](https://github.com/akinsho/flutter-tools.nvim/commit/69466cc5ce3743bfb08ae07b0c415d7e549437d4))
+* add performance_overlay, repaint_rainbow and slow_animations commands ([deb4fa8](https://github.com/akinsho/flutter-tools.nvim/commit/deb4fa80812157e6c6dadaa25dfe0cfa42950e5c))
+* add web port param to config ([#320](https://github.com/akinsho/flutter-tools.nvim/issues/320)) ([b13d46b](https://github.com/akinsho/flutter-tools.nvim/commit/b13d46b3a06a9e2c414d0020c0cb7cf0dd51d426))
+
+## [1.6.0](https://github.com/akinsho/flutter-tools.nvim/compare/v1.5.1...v1.6.0) (2023-12-18)
+
+
+### Features
+
+* **commands:** add install/uninstall commands to menu ([#315](https://github.com/akinsho/flutter-tools.nvim/issues/315)) ([cd73844](https://github.com/akinsho/flutter-tools.nvim/commit/cd738444c27d3a34f03b6d43df08c814e8232fb7))
+
+
+### Bug Fixes
+
+* **commands:** set current device while running project ([045fa0f](https://github.com/akinsho/flutter-tools.nvim/commit/045fa0f56234943464a06666183cd1a3089aeca2))
+
 ## [1.5.1](https://github.com/akinsho/flutter-tools.nvim/compare/v1.5.0...v1.5.1) (2023-10-04)
 
 

README.md

@@ -319,7 +319,12 @@ require('flutter-tools').setup_project({
   {
     name = 'Web',
     device = 'chrome',
-    flavor = 'WebApp'
+    flavor = 'WebApp',
+    web_port = 4000
+  },
+  {
+    name = 'Profile',
+    flutter_mode = 'profile', -- possible values: `debug`, `profile` or `release`, defaults to `debug`
   }
 })
 ```

doc/flutter-tools.txt

@@ -1,4 +1,4 @@
-*flutter-tools.txt*      For Neovim >= 0.8.0      Last change: 2023 October 04
+*flutter-tools.txt*      For Neovim >= 0.8.0      Last change: 2024 January 22
 
 ==============================================================================
 Table of Contents                            *flutter-tools-table-of-contents*
@@ -358,7 +358,12 @@ _conceptually_ to vscode’s `launch.json` file.
       {
         name = 'Web',
         device = 'chrome',
-        flavor = 'WebApp'
+        flavor = 'WebApp',
+        web_port = 4000
+      },
+      {
+        name = 'Profile',
+        flutter_mode = 'profile', -- possible values: `debug`, `profile` or `release`, defaults to `debug`
       }
     })
 <

lua/flutter-tools/commands.lua

@@ -1,5 +1,5 @@
 local lazy = require("flutter-tools.lazy")
-local Job = require("plenary.job")
+local Job = require("plenary.job") ---@module "plenary.job"
 local ui = lazy.require("flutter-tools.ui") ---@module "flutter-tools.ui"
 local utils = lazy.require("flutter-tools.utils") ---@module "flutter-tools.utils"
 local devices = lazy.require("flutter-tools.devices") ---@module "flutter-tools.devices"
@@ -133,10 +133,13 @@ local function get_run_args(opts, conf)
   local target = conf and conf.target
   local dart_defines = conf and conf.dart_define
   local dart_define_from_file = conf and conf.dart_define_from_file
+  local flutter_mode = conf and conf.flutter_mode
+  local web_port = conf and conf.web_port
   local dev_url = dev_tools.get_url()
 
   if not use_debugger_runner() then vim.list_extend(args, { "run" }) end
   if not cmd_args and device then vim.list_extend(args, { "-d", device }) end
+  if web_port then vim.list_extend(args, { "--web-port", web_port }) end
   if cmd_args then vim.list_extend(args, cmd_args) end
   if flavor then vim.list_extend(args, { "--flavor", flavor }) end
   if target then vim.list_extend(args, { "--target", target }) end
@@ -148,16 +151,33 @@ local function get_run_args(opts, conf)
       vim.list_extend(args, { "--dart-define", ("%s=%s"):format(key, value) })
     end
   end
+  if flutter_mode then
+    if flutter_mode == "profile" then
+      vim.list_extend(args, { "--profile" })
+    elseif flutter_mode == "release" then
+      vim.list_extend(args, { "--release" })
+    end -- else default to debug
+  end
   if dev_url then vim.list_extend(args, { "--devtools-server-address", dev_url }) end
   return args
 end
 
+--- @param args string[]
+--- @return Device?
+local function get_device_from_args(args)
+  for i = 1, #args - 1 do
+    if args[i] == "-d" then return { id = args[i + 1] } end
+  end
+end
+
 ---@param opts RunOpts
 ---@param project_conf flutter.ProjectConfig?
 local function run(opts, project_conf)
   opts = opts or {}
   executable.get(function(paths)
     local args = opts.cli_args or get_run_args(opts, project_conf)
+
+    current_device = opts.device or get_device_from_args(args)
     ui.notify("Starting flutter project...")
     runner = use_debugger_runner() and debugger_runner or job_runner
     runner:run(paths, args, lsp.get_lsp_root_dir(), on_run_data, on_run_exit)
@@ -206,6 +226,15 @@ end
 ---@param quiet boolean?
 function M.visual_debug(quiet) send("visual_debug", quiet) end
 
+---@param quiet boolean?
+function M.performance_overlay(quiet) send("performance_overlay", quiet) end
+
+---@param quiet boolean?
+function M.repaint_rainbow(quiet) send("repaint_rainbow", quiet) end
+
+---@param quiet boolean?
+function M.slow_animations(quiet) send("slow_animations", quiet) end
+
 ---@param quiet boolean?
 function M.detach(quiet) send("detach", quiet) end
 
@@ -379,6 +408,78 @@ function M.fvm_use(sdk_name)
   end
 end
 
+---@param args string[]
+---@param project_conf flutter.ProjectConfig?
+---@return string[]
+local function set_args_from_project_config(args, project_conf)
+  local flavor = project_conf and project_conf.flavor
+  local device = project_conf and project_conf.device
+  if flavor then vim.list_extend(args, { "--flavor", flavor }) end
+  if device then vim.list_extend(args, { "-d", device }) end
+end
+
+---@type Job?
+local install_job = nil
+
+function M.install()
+  if not install_job then
+    select_project_config(function(project_conf)
+      local args = { "install" }
+      set_args_from_project_config(args, project_conf)
+      ui.notify("Installing the app...")
+      executable.flutter(function(cmd)
+        local notify_timeout = 10000
+        install_job = Job:new({
+          command = cmd,
+          args = args,
+        -- stylua: ignore
+        cwd = lsp.get_lsp_root_dir() --[[@as string]],
+        })
+        install_job:after_success(vim.schedule_wrap(function(j)
+          ui.notify(utils.join(j:result()), nil, { timeout = notify_timeout })
+          install_job = nil
+        end))
+        install_job:after_failure(vim.schedule_wrap(function(j)
+          ui.notify(utils.join(j:result()), nil, { timeout = notify_timeout })
+          install_job = nil
+        end))
+        install_job:start()
+      end)
+    end)
+  end
+end
+
+---@type Job?
+local uninstall_job = nil
+
+function M.uninstall()
+  if not uninstall_job then
+    select_project_config(function(project_conf)
+      local args = { "install", "--uninstall-only" }
+      set_args_from_project_config(args, project_conf)
+      ui.notify("Uninstalling the app...")
+      executable.flutter(function(cmd)
+        local notify_timeout = 10000
+        uninstall_job = Job:new({
+          command = cmd,
+          args = args,
+        -- stylua: ignore
+        cwd = lsp.get_lsp_root_dir() --[[@as string]],
+        })
+        uninstall_job:after_success(vim.schedule_wrap(function(j)
+          ui.notify(utils.join(j:result()), nil, { timeout = notify_timeout })
+          uninstall_job = nil
+        end))
+        uninstall_job:after_failure(vim.schedule_wrap(function(j)
+          ui.notify(utils.join(j:result()), nil, { timeout = notify_timeout })
+          uninstall_job = nil
+        end))
+        uninstall_job:start()
+      end)
+    end)
+  end
+end
+
 if __TEST then
   M.__run = run
   M.__get_run_args = get_run_args

lua/flutter-tools/config.lua

@@ -9,6 +9,8 @@ local ui = lazy.require("flutter-tools.ui") ---@module "flutter-tools.ui"
 ---@field target string
 ---@field dart_define {[string]: string}
 ---@field dart_define_from_file string
+---@field flutter_mode string
+---@field web_port number
 
 local M = {}
 

lua/flutter-tools/dap.lua

@@ -11,13 +11,20 @@ end
 
 local M = {}
 
+local function has_flutter_dependency_in_pubspec()
+  local pubspec = vim.fn.glob("pubspec.yaml")
+  if pubspec == "" then return false end
+  local pubspec_content = vim.fn.readfile(pubspec)
+  local joined_content = table.concat(pubspec_content, "\n")
+
+  local flutter_dependency = string.match(joined_content, "flutter:\n[%s\t]*sdk:[%s\t]*flutter")
+  return flutter_dependency ~= nil
+end
+
 function M.setup(config)
   local opts = config.debugger
   require("flutter-tools.executable").get(function(paths)
-    local root_patterns = { ".git", "pubspec.yaml" }
-    local current_dir = vim.fn.expand("%:p:h")
-    local root_dir = path.find_root(root_patterns, current_dir) or current_dir
-    local is_flutter_project = vim.loop.fs_stat(path.join(root_dir, ".metadata"))
+    local is_flutter_project = has_flutter_dependency_in_pubspec()
 
     if is_flutter_project then
       dap.adapters.dart = {