feat(nvim): only present device runners for given platform only

Author: kkharji

lua/xbase/pickers.lua

@@ -9,6 +9,7 @@ local maker = require("telescope.pickers.entry_display").create
 local xbase = require "xbase"
 local watch = require "xbase.watch"
 local themes = require "telescope.themes"
+local util = require "xbase.util"
 
 local mappings = function(_, _)
   action_set.select:replace(function(bufnr, direction)
@@ -55,40 +56,27 @@ end
 
 local get_selections = function(picker)
   local commands = picker == "Watch" and { "Build", "Run" } or { picker }
-  local root = vim.loop.cwd()
-  local info = vim.g.xbase.projects[root]
-  if info == nil then
-    error "No info available"
-  end
-
-  local targets = {}
+  local project = vim.g.xbase.projects[vim.loop.cwd()]
 
-  -- TOOD(core): Support custom schemes
-  for name, _ in pairs(info.targets) do
-    targets[#targets + 1] = name
+  if project == nil then
+    error "No project info found"
   end
 
-  -- TOOD(core): Support custom project configurations
-  local configurations = { "Debug", "Release" }
-
-  local devices = {}
+  local targets = util.get_targets_runners(project)
 
-  if picker == "Run" or picker == "Watch" then
-    -- TODO(nvim): Only include devices that is actually supported by target
-    devices = vim.tbl_map(function(device)
-      return {
-        name = device.info.name,
-        udid = device.info.udid,
-      }
-    end, vim.g.xbase.devices)
-  end
+  -- TOOD(core): Support custom project configurations and schemes
+  local configurations = { "Debug", "Release" }
 
   local results = {}
 
   for _, command in ipairs(commands) do
-    for _, target in ipairs(targets) do
+    for _, target_info in ipairs(targets) do
+      local target = target_info.name
+      local devices = target_info.runners
+      local include_devices = #devices ~= 0 and command == "Run"
+
       for _, configuration in ipairs(configurations) do
-        if #devices ~= 0 and command == "Run" then
+        if include_devices then
           for _, device in ipairs(devices) do
             insert_entry(results, picker, command, target, configuration, device)
           end
@@ -129,7 +117,7 @@ local entry_maker = function(entry)
     ti(parts, { entry.kind, "TSNone" })
   end
 
-  ti(items, { width = 9 })
+  ti(items, { width = 12 })
   entry.ordinal = string.format("%s %s", entry.ordinal, target)
   ti(parts, { target, "TSCharacter" })
 

lua/xbase/types.lua

@@ -40,6 +40,9 @@
 ---@field group string?
 
 ---@class Device
+---@field info DeviceInfo
+
+---@class DeviceInfo
 ---@field availabilityError string?,
 ---@field dataPath string
 ---@field deviceTypeIdentifier string

lua/xbase/util.lua

@@ -0,0 +1,43 @@
+local M = {}
+---@param platform Platform
+local get_runners = function(platform)
+  local devices = {}
+
+  for _, device in ipairs(vim.g.xbase.devices) do
+    if device.info.runtime_identifier:match(platform) then
+      table.insert(devices, {
+        name = device.info.name,
+        udid = device.info.udid,
+      })
+    end
+  end
+
+  return devices
+end
+
+---Get Targets from project
+---To Support Multi Platform targets
+---@param project Project
+M.get_targets_runners = function(project)
+  local targets = {}
+
+  for name, target in pairs(project.targets) do
+    if #target.platform > 1 then
+      for _, platform in ipairs(target.platform) do
+        table.insert(targets, {
+          name = string.format("%s_%s", name, platform),
+          runners = get_runners(platform),
+        })
+      end
+    else
+      table.insert(targets, {
+        name = name,
+        runners = get_runners(target.platform[1]),
+      })
+    end
+  end
+
+  return targets
+end
+
+return M