Large cleanup and switch to NVIM LSP

plugin/codelines.vim

@@ -4,4 +4,4 @@ function! codelines#close()
 endfunction
 
 inoremap <silent> <Plug>(codelines-close) <c-r>=codelines#close()<cr>
-noremap <silent> <Plug>(codelines-go-to-def) :exec "vimgrep #//>" . strpart(expand('<cword>'), 3) . "# code/*"<cr>
+noremap <silent> <Plug>(codelines-go-to-def) <cmd>exec "vimgrep #//>" . strpart(expand('<cword>'), 3) . "# code/*"<cr>

plugin/editft.vim

@@ -4,5 +4,5 @@ function! s:editft()
   exec "autocmd QuitPre <buffer> source " . ftpl
 endfunction
 
-noremap <silent> <Plug>(EditFT) :call <SID>editft()<cr>
+noremap <silent> <Plug>(EditFT) <cmd>call <SID>editft()<cr>
 map <leader>ftp <Plug>(EditFT)

plugin/smartq.vim

@@ -0,0 +1,19 @@
+nnoremap <silent> q <cmd>call <SID>SmartQ()<CR>
+function! s:SmartQ()
+  if exists("g:recording_macro")
+    let r = g:recording_macro
+    unlet g:recording_macro
+    normal! q
+    execute 'let @'.r.' = @'.r.'[:-2]'
+  else
+    let c = nr2char(getchar())
+    if c == ':'
+      call feedkeys(":q")
+    else
+      if c =~ '\v[0-9a-zA-Z"]'
+        let g:recording_macro = c
+      endif
+      execute 'normal! q'.c
+    endif
+  endif
+endfunction