drop using legacy lock tokens

Author: VISTALL

grammar-kit/src/main/java/org/intellij/grammar/impl/debugger/BnfPositionManager.java

@@ -195,21 +195,16 @@ public List<Location> locationsOfLine(ReferenceType type, SourcePosition positio
 
     @RequiredReadAction
     private int getLineNumber(PsiElement element, String parserClass, int currentLine) {
-        int line = 0;
-        AccessToken token = ReadAction.start();
-        try {
+        return ReadAction.compute(() -> {
             BnfRule rule = PsiTreeUtil.getParentOfType(element, BnfRule.class);
             PsiClass aClass = JavaPsiFacade.getInstance(myProcess.getProject()).findClass(parserClass, myProcess.getSearchScope());
             Document document =
-                aClass != null ? PsiDocumentManager.getInstance(myProcess.getProject()).getDocument(aClass.getContainingFile()) : null;
+                    aClass != null ? PsiDocumentManager.getInstance(myProcess.getProject()).getDocument(aClass.getContainingFile()) : null;
             if (rule != null && document != null) {
                 return getLineNumber(aClass, document, currentLine, rule, element);
             }
-        }
-        finally {
-            token.finish();
-        }
-        return line;
+            return 0;
+        });
     }
 
     @RequiredReadAction
@@ -262,19 +257,15 @@ public ClassPrepareRequest createPrepareRequest(
 
     @Nonnull
     private String getParserClass(SourcePosition classPosition) throws NoDataException {
-        AccessToken token = ReadAction.start();
-        try {
+        return ReadAction.computeNotNull(() -> {
             BnfRule rule = getRuleAt(classPosition);
             String version = rule.getContainingFile() instanceof BnfFile bnfFile ? bnfFile.getVersion() : null;
             String parserClass = ParserGeneratorUtil.getAttribute(version, rule, KnownAttribute.PARSER_CLASS);
             if (StringUtil.isEmpty(parserClass)) {
                 throw new NoDataException();
             }
             return parserClass;
-        }
-        finally {
-            token.finish();
-        }
+        });
     }
 
     @Nonnull

grammar-kit/src/main/java/org/intellij/grammar/impl/inspection/CreateRuleFromTokenFix.java

@@ -19,6 +19,7 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.devkit.grammarKit.localize.BnfLocalize;
 import consulo.localize.LocalizeValue;
+import consulo.ui.annotation.RequiredUIAccess;
 import jakarta.annotation.Nonnull;
 
 import consulo.application.AccessToken;
@@ -59,10 +60,9 @@ public LocalizeValue getFamilyName() {
     }
 
     @Override
-    @RequiredReadAction
+    @RequiredUIAccess
     public void applyFix(final @Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
-        final AccessToken token = WriteAction.start();
-        try {
+        WriteAction.run(() -> {
             final PsiElement element = descriptor.getPsiElement();
             final BnfRule rule = PsiTreeUtil.getParentOfType(element, BnfRule.class);
             if (rule == null) {
@@ -71,17 +71,14 @@ public void applyFix(final @Nonnull Project project, @Nonnull ProblemDescriptor
 
             final BnfRule addedRule = BnfIntroduceRuleHandler.addNextRule(project, rule, "private " + myName + " ::= ");
             final FileEditor selectedEditor =
-                FileEditorManager.getInstance(project).getSelectedEditor(rule.getContainingFile().getVirtualFile());
+                    FileEditorManager.getInstance(project).getSelectedEditor(rule.getContainingFile().getVirtualFile());
             if (selectedEditor instanceof TextEditor textEditor) {
                 final Editor editor = textEditor.getEditor();
                 editor.getCaretModel().moveToOffset(
-                    addedRule.getTextRange().getEndOffset() - (BnfIntroduceRuleHandler.endsWithSemicolon(addedRule) ? 1 : 0)
+                        addedRule.getTextRange().getEndOffset() - (BnfIntroduceRuleHandler.endsWithSemicolon(addedRule) ? 1 : 0)
                 );
                 editor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
             }
-        }
-        finally {
-            token.finish();
-        }
+        });
     }
 }

grammar-kit/src/main/java/org/intellij/grammar/impl/refactor/BnfIntroduceRulePopup.java

@@ -93,8 +93,7 @@ public BnfIntroduceRulePopup(Project project, Editor editor, BnfRule rule, BnfEx
     @Override
     protected void moveOffsetAfter(boolean success) {
         RangeMarker exprMarker = getExprMarker();
-        final AccessToken accessToken = WriteAction.start();
-        try {
+        WriteAction.run(() -> {
             Document document = myEditor.getDocument();
             // todo restore original expression if not success
             PsiDocumentManager.getInstance(myProject).commitDocument(document);
@@ -103,10 +102,7 @@ protected void moveOffsetAfter(boolean success) {
                 myEditor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
                 exprMarker.dispose();
             }
-        }
-        finally {
-            accessToken.finish();
-        }
+        });
     }
 
     @Override