Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lua/dap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ function M.run(config, opts)
return
end
opts.filetype = opts.filetype or vim.bo.filetype
opts.new = nil
last_run = {
config = config,
opts = opts,
Expand Down
38 changes: 37 additions & 1 deletion tests/integration_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ local function run_and_wait_until_initialized(conf, server)
-- wait for initialize and launch requests
return (session and session.initialized and #server.spy.requests == 2)
end, 100)
return dap.session()
return assert(dap.session(), "Must have session after run")
end

describe('dap with fake server', function()
Expand Down Expand Up @@ -937,3 +937,39 @@ describe('progress support', function()
assert.are.same('Running: Launch file', progress.status())
end)
end)


describe("run_last", function()
local server
before_each(function()
server = require('tests.server').spawn()
dap.adapters.dummy = server.adapter
end)
after_each(function()
server.stop()
dap.terminate()
end)

it('can repeat run_last and it always clears session', function()
server.client.initialize = function(self, request)
self:send_response(request, {
supportsTerminateRequest = true,
})
self:send_event("initialized", {})
end

run_and_wait_until_initialized(config, server)
server.spy.clear()
dap.run_last()
wait(function() return #server.spy.requests == 3 end)
local commands = vim.tbl_map(function(x) return x.command end, server.spy.requests)
assert.are.same({"terminate", "initialize", "launch"}, commands)
assert.are.same(1, vim.tbl_count(dap.sessions()))

dap.run_last()
wait(function() return #server.spy.requests == 3 end)
commands = vim.tbl_map(function(x) return x.command end, server.spy.requests)
assert.are.same({"terminate", "initialize", "launch"}, commands)
assert.are.same(1, vim.tbl_count(dap.sessions()))
end)
end)
6 changes: 6 additions & 0 deletions tests/server.lua
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ function Client:disconnect(request)
end


function Client:terminate(request)
self:send_event('terminated', {})
self:send_response(request, {})
end


function Client:launch(request)
self:send_response(request, {})
end
Expand Down