diff options
Diffstat (limited to 'app/assets/javascripts/ide/lib')
-rw-r--r-- | app/assets/javascripts/ide/lib/common/model.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ide/lib/create_diff.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ide/lib/diff/controller.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ide/lib/editor.js | 12 | ||||
-rw-r--r-- | app/assets/javascripts/ide/lib/errors.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ide/lib/languages/index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ide/lib/mirror.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ide/lib/themes/index.js | 6 |
8 files changed, 18 insertions, 18 deletions
diff --git a/app/assets/javascripts/ide/lib/common/model.js b/app/assets/javascripts/ide/lib/common/model.js index 4969875439e..46128651547 100644 --- a/app/assets/javascripts/ide/lib/common/model.js +++ b/app/assets/javascripts/ide/lib/common/model.js @@ -1,9 +1,9 @@ import { editor as monacoEditor, Uri } from 'monaco-editor'; -import Disposable from './disposable'; +import { insertFinalNewline } from '~/lib/utils/text_utility'; import eventHub from '../../eventhub'; import { trimTrailingWhitespace } from '../../utils'; -import { insertFinalNewline } from '~/lib/utils/text_utility'; import { defaultModelOptions } from '../editor_options'; +import Disposable from './disposable'; export default class Model { constructor(file, head = null) { diff --git a/app/assets/javascripts/ide/lib/create_diff.js b/app/assets/javascripts/ide/lib/create_diff.js index 51d4967fb23..17779b6314e 100644 --- a/app/assets/javascripts/ide/lib/create_diff.js +++ b/app/assets/javascripts/ide/lib/create_diff.js @@ -1,5 +1,5 @@ -import { commitActionForFile } from '~/ide/stores/utils'; import { commitActionTypes } from '~/ide/constants'; +import { commitActionForFile } from '~/ide/stores/utils'; import createFileDiff from './create_file_diff'; const getDeletedParents = (entries, file) => { diff --git a/app/assets/javascripts/ide/lib/diff/controller.js b/app/assets/javascripts/ide/lib/diff/controller.js index 3efe692be13..1d051062637 100644 --- a/app/assets/javascripts/ide/lib/diff/controller.js +++ b/app/assets/javascripts/ide/lib/diff/controller.js @@ -1,7 +1,7 @@ -import { Range } from 'monaco-editor'; import { throttle } from 'lodash'; -import DirtyDiffWorker from './diff_worker'; +import { Range } from 'monaco-editor'; import Disposable from '../common/disposable'; +import DirtyDiffWorker from './diff_worker'; export const getDiffChangeType = (change) => { if (change.modified) { diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js index 4fad0c09ce7..80191f635a3 100644 --- a/app/assets/javascripts/ide/lib/editor.js +++ b/app/assets/javascripts/ide/lib/editor.js @@ -1,15 +1,15 @@ import { debounce } from 'lodash'; import { editor as monacoEditor, KeyCode, KeyMod, Range } from 'monaco-editor'; -import DecorationsController from './decorations/controller'; -import DirtyDiffController from './diff/controller'; +import { clearDomElement } from '~/editor/utils'; +import { registerLanguages } from '../utils'; import Disposable from './common/disposable'; import ModelManager from './common/model_manager'; +import DecorationsController from './decorations/controller'; +import DirtyDiffController from './diff/controller'; import { editorOptions, defaultEditorOptions, defaultDiffEditorOptions } from './editor_options'; -import { themes } from './themes'; -import languages from './languages'; import keymap from './keymap.json'; -import { clearDomElement } from '~/editor/utils'; -import { registerLanguages } from '../utils'; +import languages from './languages'; +import { themes } from './themes'; function setupThemes() { themes.forEach((theme) => { diff --git a/app/assets/javascripts/ide/lib/errors.js b/app/assets/javascripts/ide/lib/errors.js index f975034a872..a8a048e588f 100644 --- a/app/assets/javascripts/ide/lib/errors.js +++ b/app/assets/javascripts/ide/lib/errors.js @@ -1,6 +1,6 @@ import { escape } from 'lodash'; import { __ } from '~/locale'; -import consts from '../stores/modules/commit/constants'; +import { COMMIT_TO_NEW_BRANCH } from '../stores/modules/commit/constants'; const CODEOWNERS_REGEX = /Push.*protected branches.*CODEOWNERS/; const BRANCH_CHANGED_REGEX = /changed.*since.*start.*edit/; @@ -8,7 +8,7 @@ const BRANCH_ALREADY_EXISTS = /branch.*already.*exists/; const createNewBranchAndCommit = (store) => store - .dispatch('commit/updateCommitAction', consts.COMMIT_TO_NEW_BRANCH) + .dispatch('commit/updateCommitAction', COMMIT_TO_NEW_BRANCH) .then(() => store.dispatch('commit/commitChanges')); export const createUnexpectedCommitError = (message) => ({ diff --git a/app/assets/javascripts/ide/lib/languages/index.js b/app/assets/javascripts/ide/lib/languages/index.js index 580ad820bf9..f758cb7dd86 100644 --- a/app/assets/javascripts/ide/lib/languages/index.js +++ b/app/assets/javascripts/ide/lib/languages/index.js @@ -1,5 +1,5 @@ -import vue from './vue'; import hcl from './hcl'; +import vue from './vue'; const languages = [vue, hcl]; diff --git a/app/assets/javascripts/ide/lib/mirror.js b/app/assets/javascripts/ide/lib/mirror.js index 6f9cfec9465..78990953beb 100644 --- a/app/assets/javascripts/ide/lib/mirror.js +++ b/app/assets/javascripts/ide/lib/mirror.js @@ -1,6 +1,6 @@ -import createDiff from './create_diff'; import { getWebSocketUrl, mergeUrlParams } from '~/lib/utils/url_utility'; import { __ } from '~/locale'; +import createDiff from './create_diff'; export const SERVICE_NAME = 'webide-file-sync'; export const PROTOCOL = 'webfilesync.gitlab.com'; diff --git a/app/assets/javascripts/ide/lib/themes/index.js b/app/assets/javascripts/ide/lib/themes/index.js index bb5be50576c..6a3feb9cab6 100644 --- a/app/assets/javascripts/ide/lib/themes/index.js +++ b/app/assets/javascripts/ide/lib/themes/index.js @@ -1,9 +1,9 @@ -import white from './white'; import dark from './dark'; import monokai from './monokai'; -import solarizedLight from './solarized_light'; -import solarizedDark from './solarized_dark'; import none from './none'; +import solarizedDark from './solarized_dark'; +import solarizedLight from './solarized_light'; +import white from './white'; export const themes = [ { |