K2: adapt to AA changes regarding PackagePartProviderFactory

plugins/kotlin/base/analysis-api-providers/kotlin.base.analysis-api-providers.iml

@@ -11,6 +11,7 @@
     <orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.analysis-api-providers" level="project" />
+    <orderEntry type="module" module-name="kotlin.base.analysis" />
     <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
     <orderEntry type="module" module-name="kotlin.base.util" />
     <orderEntry type="module" module-name="kotlin.base.indices" />

plugins/kotlin/base/analysis-api-providers/resources/kotlin.base.analysis-api-providers.xml

@@ -11,5 +11,8 @@
             serviceImplementation="org.jetbrains.kotlin.idea.base.analysisApiProviders.IdeKotlinPackageProviderFactory"/>
     <projectService
             serviceImplementation="org.jetbrains.kotlin.idea.base.analysisApiProviders.KotlinModuleStateTrackerProvider"/>
+    <projectService
+            serviceInterface="org.jetbrains.kotlin.analysis.providers.PackagePartProviderFactory"
+            serviceImplementation="org.jetbrains.kotlin.idea.base.analysisApiProviders.PackagePartProviderFactoryIdeImpl"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file

plugins/kotlin/fir-low-level-api-ide-impl/src/org/jetbrains/kotlin/idea/fir/low/level/api/ide/PackagePartProviderFactoryIdeImpl.kt → plugins/kotlin/base/analysis-api-providers/src/org/jetbrains/kotlin/idea/base/analysisApiProviders/PackagePartProviderFactoryIdeImpl.kt

-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.idea.fir.low.level.api.ide
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.base.analysisApiProviders
 
 import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.PackagePartProviderFactory
+import org.jetbrains.kotlin.analysis.providers.PackagePartProviderFactory
 import org.jetbrains.kotlin.idea.caches.resolve.IDEPackagePartProvider
 import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
 
 internal class PackagePartProviderFactoryIdeImpl : PackagePartProviderFactory() {
-    override fun createPackagePartProviderForLibrary(scope: GlobalSearchScope): PackagePartProvider {
+    override fun createPackagePartProvider(scope: GlobalSearchScope): PackagePartProvider {
         return IDEPackagePartProvider(scope)
     }
 }
\ No newline at end of file

plugins/kotlin/plugin/k2/resources/META-INF/lowLevelApiFir.xml

@@ -4,9 +4,6 @@
     <projectService serviceInterface="org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.FirSealedClassInheritorsProcessorFactory"
                     serviceImplementation="org.jetbrains.kotlin.idea.fir.low.level.api.ide.FirSealedClassInheritorsProcessorFactoryIdeImpl"/>
 
-    <projectService serviceInterface="org.jetbrains.kotlin.analysis.low.level.api.fir.api.services.PackagePartProviderFactory"
-                    serviceImplementation="org.jetbrains.kotlin.idea.fir.low.level.api.ide.PackagePartProviderFactoryIdeImpl"/>
-
     <projectService serviceImplementation="org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.LLFirBuiltinsSessionFactory"/>
     <projectService serviceImplementation="org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.LLFirLibrarySessionFactory"/>
     <projectService serviceImplementation="org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.LLFirNonUnderContentRootSessionFactory"/>