Merge pull request #1995 from atom/all/review-comments

Reviews dock item

Author: smashwilson

graphql/schema.graphql

@@ -9,6 +9,7 @@
   'alt-g p': 'github:push'
   'alt-g shift-p': 'github:force-push'
   'alt-g =': 'github:clone'
+  'alt-g r': 'github:open-reviews-tab'
 
 'atom-text-editor':
   'alt-m 1': 'github:resolve-as-ours'
@@ -132,3 +133,20 @@
   'end': 'github:co-author:end'
   'delete': 'github:co-author:delete'
   'shift-backspace': 'github:co-author-exclude'
+
+'.platform-darwin .github-Reviews':
+  'cmd-=': 'github:more-context'
+  'cmd--': 'github:less-context'
+'.platform-win32 .github-Reviews':
+  'ctrl-=': 'github:more-context'
+  'ctrl--': 'github:less-context'
+'.platform-linux .github-Reviews':
+  'ctrl-=': 'github:more-context'
+  'ctrl--': 'github:less-context'
+
+'.platform-darwin .github-Review-reply atom-text-editor':
+  'cmd-enter': 'github:submit-comment'
+'.platform-win32 .github-Review-reply atom-text-editor':
+  'ctrl-enter': 'github:submit-comment'
+'.platform-linux .github-Review-reply atom-text-editor':
+  'ctrl-enter': 'github:submit-comment'

img/mona.svg

@@ -18,7 +18,7 @@ const editorUpdateProps = {
 };
 
 const editorCreationProps = {
-  buffer: PropTypes.object, // FIXME make proptype more specific
+  buffer: PropTypes.object,
   ...editorUpdateProps,
 };
 
@@ -30,8 +30,6 @@ export default class AtomTextEditor extends React.Component {
   static propTypes = {
     ...editorCreationProps,
 
-    workspace: PropTypes.object.isRequired,
-
     didChangeCursorPosition: PropTypes.func,
     didAddSelection: PropTypes.func,
     didChangeSelectionRange: PropTypes.func,

keymaps/git.cson

@@ -44,9 +44,11 @@ class BareDecoration extends React.Component {
     this.decorationHolder = new RefHolder();
     this.editorSub = new Disposable();
     this.decorableSub = new Disposable();
+    this.gutterSub = new Disposable();
 
     this.domNode = null;
     this.item = null;
+
     if (['gutter', 'overlay', 'block'].includes(this.props.type)) {
       this.domNode = document.createElement('div');
       this.domNode.className = cx('react-atom-decoration', this.props.className);
@@ -115,6 +117,23 @@ class BareDecoration extends React.Component {
       return;
     }
 
+    // delay decoration creation when it's a gutter type;
+    // instead wait for the Gutter to be added to the editor first
+    if (this.props.type === 'gutter') {
+      if (!this.props.gutterName) {
+        throw new Error('You are trying to decorate a gutter but did not supply gutterName prop.');
+      }
+      this.props.editorHolder.map(editor => {
+        this.gutterSub = editor.observeGutters(gutter => {
+          if (gutter.name === this.props.gutterName) {
+            this.createDecoration();
+          }
+        });
+        return null;
+      });
+      return;
+    }
+
     this.createDecoration();
   }
 
@@ -126,7 +145,6 @@ class BareDecoration extends React.Component {
     const opts = this.getDecorationOpts(this.props);
     const editor = this.props.editorHolder.get();
     const decorable = this.props.decorableHolder.get();
-
     this.decorationHolder.setter(
       editor[this.props.decorateMethod](decorable, opts),
     );
@@ -136,6 +154,7 @@ class BareDecoration extends React.Component {
     this.decorationHolder.map(decoration => decoration.destroy());
     this.editorSub.dispose();
     this.decorableSub.dispose();
+    this.gutterSub.dispose();
   }
 
   getDecorationOpts(props) {
@@ -150,6 +169,7 @@ export default class Decoration extends React.Component {
   static propTypes = {
     editor: PropTypes.object,
     decorable: PropTypes.object,
+    decorateMethod: PropTypes.oneOf(['decorateMarker', 'decorateMarkerLayer']),
   }
 
   constructor(props) {
@@ -184,28 +204,30 @@ export default class Decoration extends React.Component {
   }
 
   render() {
-    if (!this.state.editorHolder.isEmpty() && !this.state.decorableHolder.isEmpty()) {
-      return (
-        <BareDecoration
-          {...this.props}
-          editorHolder={this.state.editorHolder}
-          decorableHolder={this.state.decorableHolder}
-        />
-      );
-    }
-
     return (
       <TextEditorContext.Consumer>
         {editorHolder => (
           <DecorableContext.Consumer>
-            {({holder, decorateMethod}) => (
-              <BareDecoration
-                editorHolder={editorHolder}
-                decorableHolder={holder}
-                decorateMethod={decorateMethod}
-                {...this.props}
-              />
-            )}
+            {decorable => {
+              let holder = null;
+              let decorateMethod = null;
+              if (!this.state.decorableHolder.isEmpty()) {
+                holder = this.state.decorableHolder;
+                decorateMethod = this.props.decorateMethod;
+              } else {
+                holder = decorable.holder;
+                decorateMethod = decorable.decorateMethod;
+              }
+
+              return (
+                <BareDecoration
+                  editorHolder={editorHolder || this.state.editorHolder}
+                  decorableHolder={holder}
+                  decorateMethod={decorateMethod}
+                  {...this.props}
+                />
+              );
+            }}
           </DecorableContext.Consumer>
         )}
       </TextEditorContext.Consumer>

lib/atom/atom-text-editor.js

@@ -13,6 +13,7 @@ const MarkablePropType = PropTypes.shape({
 });
 
 const markerProps = {
+  exclusive: PropTypes.bool,
   reversed: PropTypes.bool,
   invalidate: PropTypes.oneOf(['never', 'surround', 'overlap', 'inside', 'touch']),
 };

lib/atom/decoration.js

@@ -173,6 +173,7 @@ class OpenItem {
     this.domNode.tabIndex = '-1';
     this.domNode.onfocus = this.onFocus.bind(this);
     this.stubItem = stub;
+    this.stubProps = stub ? stub.props : {};
     this.match = match;
     this.itemHolder = new RefHolder();
   }
@@ -202,15 +203,15 @@ class OpenItem {
   }
 
   getStubProps() {
-    if (!this.itemHolder.isEmpty()) {
-      const item = this.itemHolder.get();
-      return {
-        title: item.getTitle ? item.getTitle() : null,
-        iconName: item.getIconName ? item.getIconName() : null,
-      };
-    } else {
-      return {};
-    }
+    const itemProps = this.itemHolder.map(item => ({
+      title: item.getTitle ? item.getTitle() : null,
+      iconName: item.getIconName ? item.getIconName() : null,
+    }));
+
+    return {
+      ...this.stubProps,
+      ...itemProps,
+    };
   }
 
   onFocus() {
@@ -220,6 +221,7 @@ class OpenItem {
   renderPortal(renderProp) {
     return ReactDOM.createPortal(
       renderProp({
+        deserialized: this.stubProps,
         itemHolder: this.itemHolder,
         params: this.match.getParams(),
         uri: this.match.getURI(),

lib/atom/marker.js

@@ -36,6 +36,7 @@ export default class Tooltip extends React.Component {
     keyBindingTarget: PropTypes.element,
     children: PropTypes.element,
     itemHolder: RefHolderPropType,
+    tooltipHolder: RefHolderPropType,
   }
 
   static defaultProps = {
@@ -126,6 +127,10 @@ export default class Tooltip extends React.Component {
     this.refSub = this.props.target.observe(t => {
       this.tipSub.dispose();
       this.tipSub = this.props.manager.add(t, options);
+      const h = this.props.tooltipHolder;
+      if (h) {
+        h.setter(this.tipSub);
+      }
     });
   }
 }