- {
- React.Children.map(children, (child, i) => {
+ return (
+
+ );
}
styles() {
@@ -136,11 +128,11 @@ export default class SplitPane extends Component {
height: '100%'
},
- 'panes_vertical': {
+ panes_vertical: {
flexDirection: 'row'
},
- 'panes_horizontal': {
+ panes_horizontal: {
flexDirection: 'column'
},
@@ -157,7 +149,7 @@ export default class SplitPane extends Component {
flexShrink: 0
},
- 'divider_vertical': {
+ divider_vertical: {
borderLeft: '5px solid rgba(255, 255, 255, 0)',
borderRight: '5px solid rgba(255, 255, 255, 0)',
width: '11px',
@@ -165,7 +157,7 @@ export default class SplitPane extends Component {
cursor: 'col-resize'
},
- 'divider_horizontal': {
+ divider_horizontal: {
height: '11px',
margin: '-5px 0',
borderTop: '5px solid rgba(255, 255, 255, 0)',
@@ -195,5 +187,4 @@ export default class SplitPane extends Component {
this.onDragEnd();
}
}
-
}
diff --git a/lib/components/style-sheet.js b/lib/components/style-sheet.js
index 962fe694..d9c3f5d0 100644
--- a/lib/components/style-sheet.js
+++ b/lib/components/style-sheet.js
@@ -1,7 +1,7 @@
-import React from 'react'
+import React from 'react';
export default class StyleSheet extends React.PureComponent {
- render () {
+ render() {
const {
customCSS,
colors,
@@ -11,11 +11,12 @@ export default class StyleSheet extends React.PureComponent {
fontSmoothing,
foregroundColor,
borderColor
- } = this.props
+ } = this.props;
return (
-
- )
+ }}
+ />
+ );
}
}
diff --git a/lib/components/tab.js b/lib/components/tab.js
index a2c9a3dc..ee204331 100644
--- a/lib/components/tab.js
+++ b/lib/components/tab.js
@@ -45,48 +45,34 @@ export default class Tab extends Component {
const {isActive, isFirst, isLast, borderColor, hasActivity} = this.props;
const {hovered} = this.state;
- return (
+ {this.props.customChildren}
+
+ );
}
styles() {
@@ -196,5 +182,4 @@ export default class Tab extends Component {
}
};
}
-
}
diff --git a/lib/components/tabs.js b/lib/components/tabs.js
index 94ae9c61..91e2ef59 100644
--- a/lib/components/tabs.js
+++ b/lib/components/tabs.js
@@ -9,33 +9,19 @@ const Tab = decorate(Tab_, 'Tab');
const isMac = /Mac/.test(navigator.userAgent);
export default class Tabs extends Component {
-
template(css) {
- const {
- tabs = [],
- borderColor,
- onChange,
- onClose
- } = this.props;
+ const {tabs = [], borderColor, onChange, onClose} = this.props;
const hide = !isMac && tabs.length === 1;
- return (
+ );
}
styles() {
@@ -104,5 +85,4 @@ export default class Tabs extends Component {
}
};
}
-
}
diff --git a/lib/components/term-group.js b/lib/components/term-group.js
index d3a73192..d9a67318 100644
--- a/lib/components/term-group.js
+++ b/lib/components/term-group.js
@@ -10,11 +10,10 @@ const Term = decorate(Term_, 'Term');
const SplitPane = decorate(SplitPane_, 'SplitPane');
class TermGroup_ extends Component {
-
constructor(props, context) {
super(props, context);
this.bound = new WeakMap();
- this.termRefs = {}
+ this.termRefs = {};
this.sizeChanged = false;
this.onTermRef = this.onTermRef.bind(this);
}
@@ -37,19 +36,21 @@ class TermGroup_ extends Component {
}
const direction = this.props.termGroup.direction.toLowerCase();
- return (
);
+ {groups}
+
+ );
}
onTermRef(uid, term) {
this.term = term;
- this.props.ref_(uid, term)
+ this.props.ref_(uid, term);
}
renderTerm(uid) {
@@ -85,15 +86,10 @@ class TermGroup_ extends Component {
// This will create a new ref_ function for every render,
// which is inefficient. Should maybe do something similar
// to this.bind.
- return (
;
}
- componentWillReceiveProps (nextProps) {
-
+ componentWillReceiveProps(nextProps) {
if (this.props.termGroup.sizes != nextProps.termGroup.sizes || nextProps.sizeChanged) {
this.term && this.term.measureResize();
// Indicate to children that their size has changed even if their ratio hasn't
@@ -101,7 +97,6 @@ class TermGroup_ extends Component {
} else {
this.sizeChanged = false;
}
-
}
template() {
@@ -111,15 +106,16 @@ class TermGroup_ extends Component {
}
const groups = childGroups.map(child => {
- const props = getTermGroupProps(child.uid, this.props.parentProps, Object.assign({}, this.props, {
- termGroup: child,
- sizeChanged: this.sizeChanged
- }));
+ const props = getTermGroupProps(
+ child.uid,
+ this.props.parentProps,
+ Object.assign({}, this.props, {
+ termGroup: child,
+ sizeChanged: this.sizeChanged
+ })
+ );
- return (
;
});
return this.renderSplit(groups);
@@ -128,9 +124,7 @@ class TermGroup_ extends Component {
const TermGroup = connect(
(state, ownProps) => ({
- childGroups: ownProps.termGroup.children.map(uid =>
- state.termGroups.termGroups[uid]
- )
+ childGroups: ownProps.termGroup.children.map(uid => state.termGroups.termGroups[uid])
}),
(dispatch, ownProps) => ({
onTermGroupResize(splitSizes) {
diff --git a/lib/components/term.js b/lib/components/term.js
index 765ffa95..3fabf9d9 100644
--- a/lib/components/term.js
+++ b/lib/components/term.js
@@ -11,20 +11,19 @@ const CURSOR_STYLES = {
BEAM: 'bar',
UNDERLINE: 'underline',
BLOCK: 'block'
-}
+};
export default class Term extends Component {
-
constructor(props) {
super(props);
props.ref_(props.uid, this);
- this.termRef = null
- this.termWrapperRef = null
- this.termRect = null
- this.onOpen = this.onOpen.bind(this)
- this.onWindowResize = this.onWindowResize.bind(this)
- this.onTermRef = this.onTermRef.bind(this)
- this.onTermWrapperRef = this.onTermWrapperRef.bind(this)
+ this.termRef = null;
+ this.termWrapperRef = null;
+ this.termRect = null;
+ this.onOpen = this.onOpen.bind(this);
+ this.onWindowResize = this.onWindowResize.bind(this);
+ this.onTermRef = this.onTermRef.bind(this);
+ this.onTermWrapperRef = this.onTermWrapperRef.bind(this);
}
componentDidMount() {
@@ -34,59 +33,49 @@ export default class Term extends Component {
// as we move the term around splits, until xterm adds
// support for getState / setState
if (props.term) {
- this.term = props.term
- this.termRef.appendChild(this.term.element)
- this.onOpen()
+ this.term = props.term;
+ this.termRef.appendChild(this.term.element);
+ this.onOpen();
} else {
- this.term = props.term || new Terminal({
- cursorStyle: CURSOR_STYLES[props.cursorShape],
- cursorBlink: props.cursorBlink
- })
- this.term.attachCustomKeyEventHandler(this.keyboardHandler)
- this.term.on('open', this.onOpen)
+ this.term =
+ props.term ||
+ new Terminal({
+ cursorStyle: CURSOR_STYLES[props.cursorShape],
+ cursorBlink: props.cursorBlink
+ });
+ this.term.attachCustomKeyEventHandler(this.keyboardHandler);
+ this.term.on('open', this.onOpen);
this.term.open(this.termRef, {
focus: false
- })
+ });
}
if (props.onTitle) {
- this.term.on(
- 'title',
- props.onTitle
- )
+ this.term.on('title', props.onTitle);
}
if (props.onActive) {
- this.term.on(
- 'focus',
- props.onActive
- )
+ this.term.on('focus', props.onActive);
}
if (props.onData) {
- this.term.on(
- 'data',
- props.onData
- )
+ this.term.on('data', props.onData);
}
if (props.onResize) {
- this.term.on(
- 'resize',
- ({ cols, rows }) => {
- props.onResize(cols, rows)
- }
- )
+ this.term.on('resize', ({cols, rows}) => {
+ props.onResize(cols, rows);
+ });
}
window.addEventListener('resize', this.onWindowResize, {
passive: true
- })
+ });
terms[this.props.uid] = this;
}
- onOpen () {
+ onOpen() {
// we need to delay one frame so that aphrodite styles
// get applied and we can make an accurate measurement
// of the container width and height
@@ -97,26 +86,26 @@ export default class Term extends Component {
// we force it instead
this.term.charMeasure.measure();
this.measureResize();
- })
+ });
}
- getTermDocument () {
+ getTermDocument() {
// eslint-disable-next-line no-console
- console.error('unimplemented')
+ console.error('unimplemented');
}
// measures the container and makes the decision
// whether to resize the term to fit the container
- measureResize () {
- console.log('performing measure resize')
- const termRect = this.termWrapperRef.getBoundingClientRect()
+ measureResize() {
+ //eslint-disable-next-line no-console
+ console.log('performing measure resize');
+ const termRect = this.termWrapperRef.getBoundingClientRect();
- if (!this.termRect ||
- termRect.width !== this.termRect.width ||
- termRect.height !== this.termRect.height) {
+ if (!this.termRect || termRect.width !== this.termRect.width || termRect.height !== this.termRect.height) {
this.termRect = termRect;
- console.log('performing fit resize')
- this.fitResize()
+ //eslint-disable-next-line no-console
+ console.log('performing fit resize');
+ this.fitResize();
}
}
@@ -136,24 +125,20 @@ export default class Term extends Component {
this.term.clear();
}
- reset () {
+ reset() {
this.term.reset();
}
- resize (cols, rows) {
+ resize(cols, rows) {
this.term.resize(cols, rows);
}
- fitResize () {
- const cols = Math.floor(
- this.termRect.width / this.term.charMeasure.width
- )
- const rows = Math.floor(
- this.termRect.height / this.term.charMeasure.height
- )
+ fitResize() {
+ const cols = Math.floor(this.termRect.width / this.term.charMeasure.width);
+ const rows = Math.floor(this.termRect.height / this.term.charMeasure.height);
if (cols !== this.props.cols || rows !== this.props.rows) {
- this.resize(cols, rows)
+ this.resize(cols, rows);
}
}
@@ -173,19 +158,17 @@ export default class Term extends Component {
this.clear();
}
- if (this.props.fontSize !== nextProps.fontSize ||
- this.props.fontFamily !== nextProps.fontFamily) {
+ if (this.props.fontSize !== nextProps.fontSize || this.props.fontFamily !== nextProps.fontFamily) {
// invalidate xterm cache about how wide each
// character is
- this.term.charMeasure.measure()
+ this.term.charMeasure.measure();
// resize to fit the container
- this.fitResize()
+ this.fitResize();
}
- if (nextProps.rows !== this.props.rows ||
- nextProps.cols !== this.props.cols) {
- this.resize(nextProps.cols, nextProps.rows)
+ if (nextProps.rows !== this.props.rows || nextProps.cols !== this.props.cols) {
+ this.resize(nextProps.cols, nextProps.rows);
}
}
@@ -202,33 +185,26 @@ export default class Term extends Component {
this.props.ref_(this.props.uid, null);
// to clean up the terminal, we remove the listeners
- // instead of invoking `destroy`, since it will make the
+ // instead of invoking `destroy`, since it will make the
// term insta un-attachable in the future (which we need
// to do in case of splitting, see `componentDidMount`
- this.term._events = {}
+ this.term._events = {};
window.removeEventListener('resize', this.onWindowResize, {
passive: true
- })
+ });
}
template(css) {
- return (
- { this.props.customChildrenBefore }
-
-
+ return (
+
+ {this.props.customChildrenBefore}
+
+ {this.props.customChildren}
- { this.props.customChildren }
-
);
+ );
}
styles() {
diff --git a/lib/components/terms.js b/lib/components/terms.js
index 663dccf9..ffd55017 100644
--- a/lib/components/terms.js
+++ b/lib/components/terms.js
@@ -11,7 +11,6 @@ const StyleSheet = decorate(StyleSheet_, 'StyleSheet');
const isMac = /Mac/.test(navigator.userAgent);
export default class Terms extends Component {
-
constructor(props, context) {
super(props, context);
this.terms = {};
@@ -71,12 +70,10 @@ export default class Terms extends Component {
template(css) {
const shift = !isMac && this.props.termGroups.length > 1;
- return (
- { this.props.customChildrenBefore }
- {
- this.props.termGroups.map(termGroup => {
+ return (
+
+ {this.props.customChildrenBefore}
+ {this.props.termGroups.map(termGroup => {
const {uid} = termGroup;
const isActive = uid === this.props.activeRootGroup;
const props = getTermGroupProps(uid, this.props, {
@@ -105,31 +102,24 @@ export default class Terms extends Component {
});
return (
-
-
+
+
);
- })
- }
- { this.props.customChildren }
-
-
);
+ })}
+ {this.props.customChildren}
+
+
+ );
}
styles() {
diff --git a/lib/containers/header.js b/lib/containers/header.js
index ccf4770e..bf7504fc 100644
--- a/lib/containers/header.js
+++ b/lib/containers/header.js
@@ -14,16 +14,17 @@ const getActiveSessions = ({termGroups}) => termGroups.activeSessions;
const getActivityMarkers = ({ui}) => ui.activityMarkers;
const getTabs = createSelector(
[getSessions, getRootGroups, getActiveSessions, getActiveRootGroup, getActivityMarkers],
- (sessions, rootGroups, activeSessions, activeRootGroup, activityMarkers) => rootGroups.map(t => {
- const activeSessionUid = activeSessions[t.uid];
- const session = sessions[activeSessionUid];
- return {
- uid: t.uid,
- title: session.title,
- isActive: t.uid === activeRootGroup,
- hasActivity: activityMarkers[session.uid]
- };
- })
+ (sessions, rootGroups, activeSessions, activeRootGroup, activityMarkers) =>
+ rootGroups.map(t => {
+ const activeSessionUid = activeSessions[t.uid];
+ const session = sessions[activeSessionUid];
+ return {
+ uid: t.uid,
+ title: session.title,
+ isActive: t.uid === activeRootGroup,
+ hasActivity: activityMarkers[session.uid]
+ };
+ })
);
const HeaderContainer = connect(
diff --git a/lib/containers/hyper.js b/lib/containers/hyper.js
index 4aeceba3..4a9ca610 100644
--- a/lib/containers/hyper.js
+++ b/lib/containers/hyper.js
@@ -36,7 +36,7 @@ class Hyper extends Component {
attachKeyListeners() {
// eslint-disable-next-line no-console
- console.error('removed key listeners')
+ console.error('removed key listeners');
}
onTermsRef(terms) {
@@ -62,8 +62,7 @@ class Hyper extends Component {
template(css) {
const {isMac: isMac_, customCSS, uiFontFamily, borderColor, maximized} = this.props;
- const borderWidth = isMac_ ? '' :
- `${maximized ? '0' : '1'}px`;
+ const borderWidth = isMac_ ? '' : `${maximized ? '0' : '1'}px`;
return (
@@ -71,14 +70,14 @@ class Hyper extends Component {
style={{fontFamily: uiFontFamily, borderColor, borderWidth}}
className={css('main', isMac_ && 'mainRounded')}
>
-
-
- { this.props.customInnerChildren }
+
+
+ {this.props.customInnerChildren}
-
-
- { this.props.customChildren }
+
+
+ {this.props.customChildren}
);
}
diff --git a/lib/containers/terms.js b/lib/containers/terms.js
index 012012d8..c2a10608 100644
--- a/lib/containers/terms.js
+++ b/lib/containers/terms.js
@@ -21,9 +21,7 @@ const TermsContainer = connect(
activeSession: state.sessions.activeUid,
customCSS: state.ui.termCSS,
write: state.sessions.write,
- fontSize: state.ui.fontSizeOverride ?
- state.ui.fontSizeOverride :
- state.ui.fontSize,
+ fontSize: state.ui.fontSizeOverride ? state.ui.fontSizeOverride : state.ui.fontSize,
fontFamily: state.ui.fontFamily,
uiFontFamily: state.ui.uiFontFamily,
fontSmoothing: state.ui.fontSmoothingOverride,
@@ -49,7 +47,6 @@ const TermsContainer = connect(
},
onTitle(uid, title) {
- console.log(title)
dispatch(setSessionXtermTitle(uid, title));
},
diff --git a/lib/hterm.js b/lib/hterm.js
index 6845276b..5a3efc60 100644
--- a/lib/hterm.js
+++ b/lib/hterm.js
@@ -9,7 +9,7 @@ import CommandRegistry from './command-registry';
hterm.defaultStorage = new lib.Storage.Memory();
// Provide selectAll to terminal viewport
-hterm.Terminal.prototype.selectAll = function () {
+hterm.Terminal.prototype.selectAll = () => {
// If the cursorNode_ having hyperCaret we need to remove it
if (this.cursorNode_.contains(this.hyperCaret)) {
this.cursorNode_.removeChild(this.hyperCaret);
@@ -21,9 +21,10 @@ hterm.Terminal.prototype.selectAll = function () {
// override double click behavior to copy
const oldMouse = hterm.Terminal.prototype.onMouse_;
-hterm.Terminal.prototype.onMouse_ = function (e) {
+hterm.Terminal.prototype.onMouse_ = e => {
if (e.type === 'dblclick') {
selection.extend(this);
+ //eslint-disable-next-line no-console
console.log('[hyper+hterm] ignore double click');
return;
}
@@ -35,20 +36,23 @@ function containsNonLatinCodepoints(s) {
}
// hterm Unicode patch
-hterm.TextAttributes.splitWidecharString = function (str) {
- const context = runes(str).reduce((ctx, rune) => {
- const code = rune.codePointAt(0);
- if (code < 128 || lib.wc.charWidth(code) === 1) {
- ctx.acc += rune;
+hterm.TextAttributes.splitWidecharString = str => {
+ const context = runes(str).reduce(
+ (ctx, rune) => {
+ const code = rune.codePointAt(0);
+ if (code < 128 || lib.wc.charWidth(code) === 1) {
+ ctx.acc += rune;
+ return ctx;
+ }
+ if (ctx.acc) {
+ ctx.items.push({str: ctx.acc});
+ ctx.acc = '';
+ }
+ ctx.items.push({str: rune, wcNode: true});
return ctx;
- }
- if (ctx.acc) {
- ctx.items.push({str: ctx.acc});
- ctx.acc = '';
- }
- ctx.items.push({str: rune, wcNode: true});
- return ctx;
- }, {items: [], acc: ''});
+ },
+ {items: [], acc: ''}
+ );
if (context.acc) {
context.items.push({str: context.acc});
}
@@ -57,7 +61,7 @@ hterm.TextAttributes.splitWidecharString = function (str) {
// hterm Unicode patch
const cache = [];
-lib.wc.strWidth = function (str) {
+lib.wc.strWidth = str => {
const shouldCache = str.length === 1;
if (shouldCache && cache[str] !== undefined) {
return cache[str];
@@ -72,7 +76,7 @@ lib.wc.strWidth = function (str) {
if (width < 0) {
return -1;
}
- rv += width * ((codePoint <= 0xFFFF) ? 1 : 2);
+ rv += width * (codePoint <= 0xffff ? 1 : 2);
}
if (shouldCache) {
cache[str] = rv;
@@ -81,7 +85,7 @@ lib.wc.strWidth = function (str) {
};
// hterm Unicode patch
-lib.wc.substr = function (str, start, optWidth) {
+lib.wc.substr = (str, start, optWidth) => {
const chars = runes(str);
let startIndex;
let endIndex;
@@ -90,7 +94,7 @@ lib.wc.substr = function (str, start, optWidth) {
for (let i = 0; i < chars.length; i++) {
const codePoint = chars[i].codePointAt(0);
const charWidth = lib.wc.charWidth(codePoint);
- if ((width + charWidth) > start) {
+ if (width + charWidth > start) {
startIndex = i;
break;
}
@@ -112,14 +116,14 @@ lib.wc.substr = function (str, start, optWidth) {
};
// MacOS emoji bar support
-hterm.Keyboard.prototype.onTextInput_ = function (e) {
+hterm.Keyboard.prototype.onTextInput_ = e => {
if (!e.data) {
return;
}
runes(e.data).forEach(this.terminal.onVTKeystroke.bind(this.terminal));
};
-hterm.Terminal.IO.prototype.writeUTF8 = function (string) {
+hterm.Terminal.IO.prototype.writeUTF8 = string => {
if (this.terminal_.io !== this) {
throw new Error('Attempt to print from inactive IO object.');
}
@@ -137,12 +141,12 @@ hterm.Terminal.IO.prototype.writeUTF8 = function (string) {
};
const oldIsDefault = hterm.TextAttributes.prototype.isDefault;
-hterm.TextAttributes.prototype.isDefault = function () {
+hterm.TextAttributes.prototype.isDefault = () => {
return !this.unicodeNode && oldIsDefault.call(this);
};
const oldSetFontSize = hterm.Terminal.prototype.setFontSize;
-hterm.Terminal.prototype.setFontSize = function (px) {
+hterm.Terminal.prototype.setFontSize = px => {
oldSetFontSize.call(this, px);
const doc = this.getDocument();
let unicodeNodeStyle = doc.getElementById('hyper-unicode-styles');
@@ -161,7 +165,7 @@ hterm.Terminal.prototype.setFontSize = function (px) {
};
const oldCreateContainer = hterm.TextAttributes.prototype.createContainer;
-hterm.TextAttributes.prototype.createContainer = function (text) {
+hterm.TextAttributes.prototype.createContainer = text => {
const container = oldCreateContainer.call(this, text);
if (container.style && runes(text).length === 1 && containsNonLatinCodepoints(text)) {
container.className += ' unicode-node';
@@ -171,19 +175,17 @@ hterm.TextAttributes.prototype.createContainer = function (text) {
// Do not match containers when one of them has unicode text (unicode chars need to be alone in their containers)
const oldMatchesContainer = hterm.TextAttributes.prototype.matchesContainer;
-hterm.TextAttributes.prototype.matchesContainer = function (obj) {
- return oldMatchesContainer.call(this, obj) &&
- !this.unicodeNode &&
- !containsNonLatinCodepoints(obj.textContent);
+hterm.TextAttributes.prototype.matchesContainer = obj => {
+ return oldMatchesContainer.call(this, obj) && !this.unicodeNode && !containsNonLatinCodepoints(obj.textContent);
};
// there's no option to turn off the size overlay
-hterm.Terminal.prototype.overlaySize = function () {};
+hterm.Terminal.prototype.overlaySize = () => {};
// fixing a bug in hterm where a double click triggers
// a non-collapsed selection whose text is '', and results
// in an infinite copy loop
-hterm.Terminal.prototype.copySelectionToClipboard = function () {
+hterm.Terminal.prototype.copySelectionToClipboard = () => {
const text = this.getSelectionText();
if (text) {
this.copyStringToClipboard(text);
@@ -195,7 +197,7 @@ let lastEventKey;
// passthrough all the commands that are meant to control
// hyper and not the terminal itself
const oldKeyDown = hterm.Keyboard.prototype.onKeyDown_;
-hterm.Keyboard.prototype.onKeyDown_ = function (e) {
+hterm.Keyboard.prototype.onKeyDown_ = e => {
const modifierKeysConf = this.terminal.modifierKeys;
if (e.timeStamp === lastEventTimeStamp && e.key === lastEventKey) {
// Event was already processed.
@@ -207,25 +209,29 @@ hterm.Keyboard.prototype.onKeyDown_ = function (e) {
lastEventTimeStamp = e.timeStamp;
lastEventKey = e.key;
- if (e.altKey &&
- e.which !== 16 && // Ignore other modifer keys
- e.which !== 17 &&
- e.which !== 18 &&
- e.which !== 91 &&
- modifierKeysConf.altIsMeta) {
+ if (
+ e.altKey &&
+ e.which !== 16 && // Ignore other modifer keys
+ e.which !== 17 &&
+ e.which !== 18 &&
+ e.which !== 91 &&
+ modifierKeysConf.altIsMeta
+ ) {
const char = fromCharCode(e);
this.terminal.onVTKeystroke('\x1b' + char);
e.preventDefault();
}
- if (e.metaKey &&
- e.code !== 'MetaLeft' &&
- e.code !== 'MetaRight' &&
- e.which !== 16 &&
- e.which !== 17 &&
- e.which !== 18 &&
- e.which !== 91 &&
- modifierKeysConf.cmdIsMeta) {
+ if (
+ e.metaKey &&
+ e.code !== 'MetaLeft' &&
+ e.code !== 'MetaRight' &&
+ e.which !== 16 &&
+ e.which !== 17 &&
+ e.which !== 18 &&
+ e.which !== 91 &&
+ modifierKeysConf.cmdIsMeta
+ ) {
const char = fromCharCode(e);
this.terminal.onVTKeystroke('\x1b' + char);
e.preventDefault();
@@ -248,14 +254,8 @@ hterm.Keyboard.prototype.onKeyDown_ = function (e) {
}
// Test for valid keys in order to accept clear status
- const clearBlacklist = [
- 'control',
- 'shift',
- 'capslock',
- 'dead'
- ];
- if (!clearBlacklist.includes(e.code.toLowerCase()) &&
- !clearBlacklist.includes(e.key.toLowerCase())) {
+ const clearBlacklist = ['control', 'shift', 'capslock', 'dead'];
+ if (!clearBlacklist.includes(e.code.toLowerCase()) && !clearBlacklist.includes(e.key.toLowerCase())) {
// Since Electron 1.6.X, there is a race condition with character composition
// if this selection clearing is made synchronously. See #2140.
setTimeout(() => selection.clear(this.terminal), 0);
@@ -269,7 +269,7 @@ hterm.Keyboard.prototype.onKeyDown_ = function (e) {
};
const oldOnMouse = hterm.Terminal.prototype.onMouse_;
-hterm.Terminal.prototype.onMouse_ = function (e) {
+hterm.Terminal.prototype.onMouse_ = e => {
// override `preventDefault` to not actually
// prevent default when the type of event is
// mousedown, so that we can still trigger
@@ -278,14 +278,14 @@ hterm.Terminal.prototype.onMouse_ = function (e) {
// case of programs like `vtop` that allow for
// the user to click on rows
if (e.type === 'mousedown') {
- e.preventDefault = function () { };
+ e.preventDefault = () => {};
return;
}
return oldOnMouse.call(this, e);
};
-hterm.Terminal.prototype.onMouseDown_ = function (e) {
+hterm.Terminal.prototype.onMouseDown_ = e => {
// copy/paste on right click
if (e.button === 2) {
const text = this.getSelectionText();
@@ -300,29 +300,25 @@ hterm.Terminal.prototype.onMouseDown_ = function (e) {
// override `ScrollPort.resize` to avoid an expensive calculation
// just to get the size of the scrollbar, which for Hyper is always
// set to overlay (hence with `0`)
-hterm.ScrollPort.prototype.resize = function () {
+hterm.ScrollPort.prototype.resize = () => {
this.currentScrollbarWidthPx = 0;
this.syncScrollHeight();
this.syncRowNodesDimensions_();
- this.publish(
- 'resize',
- {scrollPort: this},
- () => {
- this.scrollRowToBottom(this.rowProvider_.getRowCount());
- this.scheduleRedraw();
- }
- );
+ this.publish('resize', {scrollPort: this}, () => {
+ this.scrollRowToBottom(this.rowProvider_.getRowCount());
+ this.scheduleRedraw();
+ });
};
// make background transparent to avoid transparency issues
-hterm.ScrollPort.prototype.setBackgroundColor = function () {
+hterm.ScrollPort.prototype.setBackgroundColor = () => {
this.screen_.style.backgroundColor = 'transparent';
};
// will be called by the
right after the `hterm.Terminal` is instantiated
-hterm.Terminal.prototype.onHyperCaret = function (caret) {
+hterm.Terminal.prototype.onHyperCaret = caret => {
this.hyperCaret = caret;
let ongoingComposition = false;
@@ -389,14 +385,14 @@ hterm.Terminal.prototype.onHyperCaret = function (caret) {
// ensure that our contenteditable caret is injected
// inside the term's cursor node and that it's focused
-hterm.Terminal.prototype.focusHyperCaret = function () {
+hterm.Terminal.prototype.focusHyperCaret = () => {
if (!this.hyperCaret.parentNode !== this.cursorNode_) {
this.cursorNode_.appendChild(this.hyperCaret);
}
this.hyperCaret.focus();
};
-hterm.Screen.prototype.syncSelectionCaret = function () {
+hterm.Screen.prototype.syncSelectionCaret = () => {
const p = this.terminal.hyperCaret;
const doc = this.terminal.document_;
const win = doc.defaultView;
@@ -413,14 +409,14 @@ hterm.Screen.prototype.syncSelectionCaret = function () {
// the original function) was causing the issue. So right now we're overriding
// the function to prevent the `iframe_` from being focused.
// This shouldn't create any side effects – we're _stealing_ the focus from `htem` anyways.
-hterm.ScrollPort.prototype.focus = function () {
+hterm.ScrollPort.prototype.focus = () => {
this.screen_.focus();
};
// fixes a bug in hterm, where the cursor goes back to `BLOCK`
// after the bell rings
const oldRingBell = hterm.Terminal.prototype.ringBell;
-hterm.Terminal.prototype.ringBell = function () {
+hterm.Terminal.prototype.ringBell = () => {
oldRingBell.call(this);
setTimeout(() => {
this.restyleCursor_();
@@ -429,7 +425,7 @@ hterm.Terminal.prototype.ringBell = function () {
// fixes a bug in hterm, where the shorthand hex
// is not properly converted to rgb
-lib.colors.hexToRGB = function (arg) {
+lib.colors.hexToRGB = arg => {
const hex16 = lib.colors.re_.hex16;
const hex24 = lib.colors.re_.hex24;
@@ -444,11 +440,7 @@ lib.colors.hexToRGB = function (arg) {
return null;
}
- return 'rgb(' +
- parseInt(ary[1], 16) + ', ' +
- parseInt(ary[2], 16) + ', ' +
- parseInt(ary[3], 16) +
- ')';
+ return 'rgb(' + parseInt(ary[1], 16) + ', ' + parseInt(ary[2], 16) + ', ' + parseInt(ary[3], 16) + ')';
}
if (Array.isArray(arg)) {
@@ -463,7 +455,7 @@ lib.colors.hexToRGB = function (arg) {
};
// add support for cursor styles 5 and 6, fixes #270
-hterm.VT.CSI[' q'] = function (parseState) {
+hterm.VT.CSI[' q'] = parseState => {
const arg = parseState.args[0];
if (arg === '0' || arg === '1') {
this.terminal.setCursorShape(hterm.Terminal.cursorShape.BLOCK);
@@ -484,6 +476,7 @@ hterm.VT.CSI[' q'] = function (parseState) {
this.terminal.setCursorShape(hterm.Terminal.cursorShape.BEAM);
this.terminal.setCursorBlink(false);
} else {
+ //eslint-disable-next-line no-console
console.warn('Unknown cursor style: ' + arg);
}
};
diff --git a/lib/index.js b/lib/index.js
index d093ed45..18aedf08 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -148,7 +148,7 @@ rpc.on('add notification', ({text, url, dismissable}) => {
const app = render(
-
+
,
document.getElementById('mount')
);
diff --git a/lib/reducers/sessions.js b/lib/reducers/sessions.js
index 18bffff4..1d7ebcb9 100644
--- a/lib/reducers/sessions.js
+++ b/lib/reducers/sessions.js
@@ -35,15 +35,16 @@ function Session(obj) {
const reducer = (state = initialState, action) => {
switch (action.type) {
case SESSION_ADD:
- return state
- .set('activeUid', action.uid)
- .setIn(['sessions', action.uid], Session({
+ return state.set('activeUid', action.uid).setIn(
+ ['sessions', action.uid],
+ Session({
cols: action.cols,
rows: action.rows,
uid: action.uid,
shell: action.shell.split('/').pop(),
pid: action.pid
- }));
+ })
+ );
case SESSION_URL_SET:
return state.setIn(['sessions', action.uid, 'url'], action.url);
@@ -55,27 +56,31 @@ const reducer = (state = initialState, action) => {
return state.set('activeUid', action.uid);
case SESSION_CLEAR_ACTIVE:
- return state.merge({
- sessions: {
- [state.activeUid]: {
- cleared: true
+ return state.merge(
+ {
+ sessions: {
+ [state.activeUid]: {
+ cleared: true
+ }
}
- }
- }, {deep: true});
+ },
+ {deep: true}
+ );
case SESSION_PTY_DATA:
// we avoid a direct merge for perf reasons
// as this is the most common action
- if (state.sessions[action.uid] &&
- state.sessions[action.uid].cleared) {
- return state
- .merge({
+ if (state.sessions[action.uid] && state.sessions[action.uid].cleared) {
+ return state.merge(
+ {
sessions: {
[action.uid]: {
cleared: false
}
}
- }, {deep: true});
+ },
+ {deep: true}
+ );
}
return state;
@@ -99,11 +104,14 @@ const reducer = (state = initialState, action) => {
);
case SESSION_RESIZE:
- return state.setIn(['sessions', action.uid], state.sessions[action.uid].merge({
- rows: action.rows,
- cols: action.cols,
- resizeAt: Date.now()
- }));
+ return state.setIn(
+ ['sessions', action.uid],
+ state.sessions[action.uid].merge({
+ rows: action.rows,
+ cols: action.cols,
+ resizeAt: Date.now()
+ })
+ );
case SESSION_SET_CWD:
return state.setIn(['sessions', state.activeUid, 'cwd'], action.cwd);
diff --git a/lib/reducers/term-groups.js b/lib/reducers/term-groups.js
index 9ac2867d..ad14152e 100644
--- a/lib/reducers/term-groups.js
+++ b/lib/reducers/term-groups.js
@@ -40,9 +40,7 @@ const setActiveGroup = (state, action) => {
const childGroup = findBySession(state, action.uid);
const rootGroup = findRootGroup(state.termGroups, childGroup.uid);
- return state
- .set('activeRootGroup', rootGroup.uid)
- .setIn(['activeSessions', rootGroup.uid], action.uid);
+ return state.set('activeRootGroup', rootGroup.uid).setIn(['activeSessions', rootGroup.uid], action.uid);
};
// Reduce existing sizes to fit a new split:
@@ -50,7 +48,7 @@ const insertRebalance = (oldSizes, index) => {
const newSize = 1 / (oldSizes.length + 1);
// We spread out how much each pane should be reduced
// with based on their existing size:
- const balanced = oldSizes.map(size => size - (newSize * size));
+ const balanced = oldSizes.map(size => size - newSize * size);
return [...balanced.slice(0, index), newSize, ...balanced.slice(index)];
};
@@ -58,9 +56,7 @@ const insertRebalance = (oldSizes, index) => {
const removalRebalance = (oldSizes, index) => {
const removedSize = oldSizes[index];
const increase = removedSize / (oldSizes.length - 1);
- return oldSizes
- .filter((_size, i) => i !== index)
- .map(size => size + increase);
+ return oldSizes.filter((_size, i) => i !== index).map(size => size + increase);
};
const splitGroup = (state, action) => {
@@ -96,23 +92,27 @@ const splitGroup = (state, action) => {
parentUid: parentGroup.uid
});
- return state
- .setIn(['termGroups', existingSession.uid], existingSession)
- .setIn(['termGroups', parentGroup.uid], parentGroup.merge({
+ return state.setIn(['termGroups', existingSession.uid], existingSession).setIn(
+ ['termGroups', parentGroup.uid],
+ parentGroup.merge({
sessionUid: null,
direction: splitDirection,
children: [existingSession.uid, newSession.uid]
- }));
+ })
+ );
}
const {children} = parentGroup;
// Insert the new child pane right after the active one:
const index = children.indexOf(activeGroup.uid) + 1;
const newChildren = [...children.slice(0, index), newSession.uid, ...children.slice(index)];
- state = state.setIn(['termGroups', parentGroup.uid], parentGroup.merge({
- direction: splitDirection,
- children: newChildren
- }));
+ state = state.setIn(
+ ['termGroups', parentGroup.uid],
+ parentGroup.merge({
+ direction: splitDirection,
+ children: newChildren
+ })
+ );
if (parentGroup.sizes) {
const newSizes = insertRebalance(parentGroup.sizes, index);
@@ -131,17 +131,13 @@ const replaceParent = (state, parent, child) => {
// If the parent we're replacing has a parent,
// we need to change the uid in its children array
// with `child`:
- const newChildren = parentParent.children.map(uid =>
- uid === parent.uid ? child.uid : uid
- );
+ const newChildren = parentParent.children.map(uid => (uid === parent.uid ? child.uid : uid));
state = state.setIn(['termGroups', parentParent.uid, 'children'], newChildren);
} else {
// This means the given child will be
// a root group, so we need to set it up as such:
- const newSessions = state.activeSessions
- .without(parent.uid)
- .set(child.uid, state.activeSessions[parent.uid]);
+ const newSessions = state.activeSessions.without(parent.uid).set(child.uid, state.activeSessions[parent.uid]);
state = state
.set('activeTermGroup', child.uid)
@@ -185,10 +181,7 @@ const resizeGroup = (state, uid, sizes) => {
return state;
}
- return state.setIn(
- ['termGroups', uid, 'sizes'],
- sizes
- );
+ return state.setIn(['termGroups', uid, 'sizes'], sizes);
};
const reducer = (state = initialState, action) => {
diff --git a/lib/reducers/ui.js b/lib/reducers/ui.js
index 4209aaae..399a4452 100644
--- a/lib/reducers/ui.js
+++ b/lib/reducers/ui.js
@@ -40,7 +40,8 @@ const initial = Immutable({
fontSize: 12,
padding: '12px 14px',
fontFamily: 'Menlo, "DejaVu Sans Mono", "Lucida Console", monospace',
- uiFontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif',
+ uiFontFamily:
+ '-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif',
fontSizeOverride: null,
fontSmoothingOverride: 'antialiased',
css: '',
@@ -97,128 +98,128 @@ const currentWindow = remote.getCurrentWindow();
const reducer = (state = initial, action) => {
let state_ = state;
let isMax;
-
- switch (action.type) { // eslint-disable-line default-case
+ //eslint-disable-next-line default-case
+ switch (action.type) {
case CONFIG_LOAD:
- case CONFIG_RELOAD: // eslint-disable-line no-case-declarations
+ // eslint-disable-next-line no-case-declarations, no-fallthrough
+ case CONFIG_RELOAD:
const {config} = action;
state_ = state
// unset the user font size override if the
// font size changed from the config
- .merge((() => {
- const ret = {};
+ .merge(
+ (() => {
+ const ret = {};
- if (state.fontSizeOverride && config.fontSize !== state.fontSize) {
- ret.fontSizeOverride = null;
- }
+ if (state.fontSizeOverride && config.fontSize !== state.fontSize) {
+ ret.fontSizeOverride = null;
+ }
- if (config.fontSize) {
- ret.fontSize = config.fontSize;
- }
+ if (config.fontSize) {
+ ret.fontSize = config.fontSize;
+ }
- if (config.fontFamily) {
- ret.fontFamily = config.fontFamily;
- }
+ if (config.fontFamily) {
+ ret.fontFamily = config.fontFamily;
+ }
- if (config.uiFontFamily) {
- ret.uiFontFamily = config.uiFontFamily;
- }
+ if (config.uiFontFamily) {
+ ret.uiFontFamily = config.uiFontFamily;
+ }
- if (config.cursorColor) {
- ret.cursorColor = config.cursorColor;
- }
+ if (config.cursorColor) {
+ ret.cursorColor = config.cursorColor;
+ }
- if (allowedCursorShapes.has(config.cursorShape)) {
- ret.cursorShape = config.cursorShape;
- }
+ if (allowedCursorShapes.has(config.cursorShape)) {
+ ret.cursorShape = config.cursorShape;
+ }
- if (allowedCursorBlinkValues.has(config.cursorBlink)) {
- ret.cursorBlink = config.cursorBlink;
- }
+ if (allowedCursorBlinkValues.has(config.cursorBlink)) {
+ ret.cursorBlink = config.cursorBlink;
+ }
- if (config.borderColor) {
- ret.borderColor = config.borderColor;
- }
+ if (config.borderColor) {
+ ret.borderColor = config.borderColor;
+ }
- if (typeof (config.padding) !== 'undefined' &&
- config.padding !== null) {
- ret.padding = config.padding;
- }
+ if (typeof config.padding !== 'undefined' && config.padding !== null) {
+ ret.padding = config.padding;
+ }
- if (config.foregroundColor) {
- ret.foregroundColor = config.foregroundColor;
- }
+ if (config.foregroundColor) {
+ ret.foregroundColor = config.foregroundColor;
+ }
- if (config.backgroundColor) {
- ret.backgroundColor = config.backgroundColor;
- }
+ if (config.backgroundColor) {
+ ret.backgroundColor = config.backgroundColor;
+ }
- if (config.css) {
- ret.css = config.css;
- }
+ if (config.css) {
+ ret.css = config.css;
+ }
- if (config.termCSS) {
- ret.termCSS = config.termCSS;
- }
+ if (config.termCSS) {
+ ret.termCSS = config.termCSS;
+ }
- if (allowedBells.has(config.bell)) {
- ret.bell = config.bell;
- }
+ if (allowedBells.has(config.bell)) {
+ ret.bell = config.bell;
+ }
- if (config.bellSoundURL) {
- ret.bellSoundURL = config.bellSoundURL || initial.bellSoundURL;
- }
+ if (config.bellSoundURL) {
+ ret.bellSoundURL = config.bellSoundURL || initial.bellSoundURL;
+ }
- if (typeof (config.copyOnSelect) !== 'undefined' &&
- config.copyOnSelect !== null) {
- ret.copyOnSelect = config.copyOnSelect;
- }
+ if (typeof config.copyOnSelect !== 'undefined' && config.copyOnSelect !== null) {
+ ret.copyOnSelect = config.copyOnSelect;
+ }
- if (config.colors) {
- if (Array.isArray(config.colors)) {
- const stateColors = Array.isArray(state.colors) ?
- state.colors :
- values(state.colors);
+ if (config.colors) {
+ if (Array.isArray(config.colors)) {
+ const stateColors = Array.isArray(state.colors) ? state.colors : values(state.colors);
- if (stateColors.toString() !== config.colors.toString()) {
+ if (stateColors.toString() !== config.colors.toString()) {
+ ret.colors = config.colors;
+ }
+ } else if (JSON.stringify(state.colors) !== JSON.stringify(config.colors)) {
ret.colors = config.colors;
}
- } else if (JSON.stringify(state.colors) !== JSON.stringify(config.colors)) {
- ret.colors = config.colors;
}
- }
- if (config.modifierKeys) {
- ret.modifierKeys = config.modifierKeys;
- }
+ if (config.modifierKeys) {
+ ret.modifierKeys = config.modifierKeys;
+ }
- if (allowedHamburgerMenuValues.has(config.showHamburgerMenu)) {
- ret.showHamburgerMenu = config.showHamburgerMenu;
- }
+ if (allowedHamburgerMenuValues.has(config.showHamburgerMenu)) {
+ ret.showHamburgerMenu = config.showHamburgerMenu;
+ }
- if (allowedWindowControlsValues.has(config.showWindowControls)) {
- ret.showWindowControls = config.showWindowControls;
- }
+ if (allowedWindowControlsValues.has(config.showWindowControls)) {
+ ret.showWindowControls = config.showWindowControls;
+ }
- if (process.platform === 'win32' &&
- (config.quickEdit === undefined || config.quickEdit === null)) {
- ret.quickEdit = true;
- } else if (typeof (config.quickEdit) !== 'undefined' &&
- config.quickEdit !== null) {
- ret.quickEdit = config.quickEdit;
- }
+ if (process.platform === 'win32' && (config.quickEdit === undefined || config.quickEdit === null)) {
+ ret.quickEdit = true;
+ } else if (typeof config.quickEdit !== 'undefined' && config.quickEdit !== null) {
+ ret.quickEdit = config.quickEdit;
+ }
- return ret;
- })());
+ return ret;
+ })()
+ );
break;
case SESSION_ADD:
- state_ = state.merge({
- activeUid: action.uid,
- openAt: {
- [action.uid]: Date.now()
- }
- }, {deep: true});
+ state_ = state.merge(
+ {
+ activeUid: action.uid,
+ openAt: {
+ [action.uid]: Date.now()
+ }
+ },
+ {deep: true}
+ );
break;
case SESSION_RESIZE:
@@ -250,15 +251,19 @@ const reducer = (state = initial, action) => {
break;
case SESSION_SET_ACTIVE:
- state_ = state.merge({
- activeUid: action.uid,
- activityMarkers: {
- [action.uid]: false
- }
- }, {deep: true});
+ state_ = state.merge(
+ {
+ activeUid: action.uid,
+ activityMarkers: {
+ [action.uid]: false
+ }
+ },
+ {deep: true}
+ );
break;
- case SESSION_PTY_DATA: // eslint-disable-line no-case-declarations
+ // eslint-disable-next-line no-case-declarations
+ case SESSION_PTY_DATA:
// ignore activity markers for current tab
if (action.uid === state.activeUid) {
break;
@@ -277,11 +282,14 @@ const reducer = (state = initial, action) => {
// expect to get data packets from the resize
// of the ptys as a result
if (!state.resizeAt || now - state.resizeAt > 1000) {
- state_ = state.merge({
- activityMarkers: {
- [action.uid]: true
- }
- }, {deep: true});
+ state_ = state.merge(
+ {
+ activityMarkers: {
+ [action.uid]: true
+ }
+ },
+ {deep: true}
+ );
}
break;
@@ -318,11 +326,14 @@ const reducer = (state = initial, action) => {
break;
case NOTIFICATION_DISMISS:
- state_ = state.merge({
- notifications: {
- [action.id]: false
- }
- }, {deep: true});
+ state_ = state.merge(
+ {
+ notifications: {
+ [action.id]: false
+ }
+ },
+ {deep: true}
+ );
break;
case NOTIFICATION_MESSAGE:
@@ -343,15 +354,17 @@ const reducer = (state = initial, action) => {
// Show a notification if any of the font size values have changed
if (CONFIG_LOAD !== action.type) {
- if (state_.fontSize !== state.fontSize ||
- state_.fontSizeOverride !== state.fontSizeOverride) {
+ if (state_.fontSize !== state.fontSize || state_.fontSizeOverride !== state.fontSizeOverride) {
state_ = state_.merge({notifications: {font: true}}, {deep: true});
}
}
- if ((typeof (state.cols) !== 'undefined' && state.cols !== null) &&
- (typeof (state.rows) !== 'undefined' && state.rows !== null) &&
- (state.rows !== state_.rows || state.cols !== state_.cols)) {
+ if (
+ typeof state.cols !== 'undefined' &&
+ state.cols !== null &&
+ (typeof state.rows !== 'undefined' && state.rows !== null) &&
+ (state.rows !== state_.rows || state.cols !== state_.cols)
+ ) {
state_ = state_.merge({notifications: {resize: true}}, {deep: true});
}
diff --git a/lib/selectors.js b/lib/selectors.js
index 54441fd7..bcfbaeb5 100644
--- a/lib/selectors.js
+++ b/lib/selectors.js
@@ -1,9 +1,8 @@
import {createSelector} from 'reselect';
const getTermGroups = ({termGroups}) => termGroups.termGroups;
-const getRootGroups = createSelector(
- getTermGroups,
- termGroups => Object.keys(termGroups)
+const getRootGroups = createSelector(getTermGroups, termGroups =>
+ Object.keys(termGroups)
.map(uid => termGroups[uid])
.filter(({parentUid}) => !parentUid)
);
diff --git a/lib/store/configure-store.dev.js b/lib/store/configure-store.dev.js
index b95e68dd..f87e071f 100644
--- a/lib/store/configure-store.dev.js
+++ b/lib/store/configure-store.dev.js
@@ -13,19 +13,9 @@ export default () => {
});
const enhancer = compose(
- applyMiddleware(
- thunk,
- plugins.middleware,
- thunk,
- effects,
- writeMiddleware,
- logger
- ),
+ applyMiddleware(thunk, plugins.middleware, thunk, effects, writeMiddleware, logger),
window.devToolsExtension()
);
- return createStore(
- rootReducer,
- enhancer
- );
+ return createStore(rootReducer, enhancer);
};
diff --git a/lib/store/configure-store.prod.js b/lib/store/configure-store.prod.js
index fe8acd4a..52ca0b04 100644
--- a/lib/store/configure-store.prod.js
+++ b/lib/store/configure-store.prod.js
@@ -6,13 +6,4 @@ import * as plugins from '../utils/plugins';
import writeMiddleware from './write-middleware';
export default () =>
- createStore(
- rootReducer,
- applyMiddleware(
- thunk,
- plugins.middleware,
- thunk,
- effects,
- writeMiddleware
- )
- );
+ createStore(rootReducer, applyMiddleware(thunk, plugins.middleware, thunk, effects, writeMiddleware));
diff --git a/lib/utils/file.js b/lib/utils/file.js
index bc0b02de..702c5224 100644
--- a/lib/utils/file.js
+++ b/lib/utils/file.js
@@ -15,9 +15,5 @@ export default function isExecutable(fileStat) {
return true;
}
- return Boolean(
- (fileStat.mode & 0o0001) ||
- (fileStat.mode & 0o0010) ||
- (fileStat.mode & 0o0100)
- );
+ return Boolean(fileStat.mode & 0o0001 || fileStat.mode & 0o0010 || fileStat.mode & 0o0100);
}
diff --git a/lib/utils/key-code.js b/lib/utils/key-code.js
index 1e1cc186..41accc8b 100644
--- a/lib/utils/key-code.js
+++ b/lib/utils/key-code.js
@@ -17,7 +17,7 @@ const _toAscii = {
173: '45',
187: '61', // IE Key codes
186: '59', // IE Key codes
- 189: '45' // IE Key codes
+ 189: '45' // IE Key codes
};
const _shiftUps = {
@@ -38,7 +38,7 @@ const _shiftUps = {
93: '}',
92: '|',
59: ':',
- 39: '\'',
+ 39: "'",
44: '<',
46: '>',
47: '?'
diff --git a/lib/utils/notify.js b/lib/utils/notify.js
index 252f483c..4fcf9109 100644
--- a/lib/utils/notify.js
+++ b/lib/utils/notify.js
@@ -1,6 +1,7 @@
/* global Notification */
/* eslint no-new:0 */
export default function notify(title, body) {
+ //eslint-disable-next-line no-console
console.log(`[Notification] ${title}: ${body}`);
new Notification(title, {body});
}
diff --git a/lib/utils/plugins.js b/lib/utils/plugins.js
index 98fc86ff..b0445c9a 100644
--- a/lib/utils/plugins.js
+++ b/lib/utils/plugins.js
@@ -10,9 +10,10 @@ import Component from '../component';
import Notification from '../components/notification';
import notify from './notify';
-const Module = require('module'); // eslint-disable-line import/newline-after-import
+//eslint-disable-next-line import/newline-after-import
+const Module = require('module');
const originalLoad = Module._load;
-Module._load = function (path) {
+Module._load = function _load(path) {
switch (path) {
case 'react':
return React;
@@ -53,10 +54,10 @@ let termGroupPropsDecorators;
let propsDecorators;
let reducersDecorators;
-// the fs locations where user plugins are stored
-const {path, localPath} = plugins.getBasePaths();
-
const clearModulesCache = () => {
+ // the fs locations where user plugins are stored
+ const {path, localPath} = plugins.getBasePaths();
+
// trigger unload hooks
modules.forEach(mod => {
if (mod.onRendererUnload) {
@@ -82,12 +83,14 @@ const getPluginVersion = path => {
try {
version = window.require(pathModule.resolve(path, 'package.json')).version;
} catch (err) {
+ //eslint-disable-next-line no-console
console.warn(`No package.json found in ${path}`);
}
return version;
};
const loadModules = () => {
+ //eslint-disable-next-line no-console
console.log('(re)loading renderer plugins');
const paths = plugins.getPaths();
@@ -120,7 +123,8 @@ const loadModules = () => {
reduceTermGroups: termGroupsReducers
};
- modules = paths.plugins.concat(paths.localPlugins)
+ modules = paths.plugins
+ .concat(paths.localPlugins)
.map(path => {
let mod;
const pluginName = getPluginName(path);
@@ -131,8 +135,12 @@ const loadModules = () => {
try {
mod = window.require(path);
} catch (err) {
+ //eslint-disable-next-line no-console
console.error(err.stack);
- notify('Plugin load error', `"${pluginName}" failed to load in the renderer process. Check Developer Tools for details.`);
+ notify(
+ 'Plugin load error',
+ `"${pluginName}" failed to load in the renderer process. Check Developer Tools for details.`
+ );
return undefined;
}
@@ -146,12 +154,14 @@ const loadModules = () => {
// mapHyperTermState mapping for backwards compatibility with hyperterm
if (mod.mapHyperTermState) {
mod.mapHyperState = mod.mapHyperTermState;
+ //eslint-disable-next-line no-console
console.error('mapHyperTermState is deprecated. Use mapHyperState instead.');
}
// mapHyperTermDispatch mapping for backwards compatibility with hyperterm
if (mod.mapHyperTermDispatch) {
mod.mapHyperDispatch = mod.mapHyperTermDispatch;
+ //eslint-disable-next-line no-console
console.error('mapHyperTermDispatch is deprecated. Use mapHyperDispatch instead.');
}
@@ -222,7 +232,7 @@ const loadModules = () => {
if (mod.onRendererWindow) {
mod.onRendererWindow(window);
}
-
+ //eslint-disable-next-line no-console
console.log(`Plugin ${pluginName} (${pluginVersion}) loaded.`);
return mod;
@@ -231,8 +241,9 @@ const loadModules = () => {
const deprecatedPlugins = plugins.getDeprecatedConfig();
Object.keys(deprecatedPlugins).forEach(name => {
- const { css } = deprecatedPlugins[name];
+ const {css} = deprecatedPlugins[name];
if (css) {
+ //eslint-disable-next-line no-console
console.warn(`Warning: "${name}" plugin uses some deprecated CSS classes (${css.join(', ')}).`);
}
});
@@ -263,6 +274,7 @@ function getProps(name, props, ...fnArgs) {
try {
ret_ = fn(...fnArgs, props_);
} catch (err) {
+ //eslint-disable-next-line no-console
console.error(err.stack);
notify('Plugin error', `${fn._pluginName}: Error occurred in \`${name}\`. Check Developer Tools for details.`);
return;
@@ -309,8 +321,12 @@ export function connect(stateFn, dispatchFn, c, d = {}) {
try {
ret_ = fn(state, ret);
} catch (err) {
+ //eslint-disable-next-line no-console
console.error(err.stack);
- notify('Plugin error', `${fn._pluginName}: Error occurred in \`map${name}State\`. Check Developer Tools for details.`);
+ notify(
+ 'Plugin error',
+ `${fn._pluginName}: Error occurred in \`map${name}State\`. Check Developer Tools for details.`
+ );
return;
}
@@ -331,13 +347,20 @@ export function connect(stateFn, dispatchFn, c, d = {}) {
try {
ret_ = fn(dispatch, ret);
} catch (err) {
+ //eslint-disable-next-line no-console
console.error(err.stack);
- notify('Plugin error', `${fn._pluginName}: Error occurred in \`map${name}Dispatch\`. Check Developer Tools for details.`);
+ notify(
+ 'Plugin error',
+ `${fn._pluginName}: Error occurred in \`map${name}Dispatch\`. Check Developer Tools for details.`
+ );
return;
}
if (!ret_ || typeof ret_ !== 'object') {
- notify('Plugin error', `${fn._pluginName}: Invalid return value of \`map${name}Dispatch\` (object expected).`);
+ notify(
+ 'Plugin error',
+ `${fn._pluginName}: Invalid return value of \`map${name}Dispatch\` (object expected).`
+ );
return;
}
@@ -362,6 +385,7 @@ function decorateReducer(name, fn) {
try {
state__ = pluginReducer(state_, action);
} catch (err) {
+ //eslint-disable-next-line no-console
console.error(err.stack);
notify('Plugin error', `${fn._pluginName}: Error occurred in \`${name}\`. Check Developer Tools for details.`);
return;
@@ -393,26 +417,25 @@ export function decorateSessionsReducer(fn) {
// redux middleware generator
export const middleware = store => next => action => {
- const nextMiddleware = remaining => action => remaining.length ?
- remaining[0](store)(nextMiddleware(remaining.slice(1)))(action) :
- next(action);
+ const nextMiddleware = remaining => action_ =>
+ remaining.length ? remaining[0](store)(nextMiddleware(remaining.slice(1)))(action_) : next(action_);
nextMiddleware(middlewares)(action);
};
// expose decorated component instance to the higher-order components
-function exposeDecorated(Component) {
- return class extends React.Component {
+function exposeDecorated(Component_) {
+ return class DecoratedComponent extends React.Component {
constructor(props, context) {
super(props, context);
this.onRef = this.onRef.bind(this);
}
- onRef(decorated) {
+ onRef(decorated_) {
if (this.props.onDecorated) {
- this.props.onDecorated(decorated);
+ this.props.onDecorated(decorated_);
}
}
render() {
- return React.createElement(Component, Object.assign({}, this.props, {ref: this.onRef}));
+ return React.createElement(Component_, Object.assign({}, this.props, {ref: this.onRef}));
}
};
}
@@ -433,13 +456,20 @@ function getDecorated(parent, name) {
class__ = fn(class_, {React, Component, Notification, notify});
class__.displayName = `${fn._pluginName}(${name})`;
} catch (err) {
+ //eslint-disable-next-line no-console
console.error(err.stack);
- notify('Plugin error', `${fn._pluginName}: Error occurred in \`${method}\`. Check Developer Tools for details`);
+ notify(
+ 'Plugin error',
+ `${fn._pluginName}: Error occurred in \`${method}\`. Check Developer Tools for details`
+ );
return;
}
if (!class__ || typeof class__.prototype.render !== 'function') {
- notify('Plugin error', `${fn._pluginName}: Invalid return value of \`${method}\`. No \`render\` method found. Please return a \`React.Component\`.`);
+ notify(
+ 'Plugin error',
+ `${fn._pluginName}: Invalid return value of \`${method}\`. No \`render\` method found. Please return a \`React.Component\`.`
+ );
return;
}
@@ -456,10 +486,10 @@ function getDecorated(parent, name) {
// for each component, we return a higher-order component
// that wraps with the higher-order components
// exposed by plugins
-export function decorate(Component, name) {
- return class extends React.Component {
+export function decorate(Component_, name) {
+ return class DecoratedCompenent extends React.Component {
render() {
- const Sub = getDecorated(Component, name);
+ const Sub = getDecorated(Component_, name);
return React.createElement(Sub, this.props);
}
};
diff --git a/lib/utils/rpc.js b/lib/utils/rpc.js
index 8689ead1..3fdfe4ab 100644
--- a/lib/utils/rpc.js
+++ b/lib/utils/rpc.js
@@ -1,5 +1,4 @@
export default class Client {
-
constructor() {
const electron = window.require('electron');
const EventEmitter = window.require('events');
@@ -56,5 +55,4 @@ export default class Client {
this.removeAllListeners();
this.ipc.removeAllListeners();
}
-
}
diff --git a/lib/utils/selection.js b/lib/utils/selection.js
index ddb15411..35c5a560 100644
--- a/lib/utils/selection.js
+++ b/lib/utils/selection.js
@@ -1,11 +1,11 @@
// Clear selection range of current selected term view
// Fix event when terminal text is selected and keyboard action is invoked
-exports.clear = function (terminal) {
+exports.clear = terminal => {
terminal.document_.getSelection().removeAllRanges();
};
// Use selection extend upon dblclick
-exports.extend = function (terminal) {
+exports.extend = terminal => {
const sel = terminal.document_.getSelection();
// Test if focusNode exist and nodeName is #text
@@ -19,7 +19,7 @@ exports.extend = function (terminal) {
// Fix a bug in ScrollPort selectAll behavior
// Select all rows in the viewport
-exports.all = function (terminal) {
+exports.all = terminal => {
const scrollPort = terminal.scrollPort_;
let firstRow;
let lastRow;
diff --git a/lib/utils/url-command.js b/lib/utils/url-command.js
index 239648ee..2492783c 100644
--- a/lib/utils/url-command.js
+++ b/lib/utils/url-command.js
@@ -2,7 +2,7 @@ import path from 'path';
import * as regex from './url-regex';
export default function isUrlCommand(shell, data) {
- const matcher = regex[path.parse(shell).name]; // eslint-disable-line import/namespace
+ const matcher = regex[path.parse(shell).name];
if (undefined === matcher || !data) {
return null;
}
diff --git a/package.json b/package.json
index 7863fcf6..8d241fbc 100644
--- a/package.json
+++ b/package.json
@@ -17,11 +17,13 @@
},
"eslintConfig": {
"plugins": [
- "react"
+ "react",
+ "prettier"
],
"extends": [
"eslint:recommended",
- "plugin:react/recommended"
+ "plugin:react/recommended",
+ "prettier"
],
"parserOptions": {
"ecmaVersion": 8,
@@ -49,7 +51,21 @@
"react/react-in-jsx-scope": 0,
"react/no-unescaped-entities": 0,
"react/jsx-no-target-blank": 0,
- "react/no-string-refs": 0
+ "react/no-string-refs": 0,
+ "prettier/prettier": [
+ "error",
+ {
+ "printWidth": 120,
+ "tabWidth": 2,
+ "singleQuote": true,
+ "trailingComma": "none",
+ "bracketSpacing": false,
+ "semi": true,
+ "useTabs": false,
+ "parser": "babylon",
+ "jsxBracketSameLine": false
+ }
+ ]
}
},
"babel": {
@@ -88,7 +104,7 @@
"appId": "co.zeit.hyper",
"extraResources": "./bin/yarn-standalone.js",
"linux": {
- "category": "TerminalEmulator",
+ "category": "TerminalEmulator",
"target": [
{
"target": "deb",
@@ -162,9 +178,12 @@
"electron-devtools-installer": "2.2.0",
"electron-rebuild": "1.6.0",
"eslint": "3.19.0",
+ "eslint-config-prettier": "2.4.0",
+ "eslint-plugin-prettier": "2.2.0",
"eslint-plugin-react": "7.3.0",
"husky": "0.14.3",
"node-gyp": "3.6.2",
+ "prettier": "1.6.1",
"redux-logger": "3.0.6",
"spectron": "3.7.2",
"style-loader": "0.18.2",
diff --git a/test/unit/to-electron-background-color.test.js b/test/unit/to-electron-background-color.test.js
index a7fe69b9..181943d5 100644
--- a/test/unit/to-electron-background-color.test.js
+++ b/test/unit/to-electron-background-color.test.js
@@ -14,39 +14,15 @@ test(`returns a color that's in hex`, t => {
const hslaColor = 'hsl(15, 100%, 50%, 1)';
const colorKeyword = 'pink';
- t.true(
- isHexColor(
- toElectronBackgroundColor(hexColor)
- )
- );
+ t.true(isHexColor(toElectronBackgroundColor(hexColor)));
- t.true(
- isHexColor(
- toElectronBackgroundColor(rgbColor)
- )
- );
+ t.true(isHexColor(toElectronBackgroundColor(rgbColor)));
- t.true(
- isHexColor(
- toElectronBackgroundColor(rgbaColor)
- )
- );
+ t.true(isHexColor(toElectronBackgroundColor(rgbaColor)));
- t.true(
- isHexColor(
- toElectronBackgroundColor(hslColor)
- )
- );
+ t.true(isHexColor(toElectronBackgroundColor(hslColor)));
- t.true(
- isHexColor(
- toElectronBackgroundColor(hslaColor)
- )
- );
+ t.true(isHexColor(toElectronBackgroundColor(hslaColor)));
- t.true(
- isHexColor(
- toElectronBackgroundColor(colorKeyword)
- )
- );
+ t.true(isHexColor(toElectronBackgroundColor(colorKeyword)));
});
diff --git a/webpack.config.js b/webpack.config.js
index 7b12fd9c..16e963ce 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -36,7 +36,7 @@ module.exports = {
},
plugins: [
new webpack.DefinePlugin({
- 'process.env': { // eslint-disable-line quote-props
+ 'process.env': {
NODE_ENV: JSON.stringify(nodeEnv)
}
}),
diff --git a/yarn.lock b/yarn.lock
index b15c0ad4..44ca9cd3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2385,6 +2385,19 @@ escope@^3.6.0:
esrecurse "^4.1.0"
estraverse "^4.1.1"
+eslint-config-prettier@2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-2.4.0.tgz#fb7cf29c0ab2ba61af5164fb1930f9bef3be2872"
+ dependencies:
+ get-stdin "^5.0.1"
+
+eslint-plugin-prettier@2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.2.0.tgz#f2837ad063903d73c621e7188fb3d41486434088"
+ dependencies:
+ fast-diff "^1.1.1"
+ jest-docblock "^20.0.1"
+
eslint-plugin-react@7.3.0:
version "7.3.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.3.0.tgz#ca9368da36f733fbdc05718ae4e91f778f38e344"
@@ -2835,6 +2848,10 @@ get-stdin@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+get-stdin@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
+
get-stream@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -3483,6 +3500,10 @@ isstream@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+jest-docblock@^20.0.1:
+ version "20.0.3"
+ resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712"
+
js-base64@^2.1.9:
version "2.2.0"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.2.0.tgz#5e8a8d193a908198dd23d1704826d207b0e5a8f6"
@@ -4739,6 +4760,10 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+prettier@1.6.1:
+ version "1.6.1"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.6.1.tgz#850f411a3116226193e32ea5acfc21c0f9a76d7d"
+
pretty-bytes@^1.0.2:
version "1.0.4"
resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84"