Skip to content

Commit 3a3008d

Browse files
committed
Revert "fix: emit opencode_output FileType event when window created (sudo-tee#431)"
This reverts commit 15fe651.
1 parent 33a6629 commit 3a3008d

3 files changed

Lines changed: 11 additions & 19 deletions

File tree

lua/opencode/ui/output_window.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ end
8686
---@return integer
8787
function M.create_buf()
8888
local output_buf = vim.api.nvim_create_buf(false, true)
89+
local filetype = config.ui.output.filetype or 'opencode_output'
90+
vim.api.nvim_set_option_value('filetype', filetype, { buf = output_buf })
8991

9092
vim.api.nvim_buf_set_var(output_buf, 'opencode_folds', build_fold_state({}))
9193

lua/opencode/ui/ui.lua

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -386,12 +386,6 @@ function M.create_windows()
386386

387387
windows.input_win = win_ids.input_win
388388
windows.output_win = win_ids.output_win
389-
390-
local filetype = config.ui.output.filetype or 'opencode_output'
391-
vim.api.nvim_win_call(windows.output_win, function()
392-
vim.api.nvim_set_option_value('filetype', filetype, { buf = windows.output_buf })
393-
end)
394-
395389
windows.saved_width_ratio = state.last_window_width_ratio
396390

397391
input_window.setup(windows)

tests/unit/output_window_spec.lua

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,26 @@ local function parse_fillchars(value)
1717
return result
1818
end
1919

20-
describe('ui.create_windows output filetype', function()
21-
local ui = require('opencode.ui.ui')
20+
describe('output_window.create_buf', function()
2221
local original_config
23-
local windows
2422

2523
before_each(function()
2624
original_config = vim.deepcopy(config.values)
2725
config.values = vim.deepcopy(config.defaults)
28-
state.ui.set_windows(nil)
2926
end)
3027

3128
after_each(function()
32-
if windows then
33-
pcall(ui.close_windows, windows, false)
34-
windows = nil
35-
end
36-
state.ui.set_windows(nil)
3729
config.values = original_config
3830
end)
3931

4032
it('uses default output filetype', function()
4133
config.setup({})
42-
windows = ui.create_windows()
34+
local buf = output_window.create_buf()
4335

44-
local filetype = vim.api.nvim_get_option_value('filetype', { buf = windows.output_buf })
36+
local filetype = vim.api.nvim_get_option_value('filetype', { buf = buf })
4537
assert.equals('opencode_output', filetype)
38+
39+
pcall(vim.api.nvim_buf_delete, buf, { force = true })
4640
end)
4741

4842
it('uses configured output filetype', function()
@@ -54,10 +48,12 @@ describe('ui.create_windows output filetype', function()
5448
},
5549
})
5650

57-
windows = ui.create_windows()
58-
local filetype = vim.api.nvim_get_option_value('filetype', { buf = windows.output_buf })
51+
local buf = output_window.create_buf()
52+
local filetype = vim.api.nvim_get_option_value('filetype', { buf = buf })
5953

6054
assert.equals('markdown', filetype)
55+
56+
pcall(vim.api.nvim_buf_delete, buf, { force = true })
6157
end)
6258
end)
6359

0 commit comments

Comments
 (0)