Merge pull request #722 from JunoLab/avi/selectlist

use atom-select-list instead of atom-space-pen-view:

Author: aviatesk

lib/runtime/evaluation.coffee

@@ -190,7 +190,7 @@ module.exports =
     else if dirs.length == 1
       @_cd dirs[0]
     else
-      selector.show(dirs)
+      selector.show(dirs, { infoMessage: 'Select project to work in' })
         .then (dir) =>
           return unless dir?
           @_cd dir

lib/runtime/modules.coffee

@@ -66,7 +66,7 @@ module.exports =
           modules
         modules.catch (err) =>
           console.log err
-        selector.show(modules, active: active).then (mod) =>
+        selector.show(modules, { active, infoMessage: 'Select module to evaluate in' }).then (mod) =>
           return unless mod?
           if mod is @autodetect
             delete item.juliaModule

lib/runtime/packages.js

@@ -6,13 +6,13 @@ import { selector } from '../ui'
 var { packages } = client.import({ rpc: ['packages'] })
 
 export function openPackage (newWindow = true) {
-  let pkgs = packages()
+  const pkgs = packages()
   pkgs.then(pkgs => {
-    ps =  []
-    for (pkg in pkgs) {
-      ps.push({primary: pkg, secondary: pkgs[pkg]})
+    const ps =  []
+    for (const pkg in pkgs) {
+      ps.push({ primary: pkg, secondary: pkgs[pkg] })
     }
-    selector.show(ps).then( pkg => {
+    selector.show(ps, { infoMessage: 'Select package to open' }).then( pkg => {
       if (pkg) {
         if (newWindow) {
           atom.open({ pathsToOpen: [pkgs[pkg.primary]]})

lib/ui.coffee

@@ -32,8 +32,8 @@ module.exports =
 
   consumeInk: (@ink) ->
     @views.ink = @ink
-    @selector.ink = @ink
     @progress.ink = @ink
+    @selector.activate(@ink)
     @docpane.activate(@ink)
     @progress.activate()
     @focusutils.activate(@ink)

lib/ui/selector.coffee

@@ -0,0 +1,117 @@
+/** @babel */
+
+import SelectList from 'atom-select-list'
+
+/**
+ * @type {SelectList}
+ */
+let selector
+let panel, ink
+
+export function activate (_ink) {
+  ink = _ink
+  selector = new SelectList({
+    items: [],
+    elementForItem
+  })
+  selector.element.classList.add('command-palette', 'julia-clientselector')
+  panel = atom.workspace.addModalPanel({ item: selector.element })
+}
+
+function elementForItem (item, { selected }) {
+  const view = document.createElement('li')
+  if (selected) view.classList.add('active')
+  const name = (item.primary) ? item.primary.toString() : item.toString()
+  const primary = ink.matchHighlighter.highlightMatches(name, selector.getFilterQuery())
+  view.appendChild(primary)
+  if (item.secondary) {
+    const secondary = document.createElement('div')
+    secondary.classList.add('secondary-line', 'path')
+    secondary.innerText = item.secondary
+    view.classList.add('two-lines')
+    primary.classList.add('primary-line')
+    view.append(secondary)
+  }
+  return view
+}
+
+export function show (items, { active, emptyMessage, errorMessage, infoMessage, allowCustom } = {}) {
+  selector.update({
+    items: [],
+    query: '',
+    loadingMessage: 'Loading ...',
+  })
+  const lastFocusedPane = atom.workspace.getActivePane()
+  panel.show()
+  selector.focus()
+  let confirmed = false
+  return new Promise((resolve, reject) => {
+    selector.props.didConfirmSelection = (item) => {
+      confirmed = true
+      selector.cancelSelection()
+      resolve(item)
+    }
+    selector.props.didConfirmEmptySelection = () => {
+      confirmed = true
+      selector.cancelSelection()
+      const query = selector.getQuery()
+      if (allowCustom && query.length > 0) {
+        resolve(query)
+      } else {
+        resolve()
+      }
+    }
+    selector.props.didCancelSelection = () => {
+      panel.hide()
+      lastFocusedPane.activate()
+      const query = selector.getQuery()
+      if (!confirmed) {
+        if (allowCustom && query.length > 0) {
+          resolve(query)
+        } else {
+          resolve()
+        }
+      }
+    }
+    if (items.constructor == Promise) {
+      items.then(items => {
+        const filterKeyForItem = (items.length > 0 && items[0] instanceof Object) ?
+          item => item.primary : item => item
+        selector.update({
+          items,
+          filterKeyForItem,
+          emptyMessage,
+          errorMessage,
+          infoMessage,
+          loadingMessage: ''
+        })
+        if (active) {
+          const index = (active instanceof Number) ? active :
+            (active instanceof Function) ? items.findIndex(active) :
+            items.findIndex(item => item == active)
+          selector.selectIndex(index)
+        }
+      }).catch(err => {
+        reject(err)
+        selector.cancelSelection()
+      })
+    } else {
+      const filterKeyForItem = (items.length > 0 && items[0] instanceof Object) ?
+          item => item.primary : item => item
+      selector.update({
+        items,
+        filterKeyForItem,
+        emptyMessage,
+        errorMessage,
+        infoMessage,
+        loadingMessage: ''
+      })
+      if (active) {
+        const index = (active instanceof Number) ? active :
+          (active instanceof Function) ? items.findIndex(active) :
+          items.findIndex(item => item == active)
+        selector.selectIndex(index)
+      }
+    }
+  })
+}