Skip to content

ALT-10993 261.EAP-SNAPSHOT build#22

Merged
adkozlov merged 8 commits intomainfrom
adkozlov/ALT-10993
Mar 17, 2026
Merged

ALT-10993 261.EAP-SNAPSHOT build#22
adkozlov merged 8 commits intomainfrom
adkozlov/ALT-10993

Conversation

@adkozlov
Copy link
Collaborator

@adkozlov adkozlov commented Mar 2, 2026

No description provided.

@adkozlov adkozlov self-assigned this Mar 2, 2026
@adkozlov adkozlov force-pushed the adkozlov/ALT-10993 branch 2 times, most recently from 6c06773 to 57b15bc Compare March 5, 2026 22:41
@adkozlov adkozlov force-pushed the adkozlov/ALT-10993 branch from 57b15bc to 439f7d0 Compare March 9, 2026 17:10
* ALT-10995 cleanFileLevelHighlights moved to EDT

* ALT-10995 unnecessary for loop removed

* ALT-10995 running CI with push events

* fixup! ALT-10995 running CI with push events

This reverts commit 483f50a.

* fixup! ALT-10995 unnecessary for loop removed
@VitaliyYa VitaliyYa requested a review from meanmail March 17, 2026 08:26
Copy link
Contributor

@meanmail meanmail left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Overall the PR looks solid for adding 261 platform support. Nice cleanup of the secret properties mechanism and good use of branch-specific compatibility abstractions.

Main concern: potential bug in JdkLanguageSettings where loadingState gets unconditionally overwritten — see inline comment.

Minor items:

  • Several new files are missing a trailing newline (MergeDialogCustomizerCompat.kt, MergeModelBaseCompat.kt, oauth.properties)
  • CppGEduTaskChecker.kt in branches 252 and 253 imports EnvironmentChecker but doesn't use it directly
  • CppCatchEduTaskChecker.kt and CppGEduTaskChecker.kt are identical between 252 and 253 branches — could potentially share code
  • BACKCOMPAT comment in branches/261/.../csharp/compatibilityUtils.kt says "BACKCOMPAT 261" but the API change happened in 253

@adkozlov
Copy link
Collaborator Author

@meanmail Please see the changes and approve.

Copy link
Contributor

@meanmail meanmail left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All review comments have been addressed. LGTM!

@adkozlov adkozlov merged commit cdc7111 into main Mar 17, 2026
0 of 3 checks passed
@adkozlov adkozlov deleted the adkozlov/ALT-10993 branch March 17, 2026 12:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants