PLUGIN_INFO 対応

git-svn-id: http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk@29386 d0d07461-0603-4401-acd4-de1884942a52

1 files changed, 96 insertions, 47 deletions

diff --git a/echopy.js b/echopy.js
index faca7e4..477baee 100644
--- a/echopy.js
+++ b/echopy.js
@@ -1,61 +1,110 @@
-// ==VimperatorPlugin==
-// @name           echopy
-// @description    echo and copy
-// @description-ja echo and copy
-// @license        Creative Commons 2.1 (Attribution + Share Alike)
-// @version        1.0
-// @author         anekos (anekos@snca.net)
-// @maxVersion     2.0pre
-// @minVersion     2.0pre
-// ==/VimperatorPlugin==
-//
-// Usage:
-//    :echo <EXPRESSION>
-//      echo with copy (to clipboard).
-//
-// Usage-ja:
-//    :echo <EXPRESSION>
-//      echo すると同時にクリップボードにコピー
-//
-// Links:
-//    http://d.hatena.ne.jp/nokturnalmortum/20081111#1226414487
+/* {{{
+Copyright (c) 2008, anekos.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+    3. The names of the authors may not be used to endorse or promote products
+       derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+###################################################################################
+# http://sourceforge.jp/projects/opensource/wiki/licenses%2Fnew_BSD_license       #
+# に参考になる日本語訳がありますが、有効なのは上記英文となります。                #
+###################################################################################
+
+}}} */
+
+// PLUGIN_INFO {{{
+let PLUGIN_INFO =
+<VimperatorPlugin>
+  <name>{NAME}</name>
+  <name lang="ja">{NAME}</name>
+  <description>Echo and Copy(to clipboard)</description>
+  <description lang="ja">echo しつつクリップボードにコピーできる様にする</description>
+  <version>1.0.1</version>
+  <author mail="anekos@snca.net" homepage="http://d.hatena.ne.jp/nokturnalmortum/">anekos</author>
+  <license>new BSD License (Please read the source code comments of this plugin)</license>
+  <license lang="ja">修正BSDライセンス (ソースコードのコメントを参照してください)</license>
+  <updateURL>http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk/echopy.js</updateURL>
+  <minVersion>2.0pre</minVersion>
+  <maxVersion>2.0pre</maxVersion>
+  <detail><![CDATA[
+    == Usage ==
+      :echo! <EXPRESSION>:
+        echo and copy (to clipboard).
+        When used without "!", "echo" does not copy to clipboard.
+    == Link ==
+      http://d.hatena.ne.jp/nokturnalmortum/20081111#1226414487
+  ]]></detail>
+  <detail lang="ja"><![CDATA[
+    == Usage ==
+      :echo! <EXPRESSION>:
+        echo しつつクリップボードにコピー
+        "!" とつけない場合は、クリップボードにコピーされません。
+    == Link ==
+      http://d.hatena.ne.jp/nokturnalmortum/20081111#1226414487
+  ]]></detail>
+</VimperatorPlugin>;
+// }}}
 
 (function () {
 
-  function neko (obj, useColor) {
-    switch (typeof obj) {
-      case 'object':
-        return liberator.modules.util.objectToString(obj, useColor);
-      case 'function':
-        return liberator.modules.util.escapeHTML(obj.toString());
-      case 'number':
-      case 'boolean':
-        return '' + obj;
-      case 'undefined':
-        return 'undefined';
+  function ea2s (arg) {
+    if (!arg)
+      return '';
+
+    let raw, res;
+    let value = liberator.eval(arg);
+
+    if (typeof value === 'object') {
+      res = util.objectToString(value, true);
+      raw = util.objectToString(value, false);
+    } else if (typeof value === 'function') {
+      raw = value.toString();
+      res = <pre>{raw}</pre>;
+    } else if (typeof value === 'string' && /\n/.test(value)) {
+      raw = value;
+      res = <span highlight="CmdOutput">{value}</span>;
+    } else {
+      raw = res = String(value);
     }
-    return obj;
+
+    return [raw, res];
   }
 
   let echo = commands.get('echo');
   let original_action = echo.action;
 
-  echo.action = function (arg, bang) {
-    if (bang) {
-      try {
-        if (arg.string == '')
-          return;
-        let obj = liberator.eval(arg.string);
-        liberator.echo(neko(obj, true));
-        liberator.modules.util.copyToClipboard(neko(obj, false));
-      } catch (e) {
-        liberator.echoerr(e);
-      }
-    } else {
-      original_action.apply(this, arguments);
+  echo.action = function (args) {
+    try {
+      if (args.string == '')
+        return;
+      let [raw, res] = ea2s(args.string);
+      commandline.echo(res, commandline.HL_NORMAL);
+      if (args.bang)
+        util.copyToClipboard(raw);
+    } catch (e) {
+      liberator.echoerr(e);
     }
   };
   echo.bang = true;
 
-
 })();