phyer/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(sidebar): enhance pattern matching for local LLM (closes #588) (#589)

Browse Source 
- Extend pattern matching beyond "Replace lines: {{start_line}}-{{end_line}}" to support variations such as:
  - Extra whitespace
  - Numbered changes
  - Optional colons
  - Case insensitivity (upper- and lowercase)
  - Singular line references

- Add support for indented code snippets, allowing whitespace before code
blocks beginning with three backticks (```)
This commit is contained in:
Dennis Dillert 2024-09-15 16:59:57 +02:00 committed by GitHub
parent ff5d27a4cf
commit 6604d03237
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lua/avante/sidebar.lua
View File

@ -330,12 +330,19 @@ local function extract_code_snippets(code_content, response_content)
local explanation = ""
for idx, line in ipairs(vim.split(response_content, "\n")) do
local start_line_str, end_line_str = line:match("^Replace lines: (%d+)-(%d+)")
local _, start_line_str, end_line_str =
line:match("^%s*(%d*)[%.%)%s]*[Aa]?n?d?%s*[Rr]eplace%s+[Ll]ines:?%s*(%d+)%-(%d+)")
if start_line_str ~= nil and end_line_str ~= nil then
start_line = tonumber(start_line_str)
end_line = tonumber(end_line_str)
else
_, start_line_str = line:match("^%s*(%d*)[%.%)%s]*[Aa]?n?d?%s*[Rr]eplace%s+[Ll]ine:?%s*(%d+)")
if start_line_str ~= nil then
start_line = tonumber(start_line_str)
end_line = tonumber(start_line_str)
end
end
if line:match("^```") then
if line:match("^%s*```") then
if in_code_block then
if start_line ~= nil and end_line ~= nil then
local snippet = {
@ -354,7 +361,7 @@ local function extract_code_snippets(code_content, response_content)
explanation = ""
in_code_block = false
else
lang = line:match("^```(%w+)")
lang = line:match("^%s*```(%w+)")
if not lang or lang == "" then lang = "text" end
in_code_block = true
start_line_in_response_buf = idx
@ -479,9 +486,9 @@ local function parse_codeblocks(buf)
local lines = Utils.get_buf_lines(0, -1, buf)
for i, line in ipairs(lines) do
if line:match("^```") then
if line:match("^%s*```") then
-- parse language
local lang_ = line:match("^```(%w+)")
local lang_ = line:match("^%s*```(%w+)")
if in_codeblock and not lang_ then
table.insert(codeblocks, { start_line = start_line, end_line = i - 1, lang = lang })
in_codeblock = false