Implements Commands Key mapping #1876

ppot · 2017-05-26T16:43:15Z

-> keymaps files
-> config structure change (file deconstruction)
-> plugins extends keymaps
-> update hterm to use commands-registry

albinekb · 2017-05-27T19:32:17Z

app/config.js


 const watchers = [];
-
+const scanInterval = 2000;


I would:

// watch for changes on config every 2s on windows // https://github.com/zeit/hyper/pull/1772 const watchConfig = process.platform === 'win32' ? { interval: 2000 } : {} ... gaze(confPath, watchConfig, function (err) {

easier to read?

Yeah agree on that!

albinekb · 2017-05-27T19:37:50Z

One thing that would be 💯^10 is to be consistent with variable names, I'm thinking of the words
cfg, conf and config that are mixed, it's easier to read and understand the code if you use the same name for these, chose one and stick to it 👌

albinekb · 2017-05-27T19:39:01Z

app/config.js

-          watchers.forEach(fn => fn());
-        }
-      } catch (err) {
-        dialog.showMessageBox({


This PR changes from displaying a dialog to just a notification, correct?

I think it's nice with the dialog since you need to click "OK" to close it

I won't change it since using a dialog prevent hyper from opening.

albinekb · 2017-05-27T19:41:02Z

app/config.js

+
+exports.extendKeymaps = function (keymaps) {
+  if (keymaps) {
+    cfg.keymaps = keymaps;


Hmm.. I don't like mutating stuff like this. But I think we do this in other places? Maybe that's a job for another PR.

yeah we do this alot...

I'm OK with this for now, but we should clean it all up

albinekb · 2017-05-27T19:42:00Z

app/config/import.js

+const {writeFileSync, readFileSync} = require('fs');
+const {defaultConfig, confPath} = require('./paths');
+const _init = require('./init');
+const _keys = require('./keymaps');


nit: rename this to _keymaps, easier to understand the code

albinekb · 2017-05-27T20:02:41Z

app/config/init.js

+  return module.exports;
+};
+
+const _syntaxValidation = function (cfg) {


const _syntaxValidation = function (cfg) { try { return new vm.Script(cfg, { filename: '.hyper.js', displayErrors: true }) } catch (error) { notify(`Error loading config: ${error.name}, see DevTools for more info`) console.error('Error loading config:', error) return } }

tested:

_syntaxValidation(` const c = 'a' const b = 'd' const c = '2' `)

notify: Error loading config: SyntaxError, see DevTools for more info
console:

Error loading config: .hyper.js:4 const c = '2' ^^^ SyntaxError: Identifier 'c' has already been declared

Are you commenting as an error or a test?

haha the comment was to update _syntaxValidation to the code i wrote in my comment,
making it show what type of error happened, and log the row in .hyper.js to console

the blocks under is to show what it does

albinekb · 2017-05-27T20:10:14Z

app/config/paths.js


 const icon = resolve(__dirname, '../static/icon.png');

+const keymapPath = resolve(__dirname, '../keymaps');
+const darwinKeys = resolve(keymapPath, 'darwin.json');


Should't these be path.join?
http://tips.tutorialhorizon.com/2017/05/01/path-join-vs-path-resolve-in-node-js/

don't know how resolve vs join is performance/resource-wise,
it's probably so tiny that it's non-existent 😄

🤔

given that they contain .. resolve is probably better.

they do not @MartyGentillon resolve(keymapPath, 'darwin.json') keymapPath is already expanded

True enough for this particular path, but that would be the reasoning nonetheless.

albinekb · 2017-05-27T20:13:06Z

app/config/keymaps.js

+};
+
+const _import = function (customsKeys) {
+  const path = () => {


Why not move this to app/config/paths.js and just expose it as defaultPlatformKeyPath?

Is there a need to get other platforms' keys?

albinekb · 2017-05-27T20:16:14Z

app/keymaps/darwin.json

@@ -0,0 +1,34 @@
+{


run these trough http://jsonprettyprint.com or similar 😄

albinekb · 2017-05-27T20:19:12Z

app/menus/menu.js

-    pluginsMenu(updatePlugins),
-    windowMenu(),
-    helpMenu()
+    shellMenu(commands, createWindow),


ES6 style:

const menu = [ ...(process.platform === 'darwin' ? darwinMenu(commands) : []), ...shellMenu(commands, createWindow), ...editMenu(commands), ...viewMenu(commands), ...pluginsMenu(commands, updatePlugins), ...windowMenu(commands), ...helpMenu(commands) ]

then remove this further down:

if (process.platform === 'darwin') { ...menu.unshift... }

💅

to avoid mutations (unshift)

albinekb · 2017-05-27T20:24:24Z

app/menus/menus/shell.js

@@ -29,7 +27,7 @@ module.exports = function (createWindow) {
      },
      {
        label: 'Split Vertically',
-        accelerator: accelerators.splitVertically,
+        accelerator: commands['pane:vertical'],


maybe pane:splitVertical or pane:split:vertical to make it clearer, same with horizontal

albinekb · 2017-05-27T20:26:38Z

app/menus/menus/window.js

      },
      {
-        role: 'zoom'
+        role: 'zoom',


What does this actually do? 😂 never used it

Apparently nothing on Windows?

~~Aha, makes the window fill the screen (on macOS) 😄~~
It's the same thing as clicking the green traffc-light on macOS

Given that it does nothing on Windows (and KDE), should it even be in the menus on Windows (or Linux)?

Alternately, that could be a bug, It looks like that is supposed to be the same as "Maximize" in windows and linux, which don't appear anywhere in the menus on either (though they do appear in the window controls).

albinekb · 2017-05-27T20:27:19Z

app/menus/menus/window.js

@@ -71,7 +70,7 @@ module.exports = function () {
      },
      {
        role: 'togglefullscreen',
-        accelerators: accelerators.enterFullScreen
+        accelerators: commands['window:full']


window:toggleFullScreen, easier to understand

ppot · 2017-05-30T22:08:17Z

@albinekb Next review?

albinekb

💯 Nice work!

saadq · 2017-08-15T04:42:21Z

This is awesome. Is there going to be a way to see a list of available commands, or maybe have a way to allow commands to be logged to the console when you do some action (similar to Sublime Text's sublime.log_commands(True)?

ppot · 2017-08-15T04:52:42Z

mmm Make an issue for this as a suggestion ;) something like a command invocation actions

stereokai · 2017-08-15T12:29:52Z

@ppot Does this fix Command ctrl + C does not work #1121?

computersarecool · 2017-08-23T05:18:11Z

So,
Given the status of this pull request, how would one enable Readlines (emacs) style keybindings in Hyperterm?

sindrenm · 2017-08-24T09:54:47Z

Hype! Can confirm that this is indeed working! 🎉 👏

Any idea when it'll get released? 😀

computersarecool · 2017-08-29T19:03:58Z

To me it is unclear from the title "Implements Commands Key mapping" what this pull request will do but it closes a lot of open issues.

@ppot will this pull request make it so that keybindings in the Hyper terminal emulator will work as they should?

i.e. will these work?

ELLIOTTCABLE · 2017-08-30T19:36:08Z

Ditto @computersarecool, especially given that this is linked from the v1.4.0 release-notes — what, exactly, just got added? ^_^

ynnoj · 2017-08-31T06:57:54Z

@computersarecool @ELLIOTTCABLE https://hyper.is/#keymaps

iamstarkov · 2017-08-31T14:04:39Z

for @ELLIOTTCABLE and everyone else looking for available shortcuts

look 'em up here https://github.com/zeit/hyper/blob/master/app/keymaps/

albinekb mentioned this pull request May 26, 2017

Keymaps #1509

Closed

albinekb reviewed May 27, 2017

View reviewed changes

albinekb added the 👩‍🔬 Status: In Progress Issue or PR is currently active and work is in progress label May 27, 2017

ppot force-pushed the keymap@part2 branch 2 times, most recently from 57cf0db to e867c29 Compare May 28, 2017 20:47

albinekb approved these changes Jun 2, 2017

View reviewed changes

ppot added 5 commits June 2, 2017 19:46

Include keymap@2

cf8686f

First part fix

ee89466

lint

053754a

const renaming

886551b

Fix menu loading

d8f6ea0

ppot force-pushed the keymap@part2 branch from e867c29 to d8f6ea0 Compare June 2, 2017 23:46

ppot changed the title ~~Part2 of keymaps~~ Implements Commands Key mapping Jun 3, 2017

ppot merged commit 93b2229 into vercel:master Jun 3, 2017

ppot deleted the keymap@part2 branch June 3, 2017 00:03

albinekb mentioned this pull request Jun 3, 2017

Conditional menu build fix for window #1903

Merged

chabou mentioned this pull request Jun 9, 2017

Refresh hotkey (Ctrl + R) on Windows blocks Vim redo #1919

Closed

2 tasks

saadq mentioned this pull request Aug 15, 2017

Feature Request: Logging command names when invoked #2085

Closed

This was referenced Aug 15, 2017

Command ctrl + C does not work #1121

Closed

Ctrl-based shortcuts don't work on Linux #274

Closed

sindrenm mentioned this pull request Aug 24, 2017

ctrl + w / ctrl + a / deally all keymaps should be configurable #2106

Closed

2 tasks

ppot mentioned this pull request Aug 25, 2017

Rebind CTRL+SHIFT+C to CTRL+C? [Windows] #2116

Closed

miguelmich mentioned this pull request Aug 31, 2017

Linux: ctrl+v not working on 1.4.2 #2141

Closed

computersarecool mentioned this pull request Aug 31, 2017

Implement Readline Keybindings #2154

Closed

2 tasks

chabou mentioned this pull request Sep 10, 2017

Fix plugin path in dev mode #2192

Merged

Implements Commands Key mapping #1876

Implements Commands Key mapping #1876

Conversation

ppot commented May 26, 2017

albinekb May 27, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

albinekb commented May 27, 2017

albinekb May 27, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

albinekb May 27, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

albinekb May 27, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

albinekb May 27, 2017 • edited Loading

Choose a reason for hiding this comment

albinekb May 27, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

albinekb May 27, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ppot commented May 30, 2017

albinekb left a comment

Choose a reason for hiding this comment

saadq commented Aug 15, 2017

ppot commented Aug 15, 2017

stereokai commented Aug 15, 2017

computersarecool commented Aug 23, 2017

sindrenm commented Aug 24, 2017

computersarecool commented Aug 29, 2017

ELLIOTTCABLE commented Aug 30, 2017

ynnoj commented Aug 31, 2017

iamstarkov commented Aug 31, 2017

albinekb May 27, 2017 •

edited

Loading

albinekb May 27, 2017 •

edited

Loading

albinekb May 27, 2017 •

edited

Loading

albinekb May 27, 2017 •

edited

Loading

albinekb May 27, 2017 •

edited

Loading

albinekb May 27, 2017 •

edited

Loading

albinekb May 27, 2017 •

edited

Loading