diff options
Diffstat (limited to 'app/assets/javascripts/editor')
-rw-r--r-- | app/assets/javascripts/editor/constants.js | 7 | ||||
-rw-r--r-- | app/assets/javascripts/editor/extensions/editor_file_template_ext.js | 8 | ||||
-rw-r--r-- | app/assets/javascripts/editor/extensions/source_editor_ci_schema_ext.js (renamed from app/assets/javascripts/editor/extensions/editor_ci_schema_ext.js) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/editor/extensions/source_editor_extension_base.js (renamed from app/assets/javascripts/editor/extensions/editor_lite_extension_base.js) | 10 | ||||
-rw-r--r-- | app/assets/javascripts/editor/extensions/source_editor_file_template_ext.js | 8 | ||||
-rw-r--r-- | app/assets/javascripts/editor/extensions/source_editor_markdown_ext.js (renamed from app/assets/javascripts/editor/extensions/editor_markdown_ext.js) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/editor/extensions/source_editor_webide_ext.js (renamed from app/assets/javascripts/editor/extensions/editor_lite_webide_ext.js) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/editor/source_editor.js (renamed from app/assets/javascripts/editor/editor_lite.js) | 42 |
8 files changed, 44 insertions, 43 deletions
diff --git a/app/assets/javascripts/editor/constants.js b/app/assets/javascripts/editor/constants.js index c991316dda2..849ff91841a 100644 --- a/app/assets/javascripts/editor/constants.js +++ b/app/assets/javascripts/editor/constants.js @@ -1,14 +1,15 @@ +import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants'; import { __ } from '~/locale'; -export const EDITOR_LITE_INSTANCE_ERROR_NO_EL = __( +export const SOURCE_EDITOR_INSTANCE_ERROR_NO_EL = __( '"el" parameter is required for createInstance()', ); export const URI_PREFIX = 'gitlab'; -export const CONTENT_UPDATE_DEBOUNCE = 250; +export const CONTENT_UPDATE_DEBOUNCE = DEFAULT_DEBOUNCE_AND_THROTTLE_MS; export const ERROR_INSTANCE_REQUIRED_FOR_EXTENSION = __( - 'Editor Lite instance is required to set up an extension.', + 'Source Editor instance is required to set up an extension.', ); export const EDITOR_READY_EVENT = 'editor-ready'; diff --git a/app/assets/javascripts/editor/extensions/editor_file_template_ext.js b/app/assets/javascripts/editor/extensions/editor_file_template_ext.js deleted file mode 100644 index f5474318447..00000000000 --- a/app/assets/javascripts/editor/extensions/editor_file_template_ext.js +++ /dev/null @@ -1,8 +0,0 @@ -import { Position } from 'monaco-editor'; -import { EditorLiteExtension } from './editor_lite_extension_base'; - -export class FileTemplateExtension extends EditorLiteExtension { - navigateFileStart() { - this.setPosition(new Position(1, 1)); - } -} diff --git a/app/assets/javascripts/editor/extensions/editor_ci_schema_ext.js b/app/assets/javascripts/editor/extensions/source_editor_ci_schema_ext.js index c5ee61ec86e..410aaed86a7 100644 --- a/app/assets/javascripts/editor/extensions/editor_ci_schema_ext.js +++ b/app/assets/javascripts/editor/extensions/source_editor_ci_schema_ext.js @@ -1,9 +1,9 @@ import Api from '~/api'; import { registerSchema } from '~/ide/utils'; import { EXTENSION_CI_SCHEMA_FILE_NAME_MATCH } from '../constants'; -import { EditorLiteExtension } from './editor_lite_extension_base'; +import { SourceEditorExtension } from './source_editor_extension_base'; -export class CiSchemaExtension extends EditorLiteExtension { +export class CiSchemaExtension extends SourceEditorExtension { /** * Registers a syntax schema to the editor based on project * identifier and commit. diff --git a/app/assets/javascripts/editor/extensions/editor_lite_extension_base.js b/app/assets/javascripts/editor/extensions/source_editor_extension_base.js index 05a020bd958..5fa01f03f7e 100644 --- a/app/assets/javascripts/editor/extensions/editor_lite_extension_base.js +++ b/app/assets/javascripts/editor/extensions/source_editor_extension_base.js @@ -16,15 +16,15 @@ const createAnchor = (href) => { return fragment; }; -export class EditorLiteExtension { +export class SourceEditorExtension { constructor({ instance, ...options } = {}) { if (instance) { Object.assign(instance, options); - EditorLiteExtension.highlightLines(instance); + SourceEditorExtension.highlightLines(instance); if (instance.getEditorType && instance.getEditorType() === EDITOR_TYPE_CODE) { - EditorLiteExtension.setupLineLinking(instance); + SourceEditorExtension.setupLineLinking(instance); } - EditorLiteExtension.deferRerender(instance); + SourceEditorExtension.deferRerender(instance); } else if (Object.entries(options).length) { throw new Error(ERROR_INSTANCE_REQUIRED_FOR_EXTENSION); } @@ -79,7 +79,7 @@ export class EditorLiteExtension { } static setupLineLinking(instance) { - instance.onMouseMove(EditorLiteExtension.onMouseMoveHandler); + instance.onMouseMove(SourceEditorExtension.onMouseMoveHandler); instance.onMouseDown((e) => { const isCorrectAnchor = e.target.element.classList.contains('link-anchor'); if (!isCorrectAnchor) { diff --git a/app/assets/javascripts/editor/extensions/source_editor_file_template_ext.js b/app/assets/javascripts/editor/extensions/source_editor_file_template_ext.js new file mode 100644 index 00000000000..397e090ed30 --- /dev/null +++ b/app/assets/javascripts/editor/extensions/source_editor_file_template_ext.js @@ -0,0 +1,8 @@ +import { Position } from 'monaco-editor'; +import { SourceEditorExtension } from './source_editor_extension_base'; + +export class FileTemplateExtension extends SourceEditorExtension { + navigateFileStart() { + this.setPosition(new Position(1, 1)); + } +} diff --git a/app/assets/javascripts/editor/extensions/editor_markdown_ext.js b/app/assets/javascripts/editor/extensions/source_editor_markdown_ext.js index 2ce003753f7..997503a12f5 100644 --- a/app/assets/javascripts/editor/extensions/editor_markdown_ext.js +++ b/app/assets/javascripts/editor/extensions/source_editor_markdown_ext.js @@ -1,6 +1,6 @@ -import { EditorLiteExtension } from './editor_lite_extension_base'; +import { SourceEditorExtension } from './source_editor_extension_base'; -export class EditorMarkdownExtension extends EditorLiteExtension { +export class EditorMarkdownExtension extends SourceEditorExtension { getSelectedText(selection = this.getSelection()) { const { startLineNumber, endLineNumber, startColumn, endColumn } = selection; const valArray = this.getValue().split('\n'); diff --git a/app/assets/javascripts/editor/extensions/editor_lite_webide_ext.js b/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js index 83b0386d470..98e05489c1c 100644 --- a/app/assets/javascripts/editor/extensions/editor_lite_webide_ext.js +++ b/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js @@ -1,7 +1,7 @@ import { debounce } from 'lodash'; import { KeyCode, KeyMod, Range } from 'monaco-editor'; import { EDITOR_TYPE_DIFF } from '~/editor/constants'; -import { EditorLiteExtension } from '~/editor/extensions/editor_lite_extension_base'; +import { SourceEditorExtension } from '~/editor/extensions/source_editor_extension_base'; import Disposable from '~/ide/lib/common/disposable'; import { editorOptions } from '~/ide/lib/editor_options'; import keymap from '~/ide/lib/keymap.json'; @@ -12,7 +12,7 @@ const isDiffEditorType = (instance) => { export const UPDATE_DIMENSIONS_DELAY = 200; -export class EditorWebIdeExtension extends EditorLiteExtension { +export class EditorWebIdeExtension extends SourceEditorExtension { constructor({ instance, modelManager, ...options } = {}) { super({ instance, diff --git a/app/assets/javascripts/editor/editor_lite.js b/app/assets/javascripts/editor/source_editor.js index 249888ede9b..ee97714824e 100644 --- a/app/assets/javascripts/editor/editor_lite.js +++ b/app/assets/javascripts/editor/source_editor.js @@ -6,23 +6,23 @@ import { registerLanguages } from '~/ide/utils'; import { joinPaths } from '~/lib/utils/url_utility'; import { uuids } from '~/lib/utils/uuids'; import { - EDITOR_LITE_INSTANCE_ERROR_NO_EL, + SOURCE_EDITOR_INSTANCE_ERROR_NO_EL, URI_PREFIX, EDITOR_READY_EVENT, EDITOR_TYPE_DIFF, } from './constants'; import { clearDomElement } from './utils'; -export default class EditorLite { +export default class SourceEditor { constructor(options = {}) { this.instances = []; this.options = { - extraEditorClassName: 'gl-editor-lite', + extraEditorClassName: 'gl-source-editor', ...defaultEditorOptions, ...options, }; - EditorLite.setupMonacoTheme(); + SourceEditor.setupMonacoTheme(); registerLanguages(...languages); } @@ -56,7 +56,7 @@ export default class EditorLite { extensionsArray.forEach((ext) => { const prefix = ext.includes('/') ? '' : 'editor/'; const trimmedExt = ext.replace(/^\//, '').trim(); - EditorLite.pushToImportsArray(promises, `~/${prefix}${trimmedExt}`); + SourceEditor.pushToImportsArray(promises, `~/${prefix}${trimmedExt}`); }); return Promise.all(promises); @@ -77,7 +77,7 @@ export default class EditorLite { static prepareInstance(el) { if (!el) { - throw new Error(EDITOR_LITE_INSTANCE_ERROR_NO_EL); + throw new Error(SOURCE_EDITOR_INSTANCE_ERROR_NO_EL); } clearDomElement(el); @@ -88,7 +88,7 @@ export default class EditorLite { } static manageDefaultExtensions(instance, el, extensions) { - EditorLite.loadExtensions(extensions, instance) + SourceEditor.loadExtensions(extensions, instance) .then((modules) => { if (modules) { modules.forEach((module) => { @@ -126,7 +126,7 @@ export default class EditorLite { const diffModel = { original: monacoEditor.createModel( blobOriginalContent, - EditorLite.getModelLanguage(model.uri.path), + SourceEditor.getModelLanguage(model.uri.path), ), modified: model, }; @@ -135,18 +135,18 @@ export default class EditorLite { } static convertMonacoToELInstance = (inst) => { - const editorLiteInstanceAPI = { + const sourceEditorInstanceAPI = { updateModelLanguage: (path) => { - return EditorLite.instanceUpdateLanguage(inst, path); + return SourceEditor.instanceUpdateLanguage(inst, path); }, use: (exts = []) => { - return EditorLite.instanceApplyExtension(inst, exts); + return SourceEditor.instanceApplyExtension(inst, exts); }, }; const handler = { get(target, prop, receiver) { - if (Reflect.has(editorLiteInstanceAPI, prop)) { - return editorLiteInstanceAPI[prop]; + if (Reflect.has(sourceEditorInstanceAPI, prop)) { + return sourceEditorInstanceAPI[prop]; } return Reflect.get(target, prop, receiver); }, @@ -155,7 +155,7 @@ export default class EditorLite { }; static instanceUpdateLanguage(inst, path) { - const lang = EditorLite.getModelLanguage(path); + const lang = SourceEditor.getModelLanguage(path); const model = inst.getModel(); return monacoEditor.setModelLanguage(model, lang); } @@ -163,7 +163,7 @@ export default class EditorLite { static instanceApplyExtension(inst, exts = []) { const extensions = [].concat(exts); extensions.forEach((extension) => { - EditorLite.mixIntoInstance(extension, inst); + SourceEditor.mixIntoInstance(extension, inst); }); return inst; } @@ -210,10 +210,10 @@ export default class EditorLite { isDiff = false, ...instanceOptions } = {}) { - EditorLite.prepareInstance(el); + SourceEditor.prepareInstance(el); const createEditorFn = isDiff ? 'createDiffEditor' : 'create'; - const instance = EditorLite.convertMonacoToELInstance( + const instance = SourceEditor.convertMonacoToELInstance( monacoEditor[createEditorFn].call(this, el, { ...this.options, ...instanceOptions, @@ -222,7 +222,7 @@ export default class EditorLite { let model; if (instanceOptions.model !== null) { - model = EditorLite.createEditorModel({ + model = SourceEditor.createEditorModel({ blobGlobalId, blobOriginalContent, blobPath, @@ -233,11 +233,11 @@ export default class EditorLite { } instance.onDidDispose(() => { - EditorLite.instanceRemoveFromRegistry(this, instance); - EditorLite.instanceDisposeModels(this, instance, model); + SourceEditor.instanceRemoveFromRegistry(this, instance); + SourceEditor.instanceDisposeModels(this, instance, model); }); - EditorLite.manageDefaultExtensions(instance, el, extensions); + SourceEditor.manageDefaultExtensions(instance, el, extensions); this.instances.push(instance); return instance; |