Better find.kak

find.diff

diff --git a/jlf/kak/conf.d/find.kak b/jlf/kak/conf.d/find.kak
index aa81e4d..9f32f80 100644
--- a/jlf/kak/conf.d/find.kak
+++ b/jlf/kak/conf.d/find.kak
@@ -20,7 +20,7 @@ If <pattern> is not specified, the content of the main selection is used
                 # merge selections that are on the same line
                 exec '<a-s><a-L><a-;>;'
                 eval -save-regs 'c"' -itersel %{
-                    reg c "%val{bufname}:%val{cursor_line}:"
+                    reg c "%val{bufname}:%val{cursor_line}:%val{cursor_column}:"
                     # expand to full line and yank
                     exec -save-regs '' '<a-x>Hy'
                     # paste context followed by the selection
@@ -80,7 +80,7 @@ If -force is specified, changes will also be applied to files that do not curren
         reg c %sh{ [ "$1" = "-force" ] && printf find-apply-force-impl || printf find-apply-impl }
         eval -save-regs '/"' -draft %{
             # select all lines that match the *find* pattern
-            exec '%3s^([^\n]+):(\d+):([^\n]*)$<ret>'
+            exec '%3s^([^\n:]+):(\d+):(?:\d+:)?([^\n]*)$<ret>'
             eval -itersel %{
                 try %{
                     exec -save-regs '' <a-*>

find.kak

decl -hidden int find_current_line 0

def -params ..1 -docstring "
find [<pattern>]: search for a pattern in all buffers
If <pattern> is not specified, the content of the main selection is used
" find %{
    try %{
        eval %sh{ [ -z "$1" ] && echo fail }
        reg / %arg{1}
    } catch %{
        exec -save-regs '' '*'
    }
    eval -draft -no-hooks -save-regs '"' %{
        try %{ delete-buffer! *find* }
        # debug so that it's not included in the iteration
        edit -scratch -debug *find-tmp*
        eval -buffer * %{
            try %{
                exec '%s<ret>'
                # merge selections that are on the same line
                exec '<a-s><a-L><a-;>;'
                eval -save-regs 'c"' -itersel %{
                    reg c "%val{bufname}:%val{cursor_line}:%val{cursor_column}:"
                    # expand to full line and yank
                    exec -save-regs '' '<a-x>Hy'
                    # paste context followed by the selection
                    exec -buffer *find-tmp* 'geo<esc>"cPP'
                }
            }
        }
    }
    buffer *find-tmp*
    exec -save-regs '' 'd%y'
    delete-buffer *find-tmp*
    edit -scratch *find*
    exec R
    set buffer find_current_line 0
    buffer *find*
    set buffer filetype 'grep'
}

def -hidden find-apply-impl -params 4 %{
    eval -buffer %arg{1} %{
        try %{
            # go to the target line and select it (except for \n)
            exec "%arg{2}g<a-x>H"
            # check for noop, and abort if it's one
            reg / %arg{3}
            exec <a-K><ret>
            # replace
            reg '"' %arg{4}
            exec R
            reg s "%reg{s}o"
            write
        } catch %{
            reg i "%reg{i}o"
        }
    }
}
def -hidden find-apply-force-impl -params 4 %{
    try %{
        find-apply-impl %arg{@}
    } catch %{
        # the buffer wasn't open: try editing it
        # if this fails there is nothing we can do
        eval -no-hooks -draft "edit -existing %arg{1}"
        find-apply-impl %arg{@}
        eval -no-hooks -buffer %arg{1} "delete-buffer"
    }
}

def find-apply-changes -params ..1 -docstring "
find-apply-changes [-force]: apply changes specified in the current buffer to their respective file
If -force is specified, changes will also be applied to files that do not currently have a buffer
" %{
    eval -no-hooks -save-regs 'csif' %{
        reg s ""
        reg i ""
        reg f ""
        reg c %sh{ [ "$1" = "-force" ] && printf find-apply-force-impl || printf find-apply-impl }
        eval -save-regs '/"' -draft %{
            # select all lines that match the *find* pattern
            exec '%3s^([^\n:]+):(\d+):(?:\d+:)?([^\n]*)$<ret>'
            eval -itersel %{
                try %{
                    exec -save-regs '' <a-*>
                    %reg{c} %reg{1} %reg{2} "%reg{/}" %reg{3}
                } catch %{
                    reg f "%reg{f}o"
                }
            }
        }
        echo -markup %sh{
            printf "{Information}"
            s=${#kak_main_reg_s}
            [ $s -ne 1 ] && p=s
            printf "%i change%s applied" "$s" "$p"
            i=${#kak_main_reg_i}
            [ $i -gt 0 ] && printf ", %i ignored" "$i"
            f=${#kak_main_reg_f}
            [ $f -gt 0 ] && printf ", %i failed" "$f"
        }
    }
}

grep.kak

declare-option -hidden str default_grep_cmd
evaluate-commands %sh{
    if command -v ag > /dev/null; then
        echo "set-option global default_grep_cmd 'ag --column --'"
    else
        echo "set-option global default_grep_cmd 'grep -RHn --'"
    fi
}
set-option global grepcmd %opt{default_grep_cmd}
define-command -docstring "grep using git-grep" -params .. git-grep %{
    set-option global grepcmd 'git grep -n --column --'
    grep %arg{@}
    set-option global grepcmd %opt{default_grep_cmd}
}