Hello Dmitry and Felipe, I’ve taken a stab at formatting Felipe’s fix for arrow function indentation according to the coding standards. Compared to his patch, I made some trivial name/doc changes, and changed (progn (forward-char) (js--looking-at-broken-arrow-function-p)) to (save-excursion (forward-char) (js--looking-at-broken-arrow-function-p)) since we probably want to undo the forward-char in case the form returns nil. In order to get all the JS indentation tests to pass with make, I also had to make a variable safe file-locally. Both changes are attached. They could be applied to the emacs-26 branch. (Or master, but emacs-26 would be preferable so we can deliver it sooner. I tested on both branches.) Jackson