Small refactoring

tshino · Nov 30, 2021 · d351381 · d351381
1 parent d7f37d2
commit d351381
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/generator/gen_keymap_wrapper.js b/generator/gen_keymap_wrapper.js
@@ -32,20 +32,7 @@ function makeWrapper(keybinding) {
     return wrapped;
 }
 
-async function makeKeymapWrapper(configPath) {
-    const dirname = path.dirname(configPath);
-    const id = path.basename(configPath, '.config.json');
-    const packageJsonPath = path.resolve(dirname, 'tmp/' + id + '.package.json');
-    const packageJson = await genWrapperUtil.readJSON(packageJsonPath);
-    console.log('generating keymap wrapper for', { id, displayName: packageJson['displayName'] });
-
-    const config = await genWrapperUtil.readJSON(configPath);
-    const exclusion = new Set(config['exclusion'] || []);
-    const awaitOptions = new Map(config['awaitOptions'] || []);
-
-    const baseKeybindings = packageJson['contributes']['keybindings'];
-
-    // resolve wildcards in awaitOptions
+function resolveWildcardInAwaitOptions(awaitOptions, baseKeybindings) {
     const wildcardCommands = Array.from(awaitOptions.keys()).filter(
         command => command.endsWith('*')
     );
@@ -60,6 +47,22 @@ async function makeKeymapWrapper(configPath) {
         }
         awaitOptions.delete(wildcard);
     }
+}
+
+async function makeKeymapWrapper(configPath) {
+    const dirname = path.dirname(configPath);
+    const id = path.basename(configPath, '.config.json');
+    const packageJsonPath = path.resolve(dirname, 'tmp/' + id + '.package.json');
+    const packageJson = await genWrapperUtil.readJSON(packageJsonPath);
+    console.log('** generating keymap wrapper for', { id, displayName: packageJson['displayName'] });
+
+    const config = await genWrapperUtil.readJSON(configPath);
+    const exclusion = new Set(config['exclusion'] || []);
+    const awaitOptions = new Map(config['awaitOptions'] || []);
+
+    const baseKeybindings = packageJson['contributes']['keybindings'];
+
+    resolveWildcardInAwaitOptions(awaitOptions, baseKeybindings);
 
     const wrappers = baseKeybindings.map(
         keybinding => {