Merge pull request #631 from JunoLab/sp/lingo

more consistent lingo

Author: pfitzseb

keymaps/julia-client.cson.cmd

@@ -41,9 +41,9 @@ Any global commands should either be non-default or, ideally, prefixed with `C-J
 
 # atom-workspace
 '.platform-darwin atom-workspace':
-  'cmd-j cmd-r': 'julia-client:open-a-repl'
-  'cmd-j cmd-o': 'julia-client:open-console'
-  'cmd-j cmd-c': 'julia-client:clear-console'
+  'cmd-j cmd-r': 'julia-client:open-external-repl'
+  'cmd-j cmd-o': 'julia-client:open-REPL'
+  'cmd-j cmd-c': 'julia-client:clear-REPL'
   'cmd-j cmd-s': 'julia-client:start-julia'
   'cmd-j cmd-k': 'julia-client:kill-julia'
   'cmd-j cmd-p': 'julia-client:open-plot-pane'

keymaps/julia-client.cson.ctrl

@@ -47,9 +47,9 @@ Any global commands should either be non-default or, ideally, prefixed with `C-J
 # atom-workspace
 '.platform-win32 atom-workspace,
  .platform-linux atom-workspace':
-  'ctrl-j ctrl-r': 'julia-client:open-a-repl'
-  'ctrl-j ctrl-o': 'julia-client:open-console'
-  'ctrl-j ctrl-c': 'julia-client:clear-console'
+  'ctrl-j ctrl-r': 'julia-client:open-external-repl'
+  'ctrl-j ctrl-o': 'julia-client:open-REPL'
+  'ctrl-j ctrl-c': 'julia-client:clear-REPL'
   'ctrl-j ctrl-s': 'julia-client:start-julia'
   'ctrl-j ctrl-k': 'julia-client:kill-julia'
   'ctrl-j ctrl-p': 'julia-client:open-plot-pane'

lib/connection/messages.coffee

@@ -36,7 +36,7 @@ module.exports =
         description:
           """
           Julia's first run will take a couple of minutes.
-          See the console below for progress.
+          See the REPL below for progress.
           """
         dismissable: true
       @openConsole()
@@ -47,7 +47,7 @@ module.exports =
         description:
           """
           Julia's first run will take a couple of minutes.
-          See the console below for progress.
+          See the REPL below for progress.
           """
         dismissable: true
       @openConsole()
@@ -58,14 +58,14 @@ module.exports =
         description:
           """
           Success! Juno is set up and ready to roll.
-          Try entering `2+2` in the console below.
+          Try entering `2+2` in the REPL below.
           """
         dismissable: true
       @openConsole()
 
   openConsole: ->
     atom.commands.dispatch atom.views.getView(atom.workspace),
-      'julia-client:open-console'
+      'julia-client:open-REPL'
 
   jlNotFound: (path, details = '') ->
     atom.notifications.addError "Julia could not be started.",

lib/package/commands.coffee

@@ -83,7 +83,7 @@ module.exports =
 
     # atom-work-space
     @subs.add atom.commands.add 'atom-workspace',
-      'julia-client:open-a-repl': -> juno.connection.terminal.repl()
+      'julia-client:open-external-repl': -> juno.connection.terminal.repl()
       'julia-client:start-julia': -> disrequireClient 'boot Julia', -> boot()
       'julia-client:start-remote-julia-process': -> disrequireClient 'boot a remote Julia process', -> juno.connection.bootRemote()
       'julia-client:kill-julia': -> juno.connection.client.kill()

lib/package/config.coffee

@@ -112,7 +112,7 @@ config =
         enum: [
           {value:'inline', description:'Float results next to code'}
           {value:'block', description:'Display results under code'}
-          {value:'console', description:'Display results in the console'}
+          {value:'console', description:'Display results in the REPL'}
         ]
         order: 1
       scrollToResult:
@@ -180,20 +180,20 @@ config =
         collapsed: true
         properties:
           console:
-            title: 'Console'
+            title: 'REPL'
             type: 'object'
             order: 1
             collapsed: true
             properties:
               defaultLocation:
-                title: 'Default location of Console Pane'
+                title: 'Default location of REPL Pane'
                 type: 'string'
                 enum: ['center', 'left', 'bottom', 'right']
                 default: 'bottom'
                 radio: true
                 order: 1
               split:
-                title: 'Splitting rule of Console Pane'
+                title: 'Splitting rule of REPL Pane'
                 type: 'string'
                 enum: ['no split', 'left', 'up', 'right', 'down']
                 default: 'no split'
@@ -412,6 +412,7 @@ config =
             order: 11
   consoleOptions:
     type: 'object'
+    title: 'Terminal Options'
     order: 4
     collapsed: true
     properties:

lib/package/menu.coffee

@@ -26,9 +26,12 @@ module.exports =
       {label: 'Start Remote Julia Process', command: 'julia-client:start-remote-julia-process'}
       {label: 'Interrupt Julia', command: 'julia-client:interrupt-julia'}
       {label: 'Stop Julia', command: 'julia-client:kill-julia'}
-      {label: 'Open Console', command: 'julia-client:open-console'}
-      {label: 'Clear Console', command: 'julia-client:clear-console'}
-      {label: 'Open REPL', command: 'julia-client:open-a-repl'}
+
+      {type: 'separator'}
+
+      {label: 'Open REPL', command: 'julia-client:open-REPL'}
+      {label: 'Clear REPL', command: 'julia-client:clear-REPL'}
+      {label: 'Open External REPL', command: 'julia-client:open-external-repl'}
       {
         label: 'Working Directory'
         submenu: [
@@ -38,12 +41,7 @@ module.exports =
           {label: 'Select...', command: 'julia-client:select-working-folder'}
         ]
       }
-      {
-        label: 'Working Module'
-        submenu: [
-          {label: 'Select...', command: 'julia-client:select-working-module'}
-        ]
-      }
+      {label: 'Select Working Module', command: 'julia-client:select-working-module'}
 
       {type: 'separator'}
 

lib/package/toolbar.coffee

@@ -80,8 +80,8 @@ module.exports =
 
     @bar.addButton
       icon: 'terminal'
-      tooltip: 'Show Console'
-      callback: 'julia-client:open-console'
+      tooltip: 'Show REPL'
+      callback: 'julia-client:open-REPL'
 
     @bar.addButton
       icon: 'book'
@@ -100,7 +100,7 @@ module.exports =
 
     @bar.addButton
       icon: 'graph'
-      tooltip: 'Show Plots'
+      tooltip: 'Show Plot Pane'
       callback: 'julia-client:open-plot-pane'
 
     @bar.addButton

lib/runtime/console.js

@@ -107,11 +107,11 @@ export function activate (_ink) {
     if (promptObserver) promptObserver.dispose()
   })
 
-  subs.add(atom.commands.add('atom-workspace', 'julia-client:open-console', () => {
+  subs.add(atom.commands.add('atom-workspace', 'julia-client:open-REPL', () => {
     open().then(() => terminal.show())
   }))
 
-  subs.add(atom.commands.add('atom-workspace', 'julia-client:clear-console', () => {
+  subs.add(atom.commands.add('atom-workspace', 'julia-client:clear-REPL', () => {
     terminal.clear()
   }))