From 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Feb 2021 10:34:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-9-stable-ee --- app/assets/javascripts/ide/lib/editor.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'app/assets/javascripts/ide/lib/editor.js') 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) => { -- cgit v1.2.1