Skip to content

fix: Check if diff treesitter parser exists #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deathbeam merged 1 commit into from
Mar 10, 2024
Merged

fix: Check if diff treesitter parser exists #144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions lua/CopilotChat/diff.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ local function create_buf()
local bufnr = vim.api.nvim_create_buf(false, true)
vim.api.nvim_buf_set_name(bufnr, 'copilot-diff')
vim.bo[bufnr].filetype = 'diff'
vim.treesitter.start(bufnr, 'diff')
vim.bo[bufnr].syntax = 'diff'
return bufnr
end

Expand Down Expand Up @@ -93,8 +93,11 @@ function Diff:show(a, b, filetype, winnr)
end

vim.api.nvim_buf_set_extmark(self.bufnr, self.mark_ns, 0, 0, opts)
vim.treesitter.start(self.bufnr, 'diff')
vim.bo[self.bufnr].syntax = filetype
local ok, parser = pcall(vim.treesitter.get_parser, self.bufnr, 'diff')
if ok and parser then
vim.treesitter.start(self.bufnr, 'diff')
vim.bo[self.bufnr].syntax = filetype
end
end

function Diff:restore(winnr, bufnr)
Expand Down