Fix cache loading errors

Shougo · Sep 24, 2023 · 59d74b7 · 59d74b7
1 parent d62d6d6
commit 59d74b7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/autoload/dpp/min.vim b/autoload/dpp/min.vim
@@ -16,7 +16,7 @@ function dpp#min#_init() abort
 endfunction
 function! dpp#min#_load_cache_raw(vimrcs=[]) abort
   let g:dpp#_vimrcs = a:vimrcs
-  const cache = g:dpp#_base_path .. '/cache_' .. g:dpp#_progname
+  const cache = printf('%s/cache_%s.vim', g:dpp#_base_path, g:dpp#_progname)
   const time = cache->getftime()
   if !(g:dpp#_vimrcs->copy()
         \ ->map({ _, val -> getftime(expand(val)) })
@@ -33,7 +33,7 @@ function! dpp#min#load_state(path) abort
   if g:dpp#_is_sudo | return 1 | endif
   let g:dpp#_base_path = a:path->expand()
 
-  const state = g:dpp#_base_path .. '/state_' .. g:dpp#_progname .. '.vim'
+  const state = printf('%s/state_%s.vim', g:dpp#_base_path, g:dpp#_progname)
   if !(state->filereadable()) | return 1 | endif
   try
     execute 'source' state->fnameescape()

diff --git a/denops/dpp/dpp.ts b/denops/dpp/dpp.ts
@@ -69,8 +69,6 @@ export class Dpp {
       recordPlugins[plugin.name] = initPlugin(plugin, basePath);
     }
 
-    console.log(recordPlugins);
-
     if (!await isDirectory(basePath)) {
       await Deno.mkdir(basePath, { recursive: true });
     }
@@ -80,7 +78,6 @@ export class Dpp {
 
     // Get runtimepath
     const dppRuntimepath = `${basePath}/.dpp`;
-    console.log(dppRuntimepath);
     if (!await isDirectory(dppRuntimepath)) {
       await Deno.mkdir(dppRuntimepath, { recursive: true });
     }
@@ -138,9 +135,9 @@ export class Dpp {
     const cacheVersion = await vars.g.get(denops, "dpp#_cache_version");
     const initRuntimepath = await vars.g.get(denops, "dpp#_init_runtimepath");
     const stateLines = [
-      `if g:dpp#_cache_version !=# ${cacheVersion} || ` +
-      `g:dpp#_init_runtimepath !=# '${initRuntimepath}' | ` +
-      " | throw ''Cache loading error'' | endif",
+      `if g:dpp#_cache_version !=# ${cacheVersion} ` +
+      `|| g:dpp#_init_runtimepath !=# '${initRuntimepath}' | ` +
+      "throw 'Cache loading error' | endif",
       "let [s:plugins, s:ftplugin] = dpp#min#_load_cache_raw()",
       "if s:plugins->empty() | throw 'Cache loading error' | endif",
       "let g:dpp#_plugins = s:plugins",
@@ -149,17 +146,19 @@ export class Dpp {
       `let &runtimepath = '${newRuntimepath}'`,
     ];
 
-    const stateFile = `${basePath}/state_${progname}`;
+    const stateFile = `${basePath}/state_${progname}.vim`;
+    console.log(stateFile);
     await Deno.writeTextFile(stateFile, stateLines.join("\n"));
 
-    const cacheFile = `${basePath}/cache_${progname}`;
+    const cacheFile = `${basePath}/cache_${progname}.vim`;
     const cacheLines = [
       JSON.stringify([plugins, {}]),
     ];
+    console.log(cacheFile);
     await Deno.writeTextFile(cacheFile, cacheLines.join("\n"));
 
     console.log(stateLines);
-    console.log(cacheLines);
+    //console.log(cacheLines);
     //console.log(rtps);
   }