Changeset 17286 for lang/javascript/vimperator-plugins/trunk

Timestamp:

08/09/08 18:32:49 (4 months ago)

Author:

anekos

Message:

検索ワードの一文字目で(Migemo|正規表現)を使い分けられるようにした。

Files:

• lang/javascript/vimperator-plugins/trunk/migemized_find.js (modified) (3 diffs)

lang/javascript/vimperator-plugins/trunk/migemized_find.js

@@ -3 +3 @@
 // @description-ja デフォルトのドキュメント内検索をミゲマイズする。
 // @license        Creative Commons 2.1 (Attribution + Share Alike)
-// @version        0.1
+// @version        0.3
 // ==/VimperatorPlugin==
+//
+// Usage:
+//    検索ワードの一文字目が
+//      '/'  => 正規表現検索
+//      '?'  => Migemo検索
+//      以外 => Migemo検索
 //
 // Author:
@@ -13 +19 @@
 //
 // TODO:
-//    先頭の一文字で、正規表現検索などに切り替え可能にする
-//    挙動が違うのを治す
+//  FIND_MODE_NATIVE のときうまく動かない。XUL/Migemoの問題？
 
 (function () {
@@ -21 +26 @@
 
   let lastKeyword = null;
+  let original = {};
+
+  // 検索文字列から検索モードと検索文字列を得る。
+  function getFindMode (str) {
+    let [head, tail] = [str[0], str.slice(1)];
+    switch (head) {
+      case '/':
+        return [tail, XMigemoFind.FIND_MODE_REGEXP];
+      case '?':
+        return [tail, XMigemoFind.FIND_MODE_MIGEMO];
+      //  case '-':
+      //    return [tail, XMigemoFind.FIND_MODE_NATIVE];
+    }
+    return [str, XMigemoFind.FIND_MODE_MIGEMO];
+  }
 
   let migemized = {
-    find: function (str, backwards) {
-      XMigemoFind.findMode = XMigemoFind.FIND_MODE_MIGEMO;
-      XMigemoFind.find(backwards, lastKeyword = str, false);
+    find: function find (str, backwards) {
+      let [word, mode] = getFindMode(str);
+      if (!word)
+        return;
+      XMigemoFind.findMode = mode;
+      XMigemoFind.find(backwards, lastKeyword = word, false);
     },
 
-    findAgain: function (reverse) {
+    findAgain: function findAgain (reverse) {
       XMigemoFind.find(reverse, lastKeyword, false);
     },
 
-    searchSubmitted: function (command, forcedBackward) {
+    searchSubmitted: function searchSubmitted (command, forcedBackward) {
       XMigemoFind.clear(false);
       liberator.modes.reset();
     },
 
-    searchCanceled: function () {
+    searchCanceled: function searchCanceled () {
       XMigemoFind.clear(false);
     },
   };
-
-  let original = {};
 
   for (let name in migemized)