fix search register

Author: nightwing

dev/index.ts

@@ -346,3 +346,7 @@ window.onunload = function() {
   saveHistory('exCommandHistoryController');
   saveHistory('searchHistoryController');
 }
+
+Vim.defineEx("write", "w", (cm) => {
+  console.log("called", cm);
+})

src/cm_adapter.ts

@@ -164,6 +164,7 @@ export class CodeMirror {
 
   static lookupKey = function lookupKey(key: string, map: string, handle: Function) {
     var result = CodeMirror.keys[key];
+    if (!result && /^Arrow/.test(key)) result = CodeMirror.keys[key.slice(5)];
     if (result) handle(result);
   };
 

src/vim.js

@@ -53,6 +53,7 @@ export function initVim(CM) {
  * @typedef { import("./types").Marker } Marker
  * @typedef { import("./types").InputStateInterface } InputStateInterface
  * @typedef { import("./types").SearchStateInterface } SearchStateInterface
+ * @typedef { import("./types").InsertModeChanges } InsertModeChanges
  */
   var Pos = CM.Pos;
 
@@ -1358,19 +1359,24 @@ export function initVim(CM) {
    * inserted at the cursor position.)
    */
   class Register {
+    /** @arg {string} [text] @arg {boolean} [linewise] @arg {boolean } [blockwise] */
     constructor(text, linewise, blockwise) {
       this.clear();
       this.keyBuffer = [text || ''];
+      /** @type {InsertModeChanges[]} */
       this.insertModeChanges = [];
+      /** @type {string[]}*/
       this.searchQueries = [];
       this.linewise = !!linewise;
       this.blockwise = !!blockwise;
     }
+    /** @arg {string} [text] @arg {boolean} [linewise] @arg {boolean } [blockwise] */
     setText(text, linewise, blockwise) {
       this.keyBuffer = [text || ''];
       this.linewise = !!linewise;
       this.blockwise = !!blockwise;
     }
+    /** @arg {string} text @arg {boolean} [linewise] */
     pushText(text, linewise) {
       // if this register has ever been set to linewise, use linewise.
       if (linewise) {
@@ -1381,9 +1387,11 @@ export function initVim(CM) {
       }
       this.keyBuffer.push(text);
     }
+    /** @arg {InsertModeChanges} changes */
     pushInsertModeChanges(changes) {
       this.insertModeChanges.push(createInsertModeChanges(changes));
     }
+    /** @arg {string} query */
     pushSearchQuery(query) {
       this.searchQueries.push(query);
     }
@@ -1803,7 +1811,7 @@ export function initVim(CM) {
             (keyName == '<BS>' && query == '')) {
           vimGlobalState.searchHistoryController.pushInput(query);
           vimGlobalState.searchHistoryController.reset();
-          updateSearchQuery(cm, originalQuery);
+          updateSearchQuery(cm, originalQuery?.source || "");
           clearSearchHighlight(cm);
           cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
           CM.e_stop(e);
@@ -3777,7 +3785,7 @@ export function initVim(CM) {
                           'visualLine': vim.visualLine,
                           'visualBlock': vim.visualBlock};
   }
-  /** @arg {CodeMirrorV} cm @arg {Pos} start @arg {Pos} end @returns {[Pos, Pos]} */
+  /** @arg {CodeMirrorV} cm @arg {Pos} start @arg {Pos} end @arg {Boolean} [move] @returns {[Pos, Pos]} */
   function expandSelection(cm, start, end, move) {
     var sel = cm.state.vim.sel;
     var head = move ? start: sel.head;
@@ -5170,16 +5178,14 @@ export function initVim(CM) {
    * If the query contains the /i in the flag part of the regular expression,
    *   then both ignoreCase and smartCase are ignored, and 'i' will be passed
    *   through to the Regex object.
-   * @arg {string|RegExp} query
+   * @arg {string} query
    * @arg {boolean} ignoreCase
    * @arg {boolean} smartCase
    */
   function parseQuery(query, ignoreCase, smartCase) {
     // First update the last search register
     var lastSearchRegister = vimGlobalState.registerController.getRegister('/');
     lastSearchRegister.setText(query);
-    // Check if the query is already a regex.
-    if (query instanceof RegExp) { return query; }
     // First try to extract regex + flags from the input. If no flags found,
     // extract just the regex. IE does not accept flags directly defined in
     // the regex string in the form /regex/flags
@@ -5305,7 +5311,7 @@ export function initVim(CM) {
   // Returns true if the query is valid.
   /**
    * @arg {CodeMirrorV} cm 
-   * @arg {string | RegExp} rawQuery 
+   * @arg {string } rawQuery 
    * @arg {boolean | undefined} [ignoreCase] 
    * @arg {boolean | undefined} [smartCase]
   */
@@ -6115,6 +6121,7 @@ export function initVim(CM) {
     },
     /** @arg {CodeMirrorV} cm @arg {ExParams} params*/
     normal: function(cm, params) {
+      var noremap = false;
       var argString = params.argString;
       if (argString && argString[0] == '!') {
           argString = argString.slice(1);
@@ -6130,13 +6137,13 @@ export function initVim(CM) {
         var lineEnd = isNaN(params.lineEnd) ? line : params.lineEnd;
         for (var i = line; i <= lineEnd; i++) {
           cm.setCursor(i, 0);
-          doKeyToKey(cm, params.argString.trimStart());
+          doKeyToKey(cm, params.argString.trimStart(), {noremap});
           if (cm.state.vim.insertMode) {
             exitInsertMode(cm, true);
           }
         }
       } else {
-        doKeyToKey(cm, params.argString.trimStart());
+        doKeyToKey(cm, params.argString.trimStart(), {noremap});
         if (cm.state.vim.insertMode) {
           exitInsertMode(cm, true);
         }

test/vim_test.js

@@ -4356,20 +4356,26 @@ testVim('ex_global', function(cm, vim, helpers) {
   eq(' one one\n two one', helpers.getNotificationText());
 }, {value: 'one one\n one one\n one one'});
 testVim('ex_normal', function(cm, vim, helpers) {
+  helpers.doEx('norm /<Esc>"/p');
+  helpers.doEx('norm /x<Cr>"/p');
+  helpers.doEx('norm /h<Esc>"/p');
+  helpers.doEx('norm /one<Cr>3li<Right> <Esc>"/p');
+  eq('one one\nxxx\none one\none one', cm.getValue());
+  
   cm.setCursor(0, 0);
   helpers.doEx('g/one/normal    cw 1<lt>Esc><Esc>$i$');
   helpers.doKeys("rt");
-  eq(' 1<Esc> on$e\nxx\n 1<Esc> on$e\n 1<Esc> on$t', cm.getValue());
+  eq(' 1<Esc> on$e\nxxx\n 1<Esc> on$e\n 1<Esc> on$t', cm.getValue());
   helpers.doKeys('/', '<', '\n');
   helpers.doKeys('x', 'x', 'p');
-  eq(' 1sEc> on$e\nxx\n 1<Esc> on$e\n 1<Esc> on$t', cm.getValue());
+  eq(' 1sEc> on$e\nxxx\n 1<Esc> on$e\n 1<Esc> on$t', cm.getValue());
   cm.setCursor(0, 0);
   helpers.doEx('map k j');
   helpers.doEx('normal kkk');
   helpers.assertCursorAt(3, 0);
   helpers.doEx('normal! kkk');
   helpers.assertCursorAt(0, 0);
-}, {value: 'one one\nxx\none one\none one'});
+}, {value: 'one one\nx\none\none one'});
 testVim('ex_global_substitute_join', function(cm, vim, helpers) {
   helpers.doEx('g/o/s/\\n/;');
   eq('one;two\nthree\nfour;five\n', cm.getValue());