Skip to content

Commit aef38f9

Browse files
chore: final cleanup
1 parent 542f038 commit aef38f9

File tree

4 files changed

+6
-32
lines changed

4 files changed

+6
-32
lines changed

doc/rest-nvim.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,9 @@ rest.Opts.Env *rest.Opts.Env*
230230
rest.Opts.UI *rest.Opts.UI*
231231

232232
Fields: ~
233-
{winbar?} (boolean) Set winbar in result pane (Default: `true`)
234-
{keybinds?} (rest.Opts.UI.Keybinds) Default mappings for result pane
233+
{winbar?} (boolean) Set winbar in result pane (Default: `true`)
234+
{keybinds?} (rest.Opts.UI.Keybinds) Default mappings for result pane
235+
{panes?} (rest.ui.panes.PaneOpts[]) Result UI (Default: `rest-nvim.ui.panes.preset.legacy`)
235236

236237

237238
rest.Opts.UI.Keybinds *rest.Opts.UI.Keybinds*

lua/rest-nvim/config/default.lua

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,8 @@ local default_config = {
9090
---@type string Mapping for cycle to next result pane
9191
next = "L",
9292
},
93-
-- TODO: add panes object as configurable pane list
94-
-- including raw or request log
9593
---@type rest.ui.panes.PaneOpts[]
96-
panes = require("rest-nvim.ui.panes.preset.browser"),
97-
-- panes = require("rest-nvim.ui.panes.preset.onepage"),
94+
panes = require("rest-nvim.ui.panes.preset.legacy"),
9895
},
9996
---@class rest.Config.Highlight
10097
highlight = {

lua/rest-nvim/config/init.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ local config
109109
---@field winbar? boolean
110110
--- Default mappings for result pane
111111
---@field keybinds? rest.Opts.UI.Keybinds
112+
--- Result UI (Default: `rest-nvim.ui.panes.preset.legacy`)
113+
---@field panes? rest.ui.panes.PaneOpts[]
112114

113115
---@class rest.Opts.UI.Keybinds
114116
--- Mapping for cycle to previous result pane (Default: `"H"`)

lua/rest-nvim/ui/result.lua

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ local ui = {}
1111
local config = require("rest-nvim.config")
1212
local utils = require("rest-nvim.utils")
1313
local paneui = require("rest-nvim.ui.panes")
14-
local logger = require("rest-nvim.logger")
1514

1615
---data used to render the UI
1716
---@class rest.UIData
@@ -22,31 +21,6 @@ local data = {
2221
response = nil,
2322
}
2423

25-
-- TODO: refactor UI update logic
26-
-- - UI will have global "state" object
27-
-- - when state object is updated, all panes will be re-rendered
28-
29-
-- TODO:
30-
--
31-
-- Browser style:
32-
-- Headers (request & response) <- in rest_nvim_result filetype
33-
-- Payload (request body) <- in proper filetype
34-
-- Response (response body) <- in proper filetype
35-
-- Trace
36-
--
37-
-- OnePage style:
38-
-- Response (request uri & response body) <- in rest_nvim_result filetype
39-
-- Headers (response headers) <- manual highlighting
40-
-- Cookies (response cookies) <- manual highlighting
41-
-- Statistics <- manual highlighting
42-
--
43-
-- TODO: Request pane showing what is sent
44-
-- TODO: change Response pane to only show the actual response (including headers if Headers
45-
-- pane is not visible)
46-
-- TODO: Body panes for dedicated bodies (like browser)
47-
-- TODO: rename current Response pane to Summary pane
48-
-- TODO: Raw pane showing raw curl log
49-
5024
local winbar = "%#Normal# %{%v:lua.require('rest-nvim.ui.panes').winbar()%}"
5125
winbar = winbar .. "%=%<"
5226
winbar = winbar .. "%{%v:lua.require('rest-nvim.ui.result').stat_winbar()%}"

0 commit comments

Comments
 (0)