azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PluginDeclarationProviderFactoryService: remove special treatment for Kotlin/Javascript projects

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-04-16 23:15:55 +03:00
parent 23da4f0897
commit ebcc29b907
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactoryService.kt
+3 -12
View File
@@ -18,12 +18,11 @@ package org.jetbrains.kotlin.idea.stubindex.resolve
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope
import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService
import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope
import org.jetbrains.kotlin.idea.caches.resolve.JsProjectDetector
public class PluginDeclarationProviderFactoryService : DeclarationProviderFactoryService() { public class PluginDeclarationProviderFactoryService : DeclarationProviderFactoryService() {
@@ -32,14 +31,6 @@ public class PluginDeclarationProviderFactoryService : DeclarationProviderFactor
storageManager: StorageManager, storageManager: StorageManager,
syntheticFiles: Collection<JetFile>, syntheticFiles: Collection<JetFile>,
filesScope: GlobalSearchScope filesScope: GlobalSearchScope
): DeclarationProviderFactory { ): DeclarationProviderFactory =
val scope = if (JsProjectDetector.isJsProject(project)) { PluginDeclarationProviderFactory(project, JetSourceFilterScope.kotlinSources(filesScope, project), storageManager, syntheticFiles)
//NOTE: we include libraries here to support analyzing JavaScript libraries which are kotlin sources in classes root
JetSourceFilterScope.kotlinSourcesAndLibraries(filesScope, project)
}
else {
JetSourceFilterScope.kotlinSources(filesScope, project)
}
return PluginDeclarationProviderFactory(project, scope, storageManager, syntheticFiles)
}
} }