Merge pull request #182 from vim-skk/loadDictionary

Fix loadDictionary() initializer
vim-skk · Jan 13, 2024 · aab00fd · aab00fd
2 parents 4183657 + f6aa766
commit aab00fd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/denops/skkeleton/dictionary.ts b/denops/skkeleton/dictionary.ts
@@ -5,10 +5,7 @@ import { zip } from "./deps/std/collections.ts";
 import type { CompletionData, RankData } from "./types.ts";
 import { SkkDictionary } from "./sources/skk_dictionary.ts";
 import { DenoKvDictionary } from "./sources/deno_kv.ts";
-import {
-  UserDictionary,
-  UserDictionaryPath,
-} from "./sources/user_dictionary.ts";
+import { UserDictionary } from "./sources/user_dictionary.ts";
 import { SkkServer } from "./sources/skk_server.ts";
 import { GoogleJapaneseInput } from "./sources/google_japanese_input.ts";
 
@@ -259,13 +256,13 @@ export class Library {
   }
 }
 
-export async function load(
-  globalDictionaryConfig: [string, string][],
-  userDictionaryPath: UserDictionaryPath,
-): Promise<Library> {
+export async function load(): Promise<Library> {
   const userDictionary = new UserDictionary();
   try {
-    await userDictionary.load(userDictionaryPath);
+    await userDictionary.load({
+      path: config.userDictionary,
+      rankPath: config.completionRankFile,
+    });
   } catch (e) {
     if (config.debug) {
       console.log("userDictionary loading failed");
@@ -278,7 +275,7 @@ export async function load(
   for (const source of config.sources) {
     if (source === "skk_dictionary") {
       const globalDictionaries = await Promise.all(
-        globalDictionaryConfig.map(async ([path, encodingName]) => {
+        config.globalDictionaries.map(async ([path, encodingName]) => {
           try {
             const dict = new SkkDictionary();
             await dict.load(path, encodingName);
@@ -301,7 +298,7 @@ export async function load(
       }
     } else if (source === "deno_kv") {
       const globalDictionaries = await Promise.all(
-        globalDictionaryConfig.map(async ([path, encodingName]) => {
+        config.globalDictionaries.map(async ([path, encodingName]) => {
           try {
             const dict = await DenoKvDictionary.create(path, encodingName);
             await dict.load();

diff --git a/denops/skkeleton/dictionary_test.ts b/denops/skkeleton/dictionary_test.ts
@@ -1,9 +1,10 @@
+import { config } from "./config.ts";
 import { dirname, fromFileUrl, join } from "./deps/std/path.ts";
 import { assertEquals } from "./deps/std/assert.ts";
 import {
   Dictionary,
   Library,
-  load as loadJisyo,
+  load as loadDictionary,
   wrapDictionary,
 } from "./dictionary.ts";
 import { SkkDictionary } from "./sources/skk_dictionary.ts";
@@ -282,10 +283,11 @@ Deno.test({
 Deno.test({
   name: "multi dictionary",
   async fn() {
-    const lib = await loadJisyo([
+    config.globalDictionaries = [
       [globalJisyo, "euc-jp"],
       [globalJisyo2, "utf-8"],
-    ], {});
+    ];
+    const lib = await loadDictionary();
     assertEquals(await lib.getHenkanResult("okurinasi", "てすと"), [
       "テスト",
       "test",

diff --git a/denops/skkeleton/main.ts b/denops/skkeleton/main.ts
@@ -64,15 +64,7 @@ async function init(denops: Denops) {
     console.log(e);
   }
   currentContext.get().denops = denops;
-  currentLibrary.setInitializer(async () =>
-    await loadDictionary(
-      config.globalDictionaries,
-      {
-        path: config.userDictionary,
-        rankPath: config.completionRankFile,
-      },
-    )
-  );
+  currentLibrary.setInitializer(loadDictionary);
   await receiveNotation(denops);
   autocmd.group(denops, "skkeleton-internal-denops", (helper) => {
     helper.remove("*");