1c/bsl_console
1
0
Fork 0
mirror of https://github.com/salexdv/bsl_console.git synced 2024-11-24 08:33:29 +02:00
Code Issues Releases Activity

Merge pull request #298 from tormozit/develop

Browse Source 
Develop
This commit is contained in:
Alexander Shkuraev 2022-11-05 16:09:07 +03:00 committed by GitHub
commit 395a39e53c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/editor.js
View File

@ -1121,7 +1121,7 @@ define(['bslGlobals', 'bslMetadata', 'snippets', 'bsl_language', 'vs/editor/edit
setOption = function (optionName, optionValue) { setOption = function (optionName, optionValue) {
setTimeout(() => { // setTimeout(() => { // Асинхронное выполнение не совместимо со старым API и рождает много скрытых проблем https://github.com/salexdv/bsl_console/issues/297
editor[optionName] = optionValue; editor[optionName] = optionValue;
editor_options[optionName] = optionValue; editor_options[optionName] = optionValue;
@ -1138,7 +1138,7 @@ define(['bslGlobals', 'bslMetadata', 'snippets', 'bsl_language', 'vs/editor/edit
if (optionName == 'generateSuggestActivationEvent') if (optionName == 'generateSuggestActivationEvent')
startStopSuggestActivationObserver(); startStopSuggestActivationObserver();
}, 10); // }, 10);
} }
@ -1818,8 +1818,9 @@ define(['bslGlobals', 'bslMetadata', 'snippets', 'bsl_language', 'vs/editor/edit
// #region non-public functions // #region non-public functions
function getLineNumber(originalLineNumber) { function getLineNumber(originalLineNumber) {
if (originalLineNumber < lineNumbersDedocrations.length) // Исправлена потеря первой декорации https://github.com/salexdv/bsl_console/issues/296#issuecomment-1303625104
return lineNumbersDedocrations[originalLineNumber] + ' ' + originalLineNumber; if (originalLineNumber <= lineNumbersDedocrations.length)
return lineNumbersDedocrations[originalLineNumber - 1] + ' ' + originalLineNumber;
return originalLineNumber; return originalLineNumber;