Merge pull request #153 from vim-denops/fix-mapping

🐛 Fix `Failed to parse a mapping record` issue

Author: lambdalisue

denops_std/mapping/parser.ts

@@ -4,7 +4,7 @@ import { Mapping, Mode } from "./types.ts";
  * Parse record displayed by Vim's `map` command and return a `Mapping` instance.
  */
 export function parse(record: string): Mapping {
-  const m = record.match(/^(.)\s+(\S+)\s+(.*)$/);
+  const m = record.match(/^(...)(\S+)\s+(.*)$/);
   if (!m) {
     throw new Error(`Failed to parse a mapping record '${record}'`);
   }

denops_std/mapping/parser_test.ts

@@ -74,6 +74,22 @@ const testcases: [string, Mapping][] = [
       buffer: false,
     },
   ],
+  ["ov #      <Plug>(asterisk-z#)zv", {
+    mode: "ov",
+    lhs: "#",
+    rhs: "<Plug>(asterisk-z#)zv",
+    noremap: false,
+    script: false,
+    buffer: false,
+  }],
+  ["nosa           * b", {
+    mode: "nos",
+    lhs: "a",
+    rhs: "b",
+    noremap: true,
+    script: false,
+    buffer: false,
+  }],
 ];
 for (const [record, expected] of testcases) {
   Deno.test(`parse() parses '${record}' and return a Mapping instance`, () => {

denops_std/mapping/types.ts

@@ -8,7 +8,17 @@ export type Mode =
   | "s" // Select
   | "o" // Operator-pending
   | "t" // Terminal-Job
-  | "l"; // ":lmap" mappings for Insert, Command-line and Lang-Arg
+  | "l" // ":lmap" mappings for Insert, Command-line and Lang-Arg
+  // See https://github.com/vim-denops/deno-denops-std/issues/152 for detail
+  | "ov"
+  | "nv"
+  | "no"
+  | "os"
+  | "ns"
+  | "ox"
+  | "nx"
+  | "nox"
+  | "nos";
 
 export type Mapping = {
   // Modes for which the mapping is defined