fix: переход диагностики BadExceptionCategory на TypeService.resolve (#1935) by erprivalov · Pull Request #4128 · 1c-syntax/bsl-language-server

erprivalov · 2026-06-16T00:00:29Z

Описание

В рамках решения задачи #1935 алгоритм диагностики BadExceptionCategoryDiagnostic переведен на использование семантического анализа через TypeService.resolve(). Новый подход через resolve игнорирует форматирование, исправляя отсутствие срабатывания теста в случаях когда элементы AST-дерева дополнительно разделены пробелами.

Связанные задачи

Closes #1935

Чеклист

Общие

Ветка PR обновлена из develop
Отладочные, закомментированные и прочие, не имеющие смысла участки кода удалены
Изменения покрыты тестами
Обязательные действия перед коммитом выполнены (запускал команду gradlew precommit)

Для диагностик

Описание диагностики заполнено для обоих языков (присутствуют файлы для обоих языков, для русского заполнено все подробно, перевод на английский можно опустить)

Дополнительно

Summary by CodeRabbit

Documentation
- Updated diagnostics documentation for event handler validation rules.
New Features
- Added two new configurable diagnostic parameters for event handlers: signature mismatch detection and region boundary checking (both enabled by default).
Improvements
- Enhanced exception category classification accuracy for more reliable diagnostics.
Tests
- Updated diagnostic expectations to reflect the refined behavior.

…c-syntax#1935)

coderabbitai · 2026-06-16T00:00:44Z

📝 Walkthrough

Walkthrough

Refactors BadExceptionCategoryDiagnostic to use a single TypeService-based predicate for forbidden category detection, removing the old syntax-based approach and unused Position import. Adds EventHandlerInvalidSignature and EventHandlerOutsideEventRegion to JSON configuration schemas and updates their English doc metadata comments.

Changes

BadExceptionCategoryDiagnostic Refactor

Layer / File(s)	Summary
checkForbiddenCategory logic and cleanup `src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BadExceptionCategoryDiagnostic.java`, `src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BadExceptionCategoryDiagnosticTest.java`	Removes the unused `Position` import, adjusts `@DiagnosticMetadata` tag formatting, refactors `FORBIDDEN_CATEGORIES` from a static lowercase `Set` to a case-insensitive `TreeSet` populated by `initForbiddenCategories()`, and replaces the prior multi-method forbidden-category chain with a single `isForbiddenCategoryParam` predicate that validates call parameter text, resolves the member type via `TypeService`, and matches against `КатегорияОшибки`/`ErrorCategory` case-insensitively. Test expected count increases from 6 to 7 with a new `hasRange` assertion for line 32.

EventHandler Diagnostics Schema and Docs Registration

Layer / File(s)	Summary
Schema definitions and doc comments `src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json`, `src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json`, `docs/en/diagnostics/EventHandlerInvalidSignature.md`, `docs/en/diagnostics/EventHandlerOutsideEventRegion.md`	Inserts `EventHandlerInvalidSignature` and `EventHandlerOutsideEventRegion` definitions (default `true`, `boolean \| object`) into `parameters-schema.json` and wires both keys into `schema.json`'s `diagnosticParameters`. Updates the metadata guard comment in each corresponding English diagnostic markdown file.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

1c-syntax/bsl-language-server#4101: Introduces the BadExceptionCategory diagnostic that this PR directly builds on by refactoring its forbidden-category detection logic.

Suggested labels

hacktoberfest-accepted

Suggested reviewers

sfaqer
nixel2007

Poem

🐇 Hop hop, the category check is lean,
TypeService resolves what the old code had seen.
EventHandler schemas now properly wired,
No more Position lookups when they're not required.
With seven assertions where six used to be,
The rabbit approves this refactoring spree! 🎉

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (4 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The PR title clearly identifies the main change: migrating BadExceptionCategoryDiagnostic to use TypeService.resolve() to fix issue `#1935`, which is the core objective.
Linked Issues check	✅ Passed	The PR implements the BadExceptionCategoryDiagnostic to detect forbidden exception categories (ВсеОшибки, ПрочаяОшибка, etc.) in functional form RaiseException calls using semantic analysis via TypeService, fulfilling issue `#1935` requirements. Configuration schema entries and documentation have been added.
Out of Scope Changes check	✅ Passed	All changes are directly related to implementing BadExceptionCategoryDiagnostic and supporting infrastructure (schemas, documentation, tests). Documentation updates for EventHandlerInvalidSignature and EventHandlerOutsideEventRegion are configuration-level additions to support new diagnostics.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

coderabbitai

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In
`@src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BadExceptionCategoryDiagnostic.java`:
- Around line 61-67: The English alias for the raised-from-script exception
category in the errors.addAll() method call in BadExceptionCategoryDiagnostic is
incorrect. Replace "ScriptRaisedException" with "ExceptionRaisedFromScript" to
match the documented 1C forbidden category name. This will ensure that
ErrorCategory.ExceptionRaisedFromScript is properly recognized and not missed by
the token matching logic at line 90.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

Push a commit to this branch (recommended)
Create a new PR with the fixes

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: a45cf8e7-cafe-4b36-8108-4708f51b0b14

📥 Commits

Reviewing files that changed from the base of the PR and between 2d8e868 and 00ac51d.

⛔ Files ignored due to path filters (1)

src/test/resources/diagnostics/BadExceptionCategoryDiagnostic.bsl is excluded by !src/test/resources/**

📒 Files selected for processing (2)

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BadExceptionCategoryDiagnostic.java
src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BadExceptionCategoryDiagnosticTest.java

coderabbitai · 2026-06-16T13:50:02Z

+    errors.addAll(List.of(
+      "ВсеОшибки", "AllErrors",
+      "ПрочаяОшибка", "OtherError",
+      "ОшибкаКомпиляцииВстроенногоЯзыка", "ScriptCompileError",
+      "ОшибкаВоВремяВыполненияВстроенногоЯзыка", "ScriptRuntimeError",
+      "ИсключениеВызванноеИзВстроенногоЯзыка", "ScriptRaisedException"
+    ));


⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Use the documented English alias for the raised-from-script category.

ScriptRaisedException does not match the 1C documentation’s forbidden English category name, ExceptionRaisedFromScript; because Line 90 rejects unknown token text before memberAt(), ErrorCategory.ExceptionRaisedFromScript is currently missed. The referenced 1C developer guide lists the forbidden categories as AllErrors, OtherError, ScriptCompileError, ScriptRuntimeError, and ExceptionRaisedFromScript. (kb.1ci.com)

🐛 Proposed fix

errors.addAll(List.of( "ВсеОшибки", "AllErrors", "ПрочаяОшибка", "OtherError", "ОшибкаКомпиляцииВстроенногоЯзыка", "ScriptCompileError", "ОшибкаВоВремяВыполненияВстроенногоЯзыка", "ScriptRuntimeError", - "ИсключениеВызванноеИзВстроенногоЯзыка", "ScriptRaisedException" + "ИсключениеВызванноеИзВстроенногоЯзыка", "ExceptionRaisedFromScript" ));

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BadExceptionCategoryDiagnostic.java` around lines 61 - 67, The English alias for the raised-from-script exception category in the errors.addAll() method call in BadExceptionCategoryDiagnostic is incorrect. Replace "ScriptRaisedException" with "ExceptionRaisedFromScript" to match the documented 1C forbidden category name. This will ensure that ErrorCategory.ExceptionRaisedFromScript is properly recognized and not missed by the token matching logic at line 90.

sonarqubecloud · 2026-06-16T13:58:09Z

Quality Gate passed

Issues
3 New issues
0 Accepted issues

Measures
0 Security Hotspots
85.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

nixel2007 · 2026-06-16T18:37:27Z

-  }
+  private boolean isForbiddenCategoryParam(CallParamContext param) {
+    String lastTokenText = param.getStop().getText();
+    if (!FORBIDDEN_CATEGORIES.contains(lastTokenText)) {


Там может лежать переменная, в которую сохранена категория ошибки. В общем случае, думаю, можно удалить эту проверку

fix: переход диагностики BadExceptionCategory на TypeService.resolve (1…

7778459

…c-syntax#1935)

fix: remove resolve() and fix Set init (1c-syntax#1935)

00ac51d

erprivalov force-pushed the feature/Issue-1935-update branch from 2d8e868 to 00ac51d Compare June 16, 2026 13:43

coderabbitai Bot reviewed Jun 16, 2026

View reviewed changes

nixel2007 reviewed Jun 16, 2026

View reviewed changes

nixel2007 merged commit b146a92 into 1c-syntax:develop Jun 17, 2026
29 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: переход диагностики BadExceptionCategory на TypeService.resolve (#1935)#4128

fix: переход диагностики BadExceptionCategory на TypeService.resolve (#1935)#4128
nixel2007 merged 2 commits into
1c-syntax:developfrom
erprivalov:feature/Issue-1935-update

erprivalov commented Jun 16, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

coderabbitai Bot commented Jun 16, 2026 •

edited

Loading

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested labels

Suggested reviewers

Poem

❌ Failed checks (1 warning)

Uh oh!

coderabbitai Bot left a comment

Uh oh!

coderabbitai Bot Jun 16, 2026

Uh oh!

sonarqubecloud Bot commented Jun 16, 2026

Uh oh!

nixel2007 Jun 16, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

erprivalov commented Jun 16, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Описание

Связанные задачи

Чеклист

Общие

Для диагностик

Дополнительно

Summary by CodeRabbit

Uh oh!

coderabbitai Bot commented Jun 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested labels

Suggested reviewers

Poem

❌ Failed checks (1 warning)

Uh oh!

coderabbitai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

coderabbitai Bot Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud Bot commented Jun 16, 2026

Quality Gate passed

Uh oh!

nixel2007 Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

erprivalov commented Jun 16, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Jun 16, 2026 •

edited

Loading