From ee82861df012d3995775374913aaa82c87fddeeb Mon Sep 17 00:00:00 2001
From: secondlife
Date: Thu, 5 Feb 2009 13:24:25 +0000
Subject: - lang/javascript/vimperator-plugins/migemo_hint.js migemo
 の正規表現マッチを空白区切りで AND 検索するように

git-svn-id: http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk@29585 d0d07461-0603-4401-acd4-de1884942a52
---
 migemo_hint.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'migemo_hint.js')

diff --git a/migemo_hint.js b/migemo_hint.js
index 54326de..e4304f7 100644
--- a/migemo_hint.js
+++ b/migemo_hint.js
@@ -1,5 +1,5 @@
 // Vimperator plugin: 'Hint Matching with XUL/Migemo'
-// Last Change: 29-Oct-2008. Jan 2008
+// Last Change: 05-Feb-2009. Jan 2008
 // License: Creative Commons
 // Maintainer: Trapezoid <trapezoid.g@gmail.com> - http://unsigned.g.hatena.ne.jp/Trapezoid
 // Require: XUL/Migemo extension - https://addons.mozilla.org/ja/firefox/addon/5239
@@ -8,14 +8,16 @@
 //
 // Usage:
 //  :set hintmatching = custom
-liberator.plugins.customHintMatcher = function(inputString){
+lberator.plugins.customHintMatcher = function(inputString){
     var XMigemoCore;
     try{
-        XMigemoCore = Components.classes['@piro.sakura.ne.jp/xmigemo/factory;1']
+        XMigemoCore = Cc['@piro.sakura.ne.jp/xmigemo/factory;1']
                                 .getService(Components.interfaces.pIXMigemoFactory)
                                 .getService("ja");
+        XMigemoTextUtils = Cc['@piro.sakura.ne.jp/xmigemo/text-utility;1']
+                                .getService(Ci.pIXMigemoTextUtils);
     }
     catch(ex if ex instanceof TypeError){}
-    var r = new RegExp(XMigemoCore.getRegExp(inputString));
+    var r = new RegExp(XMigemoTextUtils.getANDFindRegExpFromTerms(XMigemoCore.getRegExps(inputString)), 'gi');
     return function(hintString) r.test(hintString);
 }
-- 
cgit v1.2.3