Skip to content

Commit 1bd3bc9

Browse files
committed
refactor(state): rename opencode_server_job
It's started by server_job but opencode_server seems like the better name as it's an OpencodeServer
1 parent a30daf8 commit 1bd3bc9

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

lua/opencode/api_client.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ end
2323
function OpencodeApiClient:_call(endpoint, method, body, query)
2424
if not self.base_url then
2525
local state = require('opencode.state')
26-
state.opencode_server_job = server_job.ensure_server() --[[@as OpencodeServer]]
26+
state.opencode_server = server_job.ensure_server() --[[@as OpencodeServer]]
2727
-- shouldn't normally happen but prevents error in replay tester
28-
if not state.opencode_server_job then
28+
if not state.opencode_server then
2929
return nil
3030
end
31-
self.base_url = state.opencode_server_job.url:gsub('/$', '')
31+
self.base_url = state.opencode_server.url:gsub('/$', '')
3232
end
3333
local url = self.base_url .. endpoint
3434

@@ -363,7 +363,7 @@ end
363363
function OpencodeApiClient:subscribe_to_events(directory, on_event)
364364
if not self.base_url then
365365
local state = require('opencode.state')
366-
self.base_url = state.opencode_server_job.url:gsub('/$', '')
366+
self.base_url = state.opencode_server.url:gsub('/$', '')
367367
end
368368
local url = self.base_url .. '/event'
369369
if directory then

lua/opencode/core.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ end
4040
function M.open(opts)
4141
opts = opts or { focus = 'input', new_session = false }
4242

43-
if not state.opencode_server_job or not state.opencode_server_job:is_running() then
44-
state.opencode_server_job = server_job.ensure_server() --[[@as OpencodeServer]]
43+
if not state.opencode_server or not state.opencode_server:is_running() then
44+
state.opencode_server = server_job.ensure_server() --[[@as OpencodeServer]]
4545
end
4646

4747
local are_windows_closed = state.windows == nil

lua/opencode/event_manager.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ function EventManager:start()
232232
self.is_started = true
233233

234234
state.subscribe(
235-
'opencode_server_job',
235+
'opencode_server',
236236
--- @param key string
237237
--- @param current OpencodeServer|nil
238238
--- @param prev OpencodeServer|nil

lua/opencode/opencode_server.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ function OpencodeServer.new()
1919
group = vim.api.nvim_create_augroup('OpencodeVimLeavePre', { clear = true }),
2020
callback = function()
2121
local state = require('opencode.state')
22-
if state.opencode_server_job then
23-
state.opencode_server_job:shutdown()
22+
if state.opencode_server then
23+
state.opencode_server:shutdown()
2424
end
2525
end,
2626
})

lua/opencode/server_job.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,17 @@ function M.cancel_all_requests()
148148
end
149149

150150
function M.ensure_server()
151-
if state.opencode_server_job and state.opencode_server_job:is_running() then
152-
return state.opencode_server_job
151+
if state.opencode_server and state.opencode_server:is_running() then
152+
return state.opencode_server
153153
end
154154

155155
local promise = Promise.new()
156-
state.opencode_server_job = opencode_server.new()
156+
state.opencode_server = opencode_server.new()
157157

158158
---@diagnostic disable-next-line: missing-fields
159-
state.opencode_server_job:spawn({
159+
state.opencode_server:spawn({
160160
on_ready = function(_, base_url)
161-
promise:resolve(state.opencode_server_job)
161+
promise:resolve(state.opencode_server)
162162
end,
163163
on_error = function(err)
164164
promise:reject(err)

lua/opencode/state.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ local config = require('opencode.config')
3030
---@field cost number
3131
---@field tokens_count number
3232
---@field job_count number
33-
---@field opencode_server_job OpencodeServer|nil
33+
---@field opencode_server OpencodeServer|nil
3434
---@field api_client OpencodeApiClient
3535
---@field event_manager EventManager|nil
3636
---@field required_version string
@@ -69,7 +69,7 @@ local _state = {
6969
tokens_count = 0,
7070
-- job
7171
job_count = 0,
72-
opencode_server_job = nil,
72+
opencode_server = nil,
7373
api_client = nil,
7474
event_manager = nil,
7575

tests/unit/core_spec.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ describe('opencode.core', function()
8383
mock_api_client()
8484

8585
-- Mock server job to avoid trying to start real server
86-
state.opencode_server_job = {
86+
state.opencode_server = {
8787
is_running = function()
8888
return true
8989
end,

0 commit comments

Comments
 (0)