<commit_before>/** @babel */
/** @jsx etch.dom */

import etch from 'etch'

export default class MergeConflictListView {
  constructor (props) {
    this.props = props
    etch.initialize(this)
  }

  didClickItem (e, index) {
    const item = this.props.items[index]
    if (e.detail === 1) {
      this.didSelectItem(item)
    } else if (e.detail === 2) {
      this.props.didConfirmItem(item)
    }
  }

  didSelectItem (item) {
    this.props.didSelectItem(item)
    return etch.update(this)
  }

  update (props) {
    this.props = props
    return etch.update(this)
  }

  render () {
    return (
      <div className='git-FilePatchListView'>
        {this.props.items.map((item, index) => {
          const status = item.getFileStatus()
          const className = this.props.selectedIndex === index ? 'is-selected' : ''
          return (
            <div className={`git-FilePatchListView-item is-${status} ${className}`} onclick={(e) => this.didClickItem(e, index)}>
              <span className={`git-FilePatchListView-icon icon icon-diff-${status} status-${status}`} />
              <span className={'git-FilePatchListView ours-theirs-info'}> {item.getOursStatus()}{item.getTheirsStatus()} </span>
              <span className='git-FilePatchListView-path'>{item.getPath()}</span>
            </div>
          )
        })}
      </div>
    )
  }

  destroy () {
    etch.destroy(this)
  }
}<commit_msg>Display ours/theirs status to the right of filename in Merge Conflict list<commit_after>/** @babel */
/** @jsx etch.dom */

import etch from 'etch'

export default class MergeConflictListView {
  constructor (props) {
    this.props = props
    etch.initialize(this)
  }

  didClickItem (e, index) {
    const item = this.props.items[index]
    if (e.detail === 1) {
      this.didSelectItem(item)
    } else if (e.detail === 2) {
      this.props.didConfirmItem(item)
    }
  }

  didSelectItem (item) {
    this.props.didSelectItem(item)
    return etch.update(this)
  }

  update (props) {
    this.props = props
    return etch.update(this)
  }

  render () {
    return (
      <div className='git-FilePatchListView'>
        {this.props.items.map((item, index) => {
          const status = item.getFileStatus()
          const className = this.props.selectedIndex === index ? 'is-selected' : ''
          return (
            <div className={`git-FilePatchListView-item is-${status} ${className}`} onclick={(e) => this.didClickItem(e, index)}>
              <span className={`git-FilePatchListView-icon icon icon-diff-${status} status-${status}`} />
              <span className='git-FilePatchListView-path'>{item.getPath()}</span>
              <span className={'git-FilePatchListView ours-theirs-info'}> {item.getOursStatus()}{item.getTheirsStatus()} </span>
            </div>
          )
        })}
      </div>
    )
  }

  destroy () {
    etch.destroy(this)
  }
}
{'fraction_non_alphanumeric': 0.154987918536417, 'fraction_numerical': 0.001380738695201933, 'mean_word_length': 2.5471236230110157, 'pattern_counts': {'":': 0, '<': 21, '<?xml version=': 0, '>': 25, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '7304283', 'n_tokens_mistral': 947, 'n_tokens_neox': 908, 'n_words': 173}