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

Create Class From Usage: Allow user to choose a target directory when creating class in the specific package

Browse Source
This commit is contained in:
Alexey Sedunov
2014-11-11 15:54:15 +03:00
parent a9f9049223
commit fd4fa9a042
4 changed files with 81 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSourceFilterScope.java
+1 -1
View File
@@ -59,6 +59,6 @@ public class JetSourceFilterScope extends DelegatingGlobalSearchScope {
return false;
}
return ProjectRootsUtil.isInSources(project, file, includeLibraries, /* withLibraryClassesRoots */ true, index);
return ProjectRootsUtil.isInSources(project, file, /* includeTestSources */ false, includeLibraries, /* withLibraryClassesRoots */ true, index);
}
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt
+14 -9
View File
@@ -24,13 +24,14 @@ import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope
import org.jetbrains.jet.plugin.configuration.JetModuleTypeManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.PsiDirectory
public object ProjectRootsUtil {
platformStatic
public fun isInSources(project: Project, file: VirtualFile,
includeLibrarySources: Boolean, withLibraryClassesRoots: Boolean,
includeTestSources: Boolean, includeLibrarySources: Boolean, withLibraryClassesRoots: Boolean,
fileIndex: ProjectFileIndex = ProjectFileIndex.SERVICE.getInstance(project)): Boolean {
if (fileIndex.isInSourceContent(file)) {
if (fileIndex.isInSourceContent(file) || (includeTestSources && fileIndex.isInTestSourceContent(file))) {
return !JetModuleTypeManager.getInstance()!!.isKtFileInGradleProjectInWrongFolder(file, project)
}
@@ -40,16 +41,20 @@ public object ProjectRootsUtil {
}
platformStatic
public fun isInSource(element: PsiElement, includeLibrarySources: Boolean, withLibraryClassesRoots: Boolean = false): Boolean {
public fun isInSource(
element: PsiElement,
includeLibrarySources: Boolean,
includeTestSources: Boolean = false,
withLibraryClassesRoots: Boolean = false
): Boolean {
return runReadAction { (): Boolean ->
val containingFile = element.getContainingFile()
if (containingFile == null) return@runReadAction false
val virtualFile = containingFile.getVirtualFile()
if (virtualFile == null) return@runReadAction false
val virtualFile = when(element) {
is PsiDirectory -> element.getVirtualFile()
else -> element.getContainingFile()?.getVirtualFile()
} ?: return@runReadAction false
val project = element.getProject()
return@runReadAction isInSources(project, virtualFile, includeLibrarySources, withLibraryClassesRoots)
return@runReadAction isInSources(project, virtualFile, includeTestSources, includeLibrarySources, withLibraryClassesRoots)
}
}