lua: tree#util#call_tree

zgpio · Aug 5, 2020 · f51a5c9 · f51a5c9
1 parent f1df8f9
commit f51a5c9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/runtime/autoload/tree/util.vim b/runtime/autoload/tree/util.vim
@@ -16,11 +16,6 @@ function! tree#util#execute_path(command, path) abort
   endtry
 endfunction
 
-function! tree#util#call_tree(command, args) abort
-  let [paths, context] = v:lua.__parse_options(a:args)
-  call v:lua.start(paths, context)
-endfunction
-
 function! tree#util#cd(path) abort
   if exists('*chdir')
     call chdir(a:path)

diff --git a/runtime/lua/tree.lua b/runtime/lua/tree.lua
@@ -191,6 +191,10 @@ function M.string(expr)
     return vim.fn.string(expr)
   end
 end
+function M.call_tree(command, args)
+  local paths, context = __parse_options(args)
+  start(paths, context)
+end
 function M.print_error(s)
   api.nvim_command(string.format("echohl Error | echomsg '[tree] %s' | echohl None", M.string(s)))
 end
@@ -246,7 +250,7 @@ function __parse_options(cmdline)
     end
   end
 
-  return {args, options}
+  return args, options
 end
 function __expand(path)
   if path:find('^~') then

diff --git a/runtime/plugin/tree.vim b/runtime/plugin/tree.vim
@@ -11,4 +11,4 @@ let g:loaded_tree = 1
 
 command! -nargs=* -range -bar -complete=customlist,v:lua.complete
       \ Tree
-      \ call tree#util#call_tree('Tree', <q-args>)
+      \ call luaeval('require("tree").call_tree("Tree", _A)', <q-args>)
diff --git a/src/app/dev.vim b/src/app/dev.vim
@@ -16,7 +16,7 @@ local tree = require 'tree'
 tree.custom_option('_', {root_marker='[in]:', })
 tree.custom_column('filename', {
   root_marker_highlight='Ignore',
-  max_width=40,
+  max_width=60,
 })
 tree.custom_column('time', {
   format="%d-%M-%Y",

diff --git a/src/app/transform.py b/src/app/transform.py
@@ -18,12 +18,12 @@
                 f.write(line)
             f.write('};\n')
 
-            f.write('array<QByteArray, 2> icons[] = {\n')
+            f.write('pair<string, string> icons[] = {\n')
             for k, v in val.items():
                 code = v['code']
                 color = v['color']
                 print(k, code, color)
-                line = f'    {{ {{"{code}", "{color}"}} }},\n'
+                line = f'    {{"{code}", "{color}"}},\n'
                 f.write(line)
             f.write('};\n')
         else:

diff --git a/src/main.cpp b/src/main.cpp
@@ -82,7 +82,6 @@ void eventloop(nvim::Nvim &nvim) {
             break;
         case 2:
             {
-                Object methodName;
                 // [type(2), method, params]
                 msgpack::type::tuple<int64_t, Object, Object> msg;
                 obj.convert(msg);