# Conflicts:
#	community/plugins/kotlin/base/fir/analysis-api-providers/src/org/jetbrains/kotlin/idea/base/fir/analysisApiProviders/FirIdeKotlinModificationTrackerFactory.kt
#	community/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirCallableCompletionContributor.kt
#	community/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirSuperMemberCompletionContributor.kt
#	community/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/helpers/utils.kt

GitOrigin-RevId: ee8ea586fe1d37924a980938006ada48afee88a2

[FIR][tree] replace FirDeclaration.resolvePhase -> resolveState

^KT-56543

GitOrigin-RevId: 6884e91d91e3917901c843179e35846129d31e50

`CompletableFuture.whenComplete` (CompletableFuture.uniWhenComplete) wraps all throwables in CompletionException for subsequent stages. CompletionException constructor runs slow `fillInStackTrace` as most throwables do.

We avoid all that by not using the subsequent stages and altering their unused results to always be values or nulls using the `CompletableFuture.handle` method.

EA-650218 - F: AsyncPromise.cancel
(fillInStackTrace takes 18 out of 49 seconds total freeze time in report 12866252)

GitOrigin-RevId: bc53c5ed0bd4bdaa6f023a1fc76252d4a9916b5a

GitOrigin-RevId: 098fc11add309d4a3581a904c7ddc8333a5d67a5

annotate `runBlockingXxx` with `@RequiresBlockingContext` to warn the clients about calling them from a coroutine

GitOrigin-RevId: e82a5b368a2e91ef062d883e86cb72905c744dff

GitOrigin-RevId: 4b8df5c14b1979edd198712930fc90f4a38b9d5f

GitOrigin-RevId: b5cb53514de95a8f43b7e65b36bcf9807cd7423f

IDEA-316510
IJ-CR-102810

GitOrigin-RevId: 8c8455ef6e027db50a8b8c9821abefd288ae3c87

GitOrigin-RevId: 4faa2534182bf6a5f405c0aa1636ca2a91ec55cd

GitOrigin-RevId: 0cfec93ae4c8b4ddf1998bff153542e14c4bb317

GitOrigin-RevId: c8994607c3c53a05dd5f361ff1978b21ba746d8b

[reactor][debug] IDEA-275263: separate method with applicable check depending on Project was added instead of getIsApplicableChecker overload

GitOrigin-RevId: 5021b666af07d706287c0f323caf2580e2beda8e

GitOrigin-RevId: bb7c2d11225e0cac00b6466c5ccde1ae913a8295

IDEA-316697: load indexes while in dumb mode, otherwise someone from read action may hit `FileBasedIndex.getIndex` and hang

GitOrigin-RevId: eeb980513007e2833d91820a7d9a4de1f48d01a8

GitOrigin-RevId: 9483662ae084a74d4197e66a87f12ba709e07903

GitOrigin-RevId: 0da548c204a937b2e3e373e3740cb259a90b3974

GitOrigin-RevId: e3ff6f28d3d2412f2df5f840ef2cae6f6380aa6b

^KTIJ-25135 fixed

GitOrigin-RevId: 850c44d9952f0d916f169348b0626c5284298608

GitOrigin-RevId: 89ac7e992a08cdfea4f53cfee79727f3a041cf4b

GitOrigin-RevId: 4d43513f85846a457adf819a3e248d641d54bbbd

GitOrigin-RevId: 2ad88b852825af2791cdd67a8a8aea49c4d6a115

GitOrigin-RevId: d74116f5ef2f67f07ab0e89877a4a9b36b874731

GitOrigin-RevId: e4ad053255a8028a1926f653742eb3c8efac8349

If there is a better way to implement that check, more local to Fleet Backend's building code, don't hesitate to refactor it and add me as reviewer.
This has been approved by Dima Panov in PMs.

GitOrigin-RevId: 048fbd54e58006e8edfdf522006e25cd197d8de1

GitOrigin-RevId: f7f2f4d46a9c9e6008bea52bf9fb4fdec822de57

avoid littering persistence with garbage data in tests, use light manually created VirtualDirectoryImpl instead

GitOrigin-RevId: f1dfc6bd326d016d41ababcde9e3866aa6137933

GitOrigin-RevId: f86a22a45dde05594e5d5ee6bdcbad1d24289a5e

GitOrigin-RevId: ec410123673900f0c409c89e227b9636d4138435

GitOrigin-RevId: 7581b09c07796bac8423eb65523cfb3fca344869

GitOrigin-RevId: d787f64e4a97fbc0a12f16ff273c57fe41e54b9d

GitOrigin-RevId: 308c704c8ee652b3ebc67202ea2bb546f5d072b3

GitOrigin-RevId: 565983f1676fe5831e007c0772c6860a0ebdbebf

GitOrigin-RevId: 0e67af0afdae918b46852ae97353d70f3ede1384

GitOrigin-RevId: 4985e8082934cfeec80afcc448b72c7d82e97baa

GitOrigin-RevId: 1742a6c67efc0bccf4c71b57594f89447e931157

GitOrigin-RevId: d0c68b5dc88e391494d1853b648d747c5b7d8913

IDEA-316300 Deadlock on IDEA startup via `DeferredIconImpl>IDEKotlinAsJavaSupport>KotlinFacetSettingsProviderImpl>BaseComponentAdapter.getInstance`

GitOrigin-RevId: 535a41725b2222085ea03b9ab9fa5813fbd47f02

DefaultToolWindowLayoutProvider was problematic as it couldn't be used
by multiple plugins, as only one override could exist for the service.

The new API allows for multiple extensions to be registered. Their
invocation order can be controlled explicitly, and they're passed the
same builder instance, so they can extend, modify and reuse the previous
state, or reset it and start from scratch, up to their choice.

Old-to-new and new-to-old adapters were added. The default tool window
layout manager only uses the new API now, but there's an extension
that invokes the old API and converts its results. The old API implementation,
on the other hand, delegates to the default new API implementation.

Once Rider migrates to the new API, we can safely remove both of these
bridges and use only the new API.

GitOrigin-RevId: 395cdcdf19fc0c99f356ae7c8ae29b003ade68f2

Investigate flaky test `DumbServiceScanningListenerTest.test dumb service suspends when listener started...`

GitOrigin-RevId: 40d7c4c0ed42a642e12e0e4356c1d8d532e70cfe

@TestApplication does not work with "Run Until Failure"

GitOrigin-RevId: 2318c8f5fda4b9ef4c27f1b6dd62b33f63807d9e