Skip to content

Commit 824faf5

Browse files
authored
fix(commands): make inspect widget command work in debug runner (#413)
- Rename widget_inspector to inspect_widget for consistency - Rename construction_lines to paint_baselines to match Flutter API - Add error handling when calling VM service extensions - Fix toggle value logic for VM service extensions
1 parent 40f974b commit 824faf5

File tree

5 files changed

+21
-19
lines changed

5 files changed

+21
-19
lines changed

lua/flutter-tools/commands.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,10 @@ function M.open_dev_tools(quiet) send("open_dev_tools", quiet) end
350350
function M.generate(quiet) send("generate", quiet) end
351351

352352
---@param quiet boolean
353-
function M.widget_inspector(quiet) send("inspect", quiet) end
353+
function M.inspect_widget(quiet) send("inspect_widget", quiet) end
354354

355355
---@param quiet boolean
356-
function M.construction_lines(quiet) send("construction_lines", quiet) end
356+
function M.paint_baselines(quiet) send("paint_baselines", quiet) end
357357

358358
-----------------------------------------------------------------------------//
359359
-- Pub commands

lua/flutter-tools/menu.lua

+7-7
Original file line numberDiff line numberDiff line change
@@ -151,16 +151,16 @@ function M.commands(opts)
151151
command = commands.detach,
152152
},
153153
{
154-
id = "flutter-tools-widget-inspector",
155-
label = "Widget Inspector",
154+
id = "flutter-tools-inspect-widget",
155+
label = "Inspect Widget",
156156
hint = "Toggle the widget inspector",
157-
command = commands.widget_inspector,
157+
command = commands.inspect_widget,
158158
},
159159
{
160-
id = "flutter-tools-construction-lines",
161-
label = "Construction Lines",
162-
hint = "Display construction lines",
163-
command = commands.construction_lines,
160+
id = "flutter-tools-paint-baselines",
161+
label = "Paint Baselines",
162+
hint = "Toggle paint baselines",
163+
command = commands.paint_baselines,
164164
},
165165
}
166166
else

lua/flutter-tools/runners/debugger_runner.lua

+5-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ local command_requests = {
1818
restart = "hotRestart",
1919
reload = "hotReload",
2020
quit = "terminate",
21-
inspect = "widgetInspector",
22-
construction_lines = "constructionLines",
2321
}
2422

2523
function DebuggerRunner:is_running() return dap.session() ~= nil end
@@ -208,7 +206,11 @@ function DebuggerRunner:send(cmd, quiet)
208206
end
209207
local service_activation_params = vm_service_extensions.get_request_params(cmd)
210208
if service_activation_params then
211-
dap.session():request("callService", service_activation_params)
209+
dap.session():request("callService", service_activation_params, function(err, _)
210+
if err and not quiet then
211+
ui.notify("Error calling service " .. cmd .. ": " .. err, ui.ERROR)
212+
end
213+
end)
212214
return
213215
end
214216
if not quiet then

lua/flutter-tools/runners/job_runner.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ local command_keys = {
1515
quit = "q",
1616
visual_debug = "p",
1717
detach = "d",
18-
inspect = "i",
19-
construction_lines = "p",
18+
inspect_widget = "i",
19+
paint_baselines = "p",
2020
open_dev_tools = "v",
2121
generate = "g",
2222
}

lua/flutter-tools/runners/vm_service_extensions.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ local service_activation_requests = {
1212
performance_overlay = "ext.flutter.showPerformanceOverlay",
1313
repaint_rainbow = "ext.flutter.repaintRainbow",
1414
slow_animations = "ext.flutter.timeDilation",
15+
inspect_widget = "ext.flutter.inspector.show",
16+
paint_baselines = "ext.flutter.debugPaintBaselinesEnabled",
1517
}
1618

1719
local toggle_extension_state_keys = {
1820
visual_debug = "enabled",
1921
performance_overlay = "enabled",
2022
repaint_rainbow = "enabled",
2123
slow_animations = "timeDilation",
24+
inspect_widget = "enabled",
25+
paint_baselines = "enabled",
2226
}
2327

2428
local function toggle_value(request)
@@ -30,11 +34,7 @@ local function toggle_value(request)
3034
return "5.0"
3135
end
3236
end
33-
if value == "true" then
34-
return "false"
35-
else
36-
return "true"
37-
end
37+
return not value
3838
end
3939

4040
---@type flutter.VmServiceExtensions

0 commit comments

Comments
 (0)