1c/bsl_console
1
0
Fork 0
mirror of https://github.com/salexdv/bsl_console.git synced 2025-02-07 13:31:37 +02:00
Code Issues Releases Activity

Доработка режима сравнения в части поддержки подсветки синтаксиса

Browse Source
This commit is contained in:
salexdv 2020-12-07 23:27:33 +03:00
parent ef56fb36a7
commit 11404784ff
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/editor.js
View File

@ -346,20 +346,31 @@ define(['bslGlobals', 'bslMetadata', 'snippets', 'bsl_language', 'vs/editor/edit
compare = function (text, sideBySide, highlight) {
document.getElementById("container").innerHTML = ''
let language_id = '';
if (highlight)
language_id = queryMode ? 'bls_query' : 'bsl';
if (text) {
let originalModel = originalText ? monaco.editor.createModel(originalText, language_id) : monaco.editor.createModel(editor.getModel().getValue(), language_id);
let modifiedModel = monaco.editor.createModel(text, language_id);
let language_id = queryMode ? 'bsl_query' : 'bsl';
let queryPostfix = '-query';
let currentTheme = editor._themeService.getTheme().themeName;
if (queryMode && currentTheme.indexOf(queryPostfix) == -1)
currentTheme += queryPostfix;
else if (!queryMode && currentTheme.indexOf(queryPostfix) >= 0)
currentTheme = currentTheme.replace(queryPostfix, '');
if (text) {
let originalModel = originalText ? monaco.editor.createModel(originalText) : monaco.editor.createModel(editor.getModel().getValue());
let modifiedModel = monaco.editor.createModel(text);
originalText = originalModel.getValue();
editor = monaco.editor.createDiffEditor(document.getElementById("container"), {
theme: "bsl-white",
language: queryMode ? 'bls_query' : 'bsl',
contextmenu: false,
renderSideBySide: sideBySide
theme: currentTheme,
language: language_id,
contextmenu: false,
automaticLayout: true,
renderSideBySide: sideBySide
});
if (highlight) {
monaco.editor.setModelLanguage(originalModel, language_id);
monaco.editor.setModelLanguage(modifiedModel, language_id);
}
editor.setModel({
original: originalModel,
modified: modifiedModel
@ -368,10 +379,11 @@ define(['bslGlobals', 'bslMetadata', 'snippets', 'bsl_language', 'vs/editor/edit
else
{
editor = monaco.editor.create(document.getElementById("container"), {
theme: "bsl-white",
theme: currentTheme,
value: originalText,
language: queryMode ? 'bls_query' : 'bsl',
contextmenu: true
language: language_id,
contextmenu: true,
automaticLayout: true
});
originalText = '';
}