Remove Electron (!) via Tauri

package.json

@@ -6,7 +6,8 @@
   "description": "Extensible Neovim GUI forked from Veonim",
   "main": "build/main/main.js",
   "scripts": {
-    "dev": "npm run build && electron build/main/main.js",
+    "tauri": "tauri",
+    "dev": "npm run build && tauri dev",
     "prod": "npm run build:prod && NODE_ENV=production electron build/main/main.js",
     "prod:start": "NODE_ENV=production electron build/main/main.js",
     "build": "node tools/build.js",
@@ -31,6 +32,8 @@
   },
   "homepage": "https://github.com/smolck/uivonim",
   "dependencies": {
+    "@tauri-apps/api": "^1.0.0-beta.5",
+    "canvaskit-wasm": "^0.29.0",
     "feather-icons": "^4.28.0",
     "fuzzaldrin-plus": "^0.6.0",
     "highlight.js": "^10.7.2",
@@ -48,13 +51,15 @@
     "@babel/plugin-transform-modules-commonjs": "^7.14.5",
     "@babel/preset-typescript": "^7.14.5",
     "@medv/finder": "^2.0.0",
+    "@tauri-apps/cli": "^1.0.0-beta.6",
     "@types/fuzzaldrin-plus": "^0.6.2",
     "@types/marked": "^2.0.4",
     "@types/node": "^16.4.7",
     "@types/webgl2": "0.0.6",
     "babel-loader": "^8.2.2",
     "babel-plugin-inferno": "^6.3.0",
     "babel-plugin-syntax-jsx": "^6.18.0",
+    "copy-webpack-plugin": "^9.0.1",
     "electron": "^13.1.7",
     "electron-builder": "^22.11.7",
     "electron-devtools-installer": "^3.2.0",

runtime/lua/uivonim.lua

@@ -1,7 +1,7 @@
 local M = {}
 
 function M.notify_uivonim(message, ...)
-  vim.rpcnotify(0, 'uivonim', message, {...})
+  vim.rpcnotify(0, 'uivonim', message, { ... })
 end
 
 function M.disable_default_shortcuts()

runtime/lua/uivonim/git.lua

@@ -0,0 +1,91 @@
+local M = {}
+local Job = require('plenary.job')
+local notify_uivonim = require('uivonim').notify_uivonim
+
+local function shell(cwd, cb, ...)
+  local args = { ... }
+  local command = args[1]
+  table.remove(args, 1)
+
+  local stuff = {}
+  local j = Job:new({
+    command = command,
+    args = args,
+    cwd = cwd,
+    enable_recording = true,
+    on_stdout = function(_, data)
+      table.insert(stuff, data)
+    end,
+    on_exit = vim.schedule_wrap(function()
+      cb(stuff)
+    end),
+  })
+
+  local ok = pcall(function()
+    j:start()
+  end)
+
+  if not ok then
+    cb()
+  end
+
+  -- TODO(smolck): args here should be . . . ?
+  -- def at https://github.com/nvim-lua/plenary.nvim/blob/6a51028a103518826423b0c408077ea7e258f1ee/lua/plenary/job.lua#L445
+  -- local _, res = pcall(function()
+  --   return j:sync(2000, 5)
+  -- end)
+  -- return res
+end
+
+local function get_git_status(cwd, cb)
+  shell(cwd, function(res)
+    if not res then
+      cb()
+    else
+      local sum = { additions = 0, deletions = 0 }
+      local mapped = vim.tbl_map(function(s)
+        -- TODO(smolck): Does this work on all OSes & circumstances etc.?
+        local stuff = vim.fn.split(s, '\t')
+
+        return {
+          additions = tonumber(stuff[1]),
+          deletions = tonumber(stuff[2]),
+        }
+      end, res)
+
+      for _, tbl in ipairs(mapped) do
+        sum.additions = sum.additions + tbl.additions
+        sum.deletions = sum.deletions + tbl.deletions
+      end
+
+      cb(sum)
+    end
+  end, 'git', 'diff', '--numstat')
+end
+
+local function get_branch(cwd, cb)
+  shell(cwd, cb, 'git', 'rev-parse', '--abbrev-ref', 'HEAD')
+end
+
+-- TODO(smolck): Make this smarter? i.e. only `notify_uivonim` if the
+-- branch/status is different from last time.
+
+-- TODO(smolck): Does this need to be async with getting the branch
+-- and status? Don't want to slow things down . . .
+function M.notify_branch()
+  local cwd = vim.fn.getcwd()
+  get_branch(cwd, function(maybe_branch)
+    local branch = maybe_branch and maybe_branch[1] or ''
+    notify_uivonim('git_branch', branch)
+  end)
+end
+
+function M.notify_status()
+  local cwd = vim.fn.getcwd()
+  get_git_status(cwd, function(maybe_status)
+    local status = maybe_status or { additions = 0, deletions = 0 }
+    notify_uivonim('git_status', status)
+  end)
+end
+
+return M

runtime/lua/uivonim/lsp.lua

@@ -1,6 +1,6 @@
 local M = {}
 local util = vim.lsp.util
-local notify_uivonim = require'uivonim'.notify_uivonim
+local notify_uivonim = require('uivonim').notify_uivonim
 
 local function get_cursor_pos()
   local pos = vim.api.nvim_win_get_cursor(0)
@@ -37,7 +37,9 @@ local function signature_help_to_show_params(signature_help)
   show_params.totalSignatures = #signature_help.signatures
   show_params.selectedSignature = active_signature
   show_params.label = signature.label
-  show_params.documentation = (signature.documentation and signature.documentation.value) or signature.documentation or ''
+  show_params.documentation = (signature.documentation and signature.documentation.value)
+    or signature.documentation
+    or ''
 
   if signature.parameters and #signature.parameters > 0 then
     local active_parameter = signature_help.activeParameter or 0
@@ -83,7 +85,11 @@ function M.signature_help_close()
   notify_uivonim('signature-help-close')
 end
 
-function M.signature_help(_, method, result)
+function M.signature_help(
+  _,
+  _ --[[method]],
+  result
+)
   if not (result and result.signatures and result.signatures[1]) then
     print('No signature help available')
     return
@@ -95,7 +101,7 @@ function M.signature_help(_, method, result)
     return
   end
 
-  notify_uivonim('signature-help', method, show_params)
+  notify_uivonim('signature-help', show_params)
 
   -- Close autocmd
   vim.api.nvim_command("autocmd CursorMoved <buffer> ++once lua pcall(require'uivonim/lsp'.signature_help_close, true)")
@@ -105,7 +111,11 @@ function M.hover_close()
   notify_uivonim('hover-close')
 end
 
-function M.hover(_, method, result)
+function M.hover(
+  _,
+  _ --[[method]],
+  result
+)
   if not (result and result.contents) then
     -- TODO(smolck): Maybe let the user know somehow by telling Uivonim about it?
     return
@@ -118,45 +128,57 @@ function M.hover(_, method, result)
     return
   end
 
-  notify_uivonim('hover', method, markdown_lines)
+  notify_uivonim('hover', markdown_lines)
 
   -- Close autocmd
   vim.api.nvim_command(
     "autocmd CursorMoved,BufHidden,InsertCharPre <buffer> ++once lua pcall(require'uivonim/lsp'.hover_close, true)"
   )
 end
 
-function M.references(_, method, result)
-  if not result then return end
+function M.references(
+  _,
+  _ --[[method]],
+  result
+)
+  if not result then
+    return
+  end
 
   local list = util.locations_to_items(result)
-  notify_uivonim('references', method, list)
+  notify_uivonim('references', list)
 end
 
-function M.symbols(_, method, result)
-  if not result then return end
+function M.symbols(
+  _,
+  _ --[[method]],
+  result
+)
+  if not result then
+    return
+  end
 
   -- TODO: use non-hierarchical UI element (i.e., strip filename) for documentSymbol
-  notify_uivonim('references', method, util.symbols_to_items(result))
+  notify_uivonim('references', util.symbols_to_items(result))
 end
 
 function M.code_action(_, _, actions)
   if actions == nil or vim.tbl_isempty(actions) then
-    print("No code actions available")
+    print('No code actions available')
     return
   end
 
   notify_uivonim('code-action', actions)
 end
 
 function M.handle_chosen_code_action(action_chosen)
-  local buf = require'vim.lsp.buf'
+  local buf = require('vim.lsp.buf')
 
-  if action_chosen.edit or type(action_chosen.command) == "table" then
+  if action_chosen.edit or type(action_chosen.command) == 'table' then
     if action_chosen.edit then
       util.apply_workspace_edit(action_chosen.edit)
     end
-    if type(action_chosen.command) == "table" then
+    if type(action_chosen.command) == 'table' then
       buf.execute_command(action_chosen.command)
     end
   else
@@ -190,13 +212,13 @@ function M.on_publish_diagnostics(thing1, thing2, params, client_id, thing5, con
 end
 
 M.callbacks = {
-  ['textDocument/signatureHelp'] = M.signature_help;
-  ['textDocument/hover'] = M.hover;
-  ['textDocument/references'] = M.references;
-  ['textDocument/codeAction'] = M.code_action;
-  ['textDocument/documentSymbol'] = M.symbols;
-  ['textDocument/publishDiagnostics'] = M.on_publish_diagnostics;
-  ['workspace/symbol'] = M.symbols;
+  ['textDocument/signatureHelp'] = M.signature_help,
+  ['textDocument/hover'] = M.hover,
+  ['textDocument/references'] = M.references,
+  ['textDocument/codeAction'] = M.code_action,
+  ['textDocument/documentSymbol'] = M.symbols,
+  ['textDocument/publishDiagnostics'] = M.on_publish_diagnostics,
+  ['workspace/symbol'] = M.symbols,
 }
 
 return M

runtime/uivonim.vim

@@ -100,10 +100,16 @@ hi! link uvnCursor Cursor
 " Create autocmds
 aug UivonimAU
   au BufAdd,BufEnter,BufDelete,BufUnload,BufWipeout,FileType,ColorScheme,DirChanged * call rpcnotify(0, 'uivonim-state', UivonimState())
-  au BufEnter * call rpcnotify(0, 'uivonim-autocmd', 'BufEnter', expand('<abuf>'), rpcnotify(0, 'uivonim', 'update-nameplates'))
-  au BufWipeout * call rpcnotify(0, 'uivonim-autocmd', 'BufWipeout', expand('<abuf>'))
-  au BufWritePost * call rpcnotify(0, 'uivonim-autocmd', 'BufWritePost', expand('<abuf>'))
-  au OptionSet * if (&ro != 1) | call rpcnotify(0, 'uivonim-autocmd', 'OptionSet', expand('<amatch>'), v:option_new, v:option_old) | endif
-  au FileType * call rpcnotify(0, 'uivonim-autocmd', 'FileType', bufnr(expand('<afile>')), expand('<amatch>'))
-  au WinEnter * call rpcnotify(0, 'uivonim-autocmd', 'WinEnter', win_getid())
+
+  au DirChanged * lua (function() local git = require'uivonim/git'; git.notify_branch(); git.notify_status() end)()
+  " TODO(smolck): Good autocmd for updating this? Or is there a better one? Or
+  " . . .
+  au BufWrite * lua require'uivonim/git'.notify_status()
+
+  au BufEnter,VimEnter,WinNew,WinEnter * call rpcnotify(0, 'uivonim', 'update-window-nameplates')
+  " au BufWipeout * call rpcnotify(0, 'uivonim-autocmd', 'BufWipeout', expand('<abuf>'))
+  " au BufWritePost * call rpcnotify(0, 'uivonim-autocmd', 'BufWritePost', expand('<abuf>'))
+  " au OptionSet * if (&ro != 1) | call rpcnotify(0, 'uivonim-autocmd', 'OptionSet', expand('<amatch>'), v:option_new, v:option_old) | endif
+  " au FileType * call rpcnotify(0, 'uivonim-autocmd', 'FileType', bufnr(expand('<afile>')), expand('<amatch>'))
+  " au WinEnter * call rpcnotify(0, 'uivonim-autocmd', 'WinEnter', win_getid())
 aug END

src-tauri/.gitignore

@@ -0,0 +1,4 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+WixTools