fix(guide): fix g guide map

close https://github.com/SpaceVim/SpaceVim/issues/4931
fix(javavi): include jar files
2025-01-23 07:50:04 +08:00 · 2024-11-05 20:33:09 +08:00 · 2024-11-05 20:21:56 +08:00
4 changed files with 4 additions and 2 deletions
--- a/bundle/vim-javacomplete2/libs/javaparser-core-3.5.20.jar
+++ b/bundle/vim-javacomplete2/libs/javaparser-core-3.5.20.jar
--- a/bundle/vim-javacomplete2/libs/javavi_log4j-api.jar
+++ b/bundle/vim-javacomplete2/libs/javavi_log4j-api.jar
--- a/bundle/vim-javacomplete2/libs/javavi_log4j-core.jar
+++ b/bundle/vim-javacomplete2/libs/javavi_log4j-core.jar
--- a/lua/spacevim/plugin/guide.lua
+++ b/lua/spacevim/plugin/guide.lua
@ -133,7 +133,9 @@ local function format_displaystring(map)
  end

  local display = vim.g['leaderGuide#displayname']
-  vim.cmd('unlet g:leaderGuide#displayname')
+  if vim.g['leaderGuide#displayname'] then
+    vim.cmd('unlet g:leaderGuide#displayname')
+  end
  return display
 end

@ -271,7 +273,7 @@ local function start_parser(key, dict)
    mapd.lhs = cmp.fn.substitute(mapd.lhs, key, '', '')
    mapd.lhs = cmp.fn.substitute(mapd.lhs, '<Space>', ' ', 'g')
    mapd.lhs = cmp.fn.substitute(mapd.lhs, '<Tab>', '<C-I>', 'g')
-    mapd.rhs = cmp.fn.substitute(mapd.rhs, '<SID>', '<SNR>' .. mapd['sid'] .. '_', 'g')
+    mapd.rhs = cmp.fn.substitute(mapd.rhs, '<SID>', '<SNR>' .. (mapd['sid'] or '') .. '_', 'g')
    if mapd.lhs ~= '' and mapd.display ~= 'LeaderGuide.*' then
      mapd.lhs = string_to_keys(mapd.lhs)
      if
Author	SHA1	Message	Date
Eric Wong	08719ccab2	fix(guide): fix `g` guide map close https://github.com/SpaceVim/SpaceVim/issues/4931	2024-11-05 20:33:09 +08:00
Eric Wong	fc4714f6f6	fix(javavi): include jar files close https://github.com/SpaceVim/SpaceVim/issues/4938	2024-11-05 20:21:56 +08:00