Блокировка UI при попытке применить одновременно несколько BSL-ных квик-фиксов #977 #978
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marmyshev
reviewed
Feb 14, 2022
Comment on lines
+116
to
+127
| IXtextDocument document = (IXtextDocument)fixModel.getDocument(); | ||
| XtextResource xtextResource = document.readOnly(new IUnitOfWork<XtextResource, XtextResource>() | ||
| { | ||
| @Override | ||
| public XtextResource exec(XtextResource state) throws Exception | ||
| { | ||
| return state; | ||
| } | ||
| }); | ||
|
|
||
| ExternalQuickfixModification<EObject> quickFixModification = new ExternalQuickfixModification<>(issue, | ||
| EObject.class, element -> fixIssue((IXtextInteractiveBslModuleFixModel)fixModel)); | ||
| EObject.class, element -> fixIssue((IXtextInteractiveBslModuleFixModel)fixModel, xtextResource)); |
There was a problem hiding this comment.
у меня сомнения что это правильно - вроде бы операция есть com.e1c.g5.v8.dt.bsl.check.qfix.ExternalQuickfixModification.createChanges(IXtextDocument, Issue, Class, Function<E, TextEdit>)
но тут ты сам скажи, как правильно...
There was a problem hiding this comment.
Так ведь это просто изменение кода лямбды. Сигнатура функции-параметра не поменялась. Иначе бы компилятор сругался)
Раньше ресурс вытаскивался внутри тела функции. Для его вытаскивания тоже нужна транзакция. В итоге получались вложенные транзакции, что приводило к дэдлоку. Теперь я вынес код по получению ресурса выше. После этого транзакция закрывается и открывается новая.
vadimeg
force-pushed
the
bugfix/977-multiple_qfix_deadlock
branch
from
eceb0e8 to
b5fcca9
Compare
|
SonarCloud Quality Gate failed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Что сделано
Исправлена блокировка при применении множественных увик-фиксов
Чек-лист
Общее:
masterи нет конфликтовЕсли применимо:
Закрываемые задачи
Closes #??