Return correct ProjectFacade for script and its dependencies

^KT-22588 Fixed

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt

@@ -404,7 +404,12 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
 
     private fun getResolutionFacadeByModuleInfo(moduleInfo: IdeaModuleInfo, platform: TargetPlatform): ResolutionFacade {
         val settings = PlatformAnalysisSettings(platform, moduleInfo.sdk, moduleInfo.supportsAdditionalBuiltInsMembers())
-        val projectFacade = globalFacade(settings)
+        val projectFacade = when (moduleInfo) {
+            is ScriptDependenciesInfo.ForProject,
+            is ScriptDependenciesSourceInfo.ForProject -> facadesForScriptDependencies[null]
+            is ScriptDependenciesInfo.ForFile -> facadesForScriptDependencies[moduleInfo.scriptModuleInfo]
+            else -> globalFacade(settings)
+        }
         return ModuleResolutionFacadeImpl(projectFacade, moduleInfo)
     }
 

idea/testData/script/definition/highlighting/propertyAccessor/lib/test/Utils.java

@@ -0,0 +1,13 @@
+package test;
+
+public class Utils {
+    public int getField() {
+        return field;
+    }
+
+    public void setField(int field) {
+        this.field = field;
+    }
+
+    private int field = 1;
+}

idea/testData/script/definition/highlighting/propertyAccessor/script.kts

@@ -0,0 +1,4 @@
+test.Utils().field
+test.Utils().<caret>field = 2
+
+// DEPENDENCIES: classpath:lib-classes

idea/testData/script/definition/highlighting/propertyAccessorFromModule/mainModule/script.kts

@@ -0,0 +1,4 @@
+test.Utils().field
+test.Utils().<caret>field = 2
+
+// DEPENDENCIES: classpath:runtime-classes

idea/testData/script/definition/highlighting/propertyAccessorFromModule/mainModule/test/Utils.java

@@ -0,0 +1,13 @@
+package test;
+
+public class Utils {
+    public int getField() {
+        return field;
+    }
+
+    public void setField(int field) {
+        this.field = field;
+    }
+
+    private int field = 1;
+}

idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt

@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.idea.script
 
+import com.intellij.codeInsight.highlighting.HighlightUsagesHandler
 import com.intellij.openapi.extensions.Extensions
 import com.intellij.openapi.module.JavaModuleType
 import com.intellij.openapi.module.Module
@@ -51,6 +52,10 @@ import kotlin.script.dependencies.Environment
 abstract class AbstractScriptConfigurationHighlightingTest : AbstractScriptConfigurationTest() {
     fun doTest(path: String) {
         configureScriptFile(path)
+
+        // Highlight references at caret
+        HighlightUsagesHandler.invoke(project, editor, myFile)
+
         checkHighlighting(
             editor,
             InTextDirectivesUtils.isDirectiveDefined(file.text, "// CHECK_WARNINGS"),

idea/tests/org/jetbrains/kotlin/idea/script/ScriptConfigurationHighlightingTestGenerated.java

@@ -97,6 +97,18 @@ public class ScriptConfigurationHighlightingTestGenerated extends AbstractScript
         doTest(fileName);
     }
 
+    @TestMetadata("propertyAccessor")
+    public void testPropertyAccessor() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/script/definition/highlighting/propertyAccessor/");
+        doTest(fileName);
+    }
+
+    @TestMetadata("propertyAccessorFromModule")
+    public void testPropertyAccessorFromModule() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/script/definition/highlighting/propertyAccessorFromModule/");
+        doTest(fileName);
+    }
+
     @TestMetadata("simple")
     public void testSimple() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("idea/testData/script/definition/highlighting/simple/");