Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Move Atom API bridge components to lib/atom #1426

Merged
merged 1 commit into from Apr 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/containers/issueish-pane-item-container.js
Expand Up @@ -7,7 +7,7 @@ import {autobind} from 'core-decorators';
import IssueTimelineContainer from './issue-timeline-container';
import PrTimelineContainer from './pr-timeline-container';
import PrStatusesContainer from './pr-statuses-container';
import Octicon from '../views/octicon';
import Octicon from '../atom/octicon';
import IssueishBadge from '../views/issueish-badge';
import GithubDotcomMarkdown from '../views/github-dotcom-markdown';
import PeriodicRefresher from '../periodic-refresher';
Expand Down
2 changes: 1 addition & 1 deletion lib/containers/issueish-tooltip-container.js
Expand Up @@ -3,7 +3,7 @@ import {createFragmentContainer, graphql} from 'react-relay';
import PropTypes from 'prop-types';
import cx from 'classnames';

import Octicon from '../views/octicon';
import Octicon from '../atom/octicon';

const typeAndStateToIcon = {
Issue: {
Expand Down
2 changes: 1 addition & 1 deletion lib/containers/pr-info-container.js
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import cx from 'classnames';
import {autobind} from 'core-decorators';

import Octicon from '../views/octicon';
import Octicon from '../atom/octicon';
import IssueishBadge from '../views/issueish-badge';
import PeriodicRefresher from '../periodic-refresher';
import tinycolor from 'tinycolor2';
Expand Down
2 changes: 1 addition & 1 deletion lib/containers/pr-selection-by-branch-container.js
Expand Up @@ -5,7 +5,7 @@ import {autobind} from 'core-decorators';

import PrInfoContainer from './pr-info-container';
import PrUrlInputBox from '../views/pr-url-input-box';
import Octicon from '../views/octicon';
import Octicon from '../atom/octicon';
import {RemotePropType, BranchSetPropType} from '../prop-types';

export class PrSelectionByBranch extends React.Component {
Expand Down
2 changes: 1 addition & 1 deletion lib/containers/pr-status-context-container.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {createFragmentContainer, graphql} from 'react-relay';
import PropTypes from 'prop-types';

import Octicon from '../views/octicon';
import Octicon from '../atom/octicon';
import {stateToIconAndStyle} from './pr-statuses-container';

export class PrStatusContext extends React.Component {
Expand Down
2 changes: 1 addition & 1 deletion lib/containers/pr-statuses-container.js
Expand Up @@ -5,7 +5,7 @@ import {autobind} from 'core-decorators';

import {toSentence} from '../helpers';
import PrStatusContextContainer from './pr-status-context-container';
import Octicon from '../views/octicon';
import Octicon from '../atom/octicon';
import DonutChart from '../views/donut-chart';
import PeriodicRefresher from '../periodic-refresher';
import {RelayConnectionPropType} from '../prop-types';
Expand Down
2 changes: 1 addition & 1 deletion lib/containers/timeline-items/commit-comment-container.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {graphql, createFragmentContainer} from 'react-relay';
import PropTypes from 'prop-types';

import Octicon from '../../views/octicon';
import Octicon from '../../atom/octicon';
import Timeago from '../../views/timeago';
import GithubDotcomMarkdown from '../../views/github-dotcom-markdown';

Expand Down
2 changes: 1 addition & 1 deletion lib/containers/timeline-items/commit-container.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {graphql, createFragmentContainer} from 'react-relay';
import PropTypes from 'prop-types';

import Octicon from '../../views/octicon';
import Octicon from '../../atom/octicon';

export class Commit extends React.Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion lib/containers/timeline-items/commits-container.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {graphql, createFragmentContainer} from 'react-relay';
import PropTypes from 'prop-types';

import Octicon from '../../views/octicon';
import Octicon from '../../atom/octicon';
import CommitContainer from './commit-container';

export class Commits extends React.Component {
Expand Down
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {graphql, createFragmentContainer} from 'react-relay';
import PropTypes from 'prop-types';

import Octicon from '../../views/octicon';
import Octicon from '../../atom/octicon';
import IssueishBadge from '../../views/issueish-badge';
import IssueishLink from '../../views/issueish-link';

Expand Down
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {graphql, createFragmentContainer} from 'react-relay';
import PropTypes from 'prop-types';

import Octicon from '../../views/octicon';
import Octicon from '../../atom/octicon';
import Timeago from '../../views/timeago';
import CrossReferencedEventContainer from './cross-referenced-event-container';

Expand Down
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {graphql, createFragmentContainer} from 'react-relay';
import PropTypes from 'prop-types';

import Octicon from '../../views/octicon';
import Octicon from '../../atom/octicon';
import Timeago from '../../views/timeago';

export class HeadRefForcePushedEvent extends React.Component {
Expand Down
2 changes: 1 addition & 1 deletion lib/containers/timeline-items/issue-comment-container.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {graphql, createFragmentContainer} from 'react-relay';
import PropTypes from 'prop-types';

import Octicon from '../../views/octicon';
import Octicon from '../../atom/octicon';
import Timeago from '../../views/timeago';
import GithubDotcomMarkdown from '../../views/github-dotcom-markdown';

Expand Down
2 changes: 1 addition & 1 deletion lib/containers/timeline-items/merged-event-container.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {graphql, createFragmentContainer} from 'react-relay';
import PropTypes from 'prop-types';

import Octicon from '../../views/octicon';
import Octicon from '../../atom/octicon';
import Timeago from '../../views/timeago';

export class MergedEvent extends React.Component {
Expand Down
2 changes: 1 addition & 1 deletion lib/containers/user-mention-tooltip-container.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {graphql, createFragmentContainer} from 'react-relay';
import PropTypes from 'prop-types';

import Octicon from '../views/octicon';
import Octicon from '../atom/octicon';

class UserMentionTooltip extends React.Component {
static propTypes = {
Expand Down
4 changes: 2 additions & 2 deletions lib/controllers/conflict-controller.js
Expand Up @@ -5,8 +5,8 @@ const {Menu, MenuItem} = remote;

import {autobind} from 'core-decorators';
import {OURS, BASE, THEIRS} from '../models/conflicts/source';
import Decoration from '../views/decoration';
import Octicon from '../views/octicon';
import Decoration from '../atom/decoration';
import Octicon from '../atom/octicon';

export default class ConflictController extends React.Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion lib/controllers/editor-conflict-controller.js
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import {autobind} from 'core-decorators';
import compareSets from 'compare-sets';

import Commands, {Command} from '../views/commands';
import Commands, {Command} from '../atom/commands';
import Conflict from '../models/conflicts/conflict';
import ConflictController from './conflict-controller';
import {OURS, THEIRS, BASE} from '../models/conflicts/source';
Expand Down
8 changes: 4 additions & 4 deletions lib/controllers/root-controller.js
Expand Up @@ -6,15 +6,15 @@ import PropTypes from 'prop-types';
import {autobind} from 'core-decorators';
import {CompositeDisposable} from 'event-kit';

import StatusBar from '../views/status-bar';
import Panel from '../views/panel';
import StatusBar from '../atom/status-bar';
import Panel from '../atom/panel';
import PaneItem from '../atom/pane-item';
import DockItem from '../views/dock-item';
import DockItem from '../atom/dock-item';
import CloneDialog from '../views/clone-dialog';
import OpenIssueishDialog from '../views/open-issueish-dialog';
import InitDialog from '../views/init-dialog';
import CredentialDialog from '../views/credential-dialog';
import Commands, {Command} from '../views/commands';
import Commands, {Command} from '../atom/commands';
import GitTimingsView from '../views/git-timings-view';
import GithubTabController from './github-tab-controller';
import FilePatchController from './file-patch-controller';
Expand Down
4 changes: 2 additions & 2 deletions lib/controllers/status-bar-tile-controller.js
Expand Up @@ -5,8 +5,8 @@ import BranchView from '../views/branch-view';
import BranchMenuView from '../views/branch-menu-view';
import PushPullView from '../views/push-pull-view';
import ChangedFilesCountView from '../views/changed-files-count-view';
import Tooltip from '../views/tooltip';
import Commands, {Command} from '../views/commands';
import Tooltip from '../atom/tooltip';
import Commands, {Command} from '../atom/commands';
import ObserveModel from '../views/observe-model';
import RefHolder from '../models/ref-holder';
import yubikiri from 'yubikiri';
Expand Down
2 changes: 1 addition & 1 deletion lib/views/branch-menu-view.js
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import {autobind} from 'core-decorators';
import cx from 'classnames';

import Commands, {Command} from './commands';
import Commands, {Command} from '../atom/commands';
import {BranchPropType, BranchSetPropType} from '../prop-types';
import {GitError} from '../git-shell-out-strategy';

Expand Down
2 changes: 1 addition & 1 deletion lib/views/changed-files-count-view.js
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import Octicon from './octicon';
import Octicon from '../atom/octicon';

export default class ChangedFilesCountView extends React.Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion lib/views/clone-dialog.js
Expand Up @@ -5,7 +5,7 @@ import {CompositeDisposable} from 'event-kit';
import url from 'url';
import path from 'path';

import Commands, {Command} from './commands';
import Commands, {Command} from '../atom/commands';

export default class CloneDialog extends React.Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion lib/views/co-author-form.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import {autobind} from 'core-decorators';

import Commands, {Command} from './commands';
import Commands, {Command} from '../atom/commands';

export default class CoAuthorForm extends React.Component {
static propTypes = {
Expand Down
4 changes: 2 additions & 2 deletions lib/views/commit-view.js
Expand Up @@ -6,8 +6,8 @@ import cx from 'classnames';
import Select from 'react-select';
import CoAuthorForm from './co-author-form';

import Tooltip from './tooltip';
import AtomTextEditor from './atom-text-editor';
import Tooltip from '../atom/tooltip';
import AtomTextEditor from '../atom/atom-text-editor';
import RefHolder from '../models/ref-holder';
import {LINE_ENDING_REGEX} from '../helpers';
import {AuthorPropType} from '../prop-types';
Expand Down
2 changes: 1 addition & 1 deletion lib/views/credential-dialog.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import {autobind} from 'core-decorators';

import Commands, {Command} from './commands';
import Commands, {Command} from '../atom/commands';

export default class CredentialDialog extends React.Component {
static propTypes = {
Expand Down
4 changes: 2 additions & 2 deletions lib/views/file-patch-view.js
Expand Up @@ -6,8 +6,8 @@ import cx from 'classnames';
import {autobind} from 'core-decorators';

import HunkView from './hunk-view';
import SimpleTooltip from './simple-tooltip';
import Commands, {Command} from './commands';
import SimpleTooltip from '../atom/simple-tooltip';
import Commands, {Command} from '../atom/commands';
import FilePatchSelection from '../models/file-patch-selection';
import Switchboard from '../switchboard';
import RefHolder from '../models/ref-holder';
Expand Down
2 changes: 1 addition & 1 deletion lib/views/git-timings-view.js
Expand Up @@ -10,7 +10,7 @@ import {autobind} from 'core-decorators';
import memoize from 'lodash.memoize';
import fs from 'fs-extra';

import Octicon from './octicon';
import Octicon from '../atom/octicon';

const genArray = memoize(function genArray(interval, count) {
const arr = [];
Expand Down
2 changes: 1 addition & 1 deletion lib/views/hunk-view.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import {autobind} from 'core-decorators';

import SimpleTooltip from './simple-tooltip';
import SimpleTooltip from '../atom/simple-tooltip';
import ContextMenuInterceptor from '../context-menu-interceptor';

export default class HunkView extends React.Component {
Expand Down
2 changes: 1 addition & 1 deletion lib/views/init-dialog.js
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import {autobind} from 'core-decorators';
import {CompositeDisposable} from 'event-kit';

import Commands, {Command} from './commands';
import Commands, {Command} from '../atom/commands';

export default class InitDialog extends React.Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion lib/views/issueish-badge.js
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';

import Octicon from './octicon';
import Octicon from '../atom/octicon';

const typeAndStateToIcon = {
Issue: {
Expand Down
2 changes: 1 addition & 1 deletion lib/views/issueish-timeline-view.js
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import {autobind} from 'core-decorators';

import {RelayConnectionPropType} from '../prop-types';
import Octicon from '../views/octicon';
import Octicon from '../atom/octicon';
import CommitsContainer from './../containers/timeline-items/commits-container.js';
import IssueCommentContainer from './../containers/timeline-items/issue-comment-container.js';
import MergedEventContainer from './../containers/timeline-items/merged-event-container.js';
Expand Down
2 changes: 1 addition & 1 deletion lib/views/open-issueish-dialog.js
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import {autobind} from 'core-decorators';
import {CompositeDisposable} from 'event-kit';

import Commands, {Command} from './commands';
import Commands, {Command} from '../atom/commands';

const ISSUEISH_URL_REGEX = /^(?:https?:\/\/)?github.com\/([^/]+)\/([^/]+)\/(?:issues|pull)\/(\d+)/;

Expand Down
2 changes: 1 addition & 1 deletion lib/views/push-pull-view.js
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import cx from 'classnames';

import {RemotePropType, BranchPropType} from '../prop-types';
import Tooltip from './tooltip';
import Tooltip from '../atom/tooltip';
import RefHolder from '../models/ref-holder';

function getIconClass(icon, animation) {
Expand Down
2 changes: 1 addition & 1 deletion lib/views/staging-view.js
Expand Up @@ -15,7 +15,7 @@ import MergeConflictListItemView from './merge-conflict-list-item-view';
import CompositeListSelection from '../models/composite-list-selection';
import ResolutionProgress from '../models/conflicts/resolution-progress';
import FilePatchController from '../controllers/file-patch-controller';
import Commands, {Command} from './commands';
import Commands, {Command} from '../atom/commands';

const debounce = (fn, wait) => {
let timeout;
Expand Down
2 changes: 1 addition & 1 deletion test/views/commands.test.js → test/atom/commands.test.js
@@ -1,7 +1,7 @@
import React from 'react';
import {mount} from 'enzyme';

import Commands, {Command} from '../../lib/views/commands';
import Commands, {Command} from '../../lib/atom/commands';
import RefHolder from '../../lib/models/ref-holder';

describe('Commands', function() {
Expand Down
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import sinon from 'sinon';
import {mount} from 'enzyme';

import Decoration from '../../lib/views/decoration';
import Decoration from '../../lib/atom/decoration';

describe('Decoration', () => {
let atomEnv, editor, marker;
Expand Down
2 changes: 1 addition & 1 deletion test/views/panel.test.js → test/atom/panel.test.js
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import {Emitter} from 'event-kit';
import {mount} from 'enzyme';

import Panel from '../../lib/views/panel';
import Panel from '../../lib/atom/panel';

class Component extends React.Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion test/controllers/conflict-controller.test.js
Expand Up @@ -5,7 +5,7 @@ import {shallow} from 'enzyme';
import Conflict from '../../lib/models/conflicts/conflict';
import {OURS, THEIRS} from '../../lib/models/conflicts/source';
import ConflictController from '../../lib/controllers/conflict-controller';
import Decoration from '../../lib/views/decoration';
import Decoration from '../../lib/atom/decoration';

describe('ConflictController', function() {
let atomEnv, workspace, app, editor, conflict, decorations;
Expand Down