Merge pull request #16 from cryogenian/caption

added caption field to Completion

Author: cryogenian

bower.json

@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "purescript-console": "^0.1.1",
-    "purescript-dom": "^0.2.10",
+    "purescript-dom": "^0.2.12",
     "purescript-arrays": "^0.4.3",
     "purescript-foreign": "^0.7.2",
     "purescript-nullable": "^0.2.1",

example/src/Main.purs

@@ -136,10 +136,12 @@ main = onLoad $ do
     (\_ _ _ inp cb -> do
         cb $ pure [ { value: inp <> "!!"
                     , score: 100.0
+                    , caption: pure "???"
                     , meta: "!!"
                     }
                   , { value: "abcde"
                     , score: 200.0
+                    , caption: Nothing
                     , meta: "abcde"
                     } ] )
   LanguageTools.addCompleter completer languageTools

src/Ace/Ext/LanguageTools/Completer.js

@@ -8,12 +8,26 @@ exports.mkCompleterImpl = function(getCompletionCb, isJust, fromJust) {
             getCompletions: function(editor, session, pos, prefix, callback) {
                 return getCompletionCb(editor)(session)(pos)(prefix)(function(mb){
                     return function() {
-                        if (isJust(mb)) {
-                            return callback(null, fromJust(mb));
-                        }
-                        else {
+                        if (!isJust(mb)) {
                             return callback("Error in getCompletion", null);
+
                         }
+                        var result = [],
+                            extracted = fromJust(mb),
+                            i = 0,
+                            item;
+                        for (i; i < extracted.length; i++) {
+                            item = extracted[i];
+                            if (isJust(item.caption)) {
+                                item.caption = fromJust(item.caption);
+                            }
+                            else {
+                                item.caption = undefined;
+                            }
+                            result.push(item);
+                        }
+                        return callback(null, result);
+
                     };
                 })();
             }

src/Ace/Types.purs

@@ -6,6 +6,7 @@ import Control.Bind ((>=>))
 import Data.Either (Either(..))
 import Data.Foreign (F(), ForeignError(..), readString)
 import Data.Foreign.Class (IsForeign, readProp)
+import Data.Maybe (Maybe())
 
 type AnchorEvent =
   { old :: Position
@@ -145,4 +146,5 @@ type Completion =
   { value :: String
   , score :: Number
   , meta :: String
+  , caption :: Maybe String
   }