several updates

Author: aviatesk

lib/package/commands.coffee

@@ -124,7 +124,7 @@ module.exports =
       'julia-client:work-in-current-folder': (ev) ->
         requireClient 'change working folder', ->
           juno.runtime.evaluation.cdHere(ev.target)
-      'julia-client:activate-current-folder': (ev) ->
+      'julia-client:activate-environment-in-current-folder': (ev) ->
         requireClient 'activate an environment', ->
           juno.runtime.evaluation.activateProject(ev.target)
       'julia-client:activate-default-environment': (ev) ->

lib/package/menu.coffee

@@ -44,7 +44,7 @@ module.exports =
       {
         label: 'Environment',
         submenu: [
-          {label: 'Current File\'s Folder', command: 'julia-client:activate-current-folder'}
+          {label: 'Environment in Current File\'s Folder', command: 'julia-client:activate-environment-in-current-folder'}
           {label: 'Default Environment', command: 'julia-client:activate-default-environment'}
         ]
       }

lib/runtime/console.js

@@ -35,20 +35,21 @@ export function activate (_ink) {
 
   process.env['TERM'] = 'xterm-256color'
 
-  subs.add(atom.config.observe('julia-client.consoleOptions.whitelistedKeybindingsREPL', (kbds) => {
-    whitelistedKeybindingsREPL = kbds.map(s => s.toLowerCase())
-  }))
-  subs.add(atom.config.observe('julia-client.consoleOptions.whitelistedKeybindingsTerminal', (kbds) => {
-    whitelistedKeybindingsTerminal = kbds.map(s => s.toLowerCase())
-  }))
-  subs.add(atom.config.observe('julia-client.consoleOptions.cursorStyle', updateTerminalSettings))
-  subs.add(atom.config.observe('julia-client.consoleOptions.maximumConsoleSize', updateTerminalSettings))
-  subs.add(atom.config.observe('julia-client.consoleOptions.macOptionIsMeta', updateTerminalSettings))
-  subs.add(atom.config.observe('julia-client.consoleOptions.rendererType', updateTerminalSettings))
-  subs.add(atom.config.observe('julia-client.consoleOptions.cursorBlink', updateTerminalSettings))
+  subs.add(
+    atom.config.observe('julia-client.consoleOptions.whitelistedKeybindingsREPL', (kbds) => {
+      whitelistedKeybindingsREPL = kbds.map(s => s.toLowerCase())
+    }),
+    atom.config.observe('julia-client.consoleOptions.whitelistedKeybindingsTerminal', (kbds) => {
+      whitelistedKeybindingsTerminal = kbds.map(s => s.toLowerCase())
+    }),
+    atom.config.observe('julia-client.consoleOptions.cursorStyle', updateTerminalSettings),
+    atom.config.observe('julia-client.consoleOptions.maximumConsoleSize', updateTerminalSettings),
+    atom.config.observe('julia-client.consoleOptions.macOptionIsMeta', updateTerminalSettings),
+    atom.config.observe('julia-client.consoleOptions.rendererType', updateTerminalSettings),
+    atom.config.observe('julia-client.consoleOptions.cursorBlink', updateTerminalSettings)
+  )
 
   terminal = ink.InkTerminal.fromId('julia-terminal', terminalOptions())
-
   terminal.setTitle('REPL', true)
   terminal.class = 'julia-terminal'
 
@@ -109,8 +110,8 @@ export function activate (_ink) {
     if (promptObserver) promptObserver.dispose()
   })
 
-  // repl commands
   subs.add(
+    // repl commands
     atom.commands.add('atom-workspace', {
       'julia-client:open-REPL': () => {
         open().then(() => terminal.show())
@@ -125,24 +126,23 @@ export function activate (_ink) {
           atom.commands.dispatch(terminal.view, 'julia-client:interrupt-julia')
         }
       }
+    }),
+    // terminal commands
+    atom.commands.add('atom-workspace', {
+      'julia-client:new-terminal': () => {
+        newTerminal()
+      },
+      'julia-client:new-terminal-from-current-folder': ev => {
+        const dir = evaluation.currentDir(ev.target)
+        if (!dir) return
+        newTerminal(dir)
+      },
+      'julia-client:new-remote-terminal': () => {
+        newRemoteTerminal()
+      }
     })
   )
 
-  // terminal commands
-  subs.add(atom.commands.add('atom-workspace', {
-    'julia-client:new-terminal': () => {
-      newTerminal()
-    },
-    'julia-client:new-terminal-from-current-folder': ev => {
-      const dir = evaluation.currentDir(ev.target)
-      if (!dir) return
-      newTerminal(dir)
-    },
-    'julia-client:new-remote-terminal': () => {
-      newRemoteTerminal()
-    }
-  }))
-
   // handle deserialized terminals
   forEachPane(item => {
     if (!item.ty) {
@@ -351,11 +351,7 @@ export function deactivate () {
     item.detach()
     item.close()
   }, /terminal\-remote\-julia\-\d+/)
-  if (terminal) {
-    terminal.detach()
-  }
-  if (subs) {
-    subs.dispose()
-  }
+  if (terminal) terminal.detach()
+  if (subs) subs.dispose()
   subs = null
 }

menus/julia-client.cson

@@ -24,8 +24,8 @@
       label: 'Juno',
       submenu: [
         { label: 'Work in Folder', command: 'julia-client:work-in-current-folder' }
-        { label: 'Activate Project', command: 'julia-client:activate-current-folder' }
-        { label: 'New Terminal', command: 'julia-client:new-terminal-from-current-folder'}
+        { label: 'Activate Environment in Folder', command: 'julia-client:activate-environment-in-current-folder' }
+        { label: 'New Terminal from Folder', command: 'julia-client:new-terminal-from-current-folder'}
       ]
     }
     {type: 'separator'}