Вариант языка проекта считается в одном месте

[sfaqer]

По замечанию ревьюера в #4347: «кажется, этот расчёт уже где-то есть». Есть — и даже дважды.

DocumentContext.getScriptVariantLanguage() отвечает ровно на этот вопрос: на каком языке писать в код пользователя. Им уже пользуются сворачивание областей (RegionFoldingRangeSupplier — буквально слово Область/Region), CodeBlockFoldingRangeSupplier, автодополнение и quick fix EventHandlerInvalidSignatureDiagnostic.

Рядом с ним жили две копии того же правила:

место	что было
GenerateStandardRegionsSupplier.getRegionsLanguage	своя реализация, до этих правок
EventHandlerOutsideEventRegionDiagnostic.scriptVariantOf	третья копия, добавлена в #4347

Обе удалены, оба места зовут канонический метод.

Побочно закрытая дыра

У копий не было отступного пути на ScriptVariant.UNKNOWN, который есть у getScriptVariantLanguage(). MultiName.get(ScriptVariant) трактует всё, кроме ENGLISH, как русский, поэтому в конфигурации с неопознанным вариантом языка области назывались по-русски независимо от языка проекта. Теперь там язык интерфейса сервера — как и задумано.

Мелочи

ScriptVariant остался нужен GenerateStandardRegionsSupplier: его требует API Regions. На месте вызова это одна строка-переходник ScriptVariant.valueByName(...getLanguageCode()) — приведение типа, а не расчёт правила.

Из диагностики вместе с расчётом ушла зависимость от LanguageServerConfiguration: она была нужна только ради него.

Итог: −46 строк, +17.

🤖 Generated with Claude Code

Summary by CodeRabbit

• Bug Fixes
  • Improved language detection for standard region generation and event-handler diagnostics.
  • Region names and generated directives now use the document’s actual language, providing more accurate localized results.
  • Quick fixes for event handlers outside their expected regions now generate language-appropriate region names and directives.
  • Removed reliance on separate language configuration for these code actions and diagnostics.

[coderabbitai]

📝 Walkthrough

Walkthrough

The changes replace configuration-based script-variant selection with document-derived language selection for standard regions and event-handler diagnostics. Region lookup now accepts Language, and the diagnostic constructor no longer accepts configuration.

Changes

Document-derived region language

Layer / File(s)	Summary
Language-based region selection src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EventHandlerTargetRegion.java, src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/GenerateStandardRegionsSupplier.java	Region lookup now accepts Language. Standard region generation derives the language from the document’s script-variant language code.
Diagnostic language integration src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EventHandlerOutsideEventRegionDiagnostic.java	The diagnostic removes configuration state and uses the document language for region names, quick-fix targets, and region directives.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

• 1c-syntax/bsl-language-server#4347: Refactors the same event-handler diagnostic and region-selection logic.

Suggested reviewers: claude, nixel2007

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly summarizes the main change: centralizing project language variant calculation in one place.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch fix/script-variant-single-source

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[coderabbitai]

🧹 Nitpick comments (1)

src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/GenerateStandardRegionsSupplier.java (1)

83-86: 🎯 Functional Correctness | 🔵 Trivial | ⚡ Quick win

Add regression coverage for both language consumers.

Test a project language that differs from the server UI language and test ScriptVariant.UNKNOWN. Assert generated region names and #Region/#EndRegion directives. Also assert that EventHandlerOutsideEventRegionDiagnostic messages and quick fixes use the same language.

The supplied GenerateStandardRegionsSupplierTest asserts only the action title. It does not protect this changed output.

As per coding guidelines, always run tests before submitting changes and maintain or improve test coverage using appropriate test frameworks.
Based on the supplied test context, the visible assertion covers only the code-action title.

🤖 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/codeactions/GenerateStandardRegionsSupplier.java`
around lines 83 - 86, Add regression tests in
GenerateStandardRegionsSupplierTest for a project language differing from the
server UI language and for ScriptVariant.UNKNOWN. Assert generated region names
and `#Region/`#EndRegion directives, and verify
EventHandlerOutsideEventRegionDiagnostic messages and quick fixes use that same
language, not just the action title; run the relevant tests before submission.

Source: Coding guidelines

🤖 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.

Nitpick comments:
In
`@src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/GenerateStandardRegionsSupplier.java`:
- Around line 83-86: Add regression tests in GenerateStandardRegionsSupplierTest
for a project language differing from the server UI language and for
ScriptVariant.UNKNOWN. Assert generated region names and `#Region/`#EndRegion
directives, and verify EventHandlerOutsideEventRegionDiagnostic messages and
quick fixes use that same language, not just the action title; run the relevant
tests before submission.

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: fa09135b-cd4d-43e5-b107-677ec30d1c35

📥 Commits

Reviewing files that changed from the base of the PR and between 50d66d6 and 3f1469f.

📒 Files selected for processing (3)

• src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/GenerateStandardRegionsSupplier.java
• src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EventHandlerOutsideEventRegionDiagnostic.java
• src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EventHandlerTargetRegion.java

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

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

See analysis details on SonarQube Cloud

[github-actions]

Test Results

 3 936 files  ±0   3 936 suites  ±0   1h 5m 40s ⏱️ +12s
 4 053 tests ±0   3 987 ✅ ±0   66 💤 ±0  0 ❌ ±0 
24 318 runs  ±0  23 918 ✅ ±0  400 💤 ±0  0 ❌ ±0 

Results for commit 3f1469f. ± Comparison against base commit 50d66d6.

♻️ This comment has been updated with latest results.