module("core-impl")
module("boot")
module("extensions")
+ module("indexing-api")
+ module("indexing-impl")
module("java-psi-api")
module("java-psi-impl")
}
import com.intellij.openapi.application.ApplicationInfo;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.options.ConfigurationException;
-import com.intellij.openapi.project.ProjectUtil;
+import com.intellij.openapi.project.ProjectCoreUtil;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
boolean shouldContinue = true;
final String path = myWizardContext.isCreatingNewProject() && myWizardContext.getProjectStorageFormat() == DIRECTORY_BASED
- ? getProjectFileDirectory() + "/" + ProjectUtil.DIRECTORY_BASED_PROJECT_DIR
+ ? getProjectFileDirectory() + "/" + ProjectCoreUtil.DIRECTORY_BASED_PROJECT_DIR
: getProjectFilePath();
final File projectFile = new File(path);
if (projectFile.exists()) {
? IdeBundle.message("title.new.project")
: IdeBundle.message("title.add.module");
final String message = myWizardContext.isCreatingNewProject() && myWizardContext.getProjectStorageFormat() == DIRECTORY_BASED
- ? IdeBundle.message("prompt.overwrite.project.folder", ProjectUtil.DIRECTORY_BASED_PROJECT_DIR,
+ ? IdeBundle.message("prompt.overwrite.project.folder", ProjectCoreUtil.DIRECTORY_BASED_PROJECT_DIR,
projectFile.getParentFile().getAbsolutePath())
: IdeBundle.message("prompt.overwrite.project.file", projectFile.getAbsolutePath(),
myWizardContext.getPresentationName());
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.intellij.ide.highlighter;
+package com.intellij.openapi.fileTypes;
import com.intellij.openapi.fileTypes.FileType;
--- /dev/null
+package com.intellij.openapi.project;
+
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.fileTypes.InternalFileType;
+import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NonNls;
+
+/**
+ * Author: dmitrylomov
+ */
+public class ProjectCoreUtil {
+ @NonNls public static final String DIRECTORY_BASED_PROJECT_DIR = ".idea";
+
+ public static boolean isProjectOrWorkspaceFile(final VirtualFile file) {
+ return isProjectOrWorkspaceFile(file, file.getFileType());
+ }
+
+ public static boolean isProjectOrWorkspaceFile(final VirtualFile file,
+ final FileType fileType) {
+ if (fileType instanceof InternalFileType) return true;
+ return file.getPath().contains("/"+ DIRECTORY_BASED_PROJECT_DIR +"/");
+ }
+}
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.fileTypes.impl.CustomSyntaxTableFileType;
-import com.intellij.openapi.project.ProjectUtil;
+import com.intellij.openapi.project.ProjectCoreUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.indexing.*;
import com.intellij.util.io.DataExternalizer;
@Override
public boolean acceptInput(final VirtualFile file) {
final FileType fileType = file.getFileType();
- return isIndexable(fileType) && !ProjectUtil.isProjectOrWorkspaceFile(file, fileType);
+ return isIndexable(fileType) && !ProjectCoreUtil.isProjectOrWorkspaceFile(file, fileType);
}
};
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectCoreUtil;
import com.intellij.openapi.project.ProjectUtil;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.roots.impl.FileIndexImplUtil;
@NotNull final PsiManager psiManager,
final boolean needReadAction) {
if (fileOrDir.isDirectory()) return true;
- if (ProjectUtil.isProjectOrWorkspaceFile(fileOrDir)) return true;
+ if (ProjectCoreUtil.isProjectOrWorkspaceFile(fileOrDir)) return true;
if (projectFileIndex.isInContent(fileOrDir) && (myIncludeTestSource || !projectFileIndex.isInTestSourceContent(fileOrDir))) {
return processFile(fileOrDir, visitor, psiManager, needReadAction);
}
package com.intellij.openapi.project;
import com.intellij.ide.DataManager;
-import com.intellij.ide.highlighter.InternalFileType;
+import com.intellij.openapi.fileTypes.InternalFileType;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.fileEditor.UniqueVFilePathBuilder;
/**
* @author max
*/
-public class ProjectUtil {
- @NonNls public static final String DIRECTORY_BASED_PROJECT_DIR = ".idea";
+public class ProjectUtil extends ProjectCoreUtil {
private ProjectUtil() { }
return ProjectLocator.getInstance().guessProjectForFile(file);
}
- public static boolean isProjectOrWorkspaceFile(final VirtualFile file) {
- return isProjectOrWorkspaceFile(file, file.getFileType());
- }
-
- public static boolean isProjectOrWorkspaceFile(final VirtualFile file,
- final FileType fileType) {
- if (fileType instanceof InternalFileType) return true;
- return file.getPath().contains("/"+ DIRECTORY_BASED_PROJECT_DIR +"/");
- }
-
@NotNull
public static Project guessCurrentProject(JComponent component) {
Project project = null;
import com.intellij.openapi.fileTypes.FileTypes;
import com.intellij.openapi.progress.*;
import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectUtil;
+import com.intellij.openapi.project.ProjectCoreUtil;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
if(isRecursive) {
PsiDirectory[] directories = psiDirectory.getSubdirectories();
for (PsiDirectory directory : directories) {
- if (!ProjectUtil.DIRECTORY_BASED_PROJECT_DIR.equals(directory.getName())) {
+ if (!ProjectCoreUtil.DIRECTORY_BASED_PROJECT_DIR.equals(directory.getName())) {
addToPsiFileList(directory, filesList, isRecursive);
}
}
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectUtil;
+import com.intellij.openapi.project.ProjectCoreUtil;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.vfs.VirtualFile;
final VirtualFile virtualFile = psiRoot.getContainingFile().getVirtualFile();
if (virtualFile == null || !virtualFile.isValid()) return false;
- if (ProjectUtil.isProjectOrWorkspaceFile(virtualFile)) return false;
+ if (ProjectCoreUtil.isProjectOrWorkspaceFile(virtualFile)) return false;
final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
if (ProjectScope.getLibrariesScope(project).contains(virtualFile) && !fileIndex.isInContent(virtualFile)) return false;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
-import com.intellij.openapi.project.DumbService;
-import com.intellij.openapi.project.IndexNotReadyException;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectUtil;
+import com.intellij.openapi.project.*;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.roots.impl.FileIndexImplUtil;
import com.intellij.openapi.ui.MessageType;
long fileLength = getFileLength(virtualFile);
if (fileLength == -1) continue; // Binary or invalid
- if (ProjectUtil.isProjectOrWorkspaceFile(virtualFile) && !Registry.is("find.search.in.project.files")) continue;
+ if (ProjectCoreUtil.isProjectOrWorkspaceFile(virtualFile) && !Registry.is("find.search.in.project.files")) continue;
if (fileLength > SINGLE_FILE_SIZE_LIMIT) {
largeFiles.add(psiFile);
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.fileTypes.impl.CustomSyntaxTableFileType;
-import com.intellij.openapi.project.ProjectUtil;
+import com.intellij.openapi.project.ProjectCoreUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.impl.cache.impl.id.IdTableBuilding;
}
final FileType fileType = file.getFileType();
- if (ProjectUtil.isProjectOrWorkspaceFile(file, fileType)) {
+ if (ProjectCoreUtil.isProjectOrWorkspaceFile(file, fileType)) {
return false;
}
package com.intellij.ide.highlighter;
import com.intellij.ide.IdeBundle;
+import com.intellij.openapi.fileTypes.InternalFileType;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.openapi.vfs.VirtualFile;
package com.intellij.ide.highlighter;
import com.intellij.ide.IdeBundle;
+import com.intellij.openapi.fileTypes.InternalFileType;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.openapi.vfs.VirtualFile;
package com.intellij.ide.highlighter;
import com.intellij.ide.IdeBundle;
+import com.intellij.openapi.fileTypes.InternalFileType;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.actionSystem.Separator;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.PersistentStateComponent;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectManager;
-import com.intellij.openapi.project.ProjectManagerAdapter;
-import com.intellij.openapi.project.ProjectUtil;
+import com.intellij.openapi.project.*;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.SystemInfo;
}
if (myState.lastPath != null) {
File lastFile = new File(myState.lastPath);
- if (lastFile.isDirectory() && !new File(lastFile, ProjectUtil.DIRECTORY_BASED_PROJECT_DIR).exists()) {
+ if (lastFile.isDirectory() && !new File(lastFile, ProjectCoreUtil.DIRECTORY_BASED_PROJECT_DIR).exists()) {
myState.lastPath = null;
}
}
public static boolean isValidProjectPath(String projectPath) {
final File file = new File(projectPath);
- return file.exists() && (!file.isDirectory() || new File(file, ProjectUtil.DIRECTORY_BASED_PROJECT_DIR).exists());
+ return file.exists() && (!file.isDirectory() || new File(file, ProjectCoreUtil.DIRECTORY_BASED_PROJECT_DIR).exists());
}
private class MyProjectManagerListener extends ProjectManagerAdapter {
import com.intellij.openapi.components.impl.stores.IProjectStore;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectCoreUtil;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.project.ex.ProjectEx;
import com.intellij.openapi.project.ex.ProjectManagerEx;
}
if (path.endsWith(ProjectFileType.DOT_DEFAULT_EXTENSION) ||
- virtualFile.isDirectory() && virtualFile.findChild(com.intellij.openapi.project.ProjectUtil.DIRECTORY_BASED_PROJECT_DIR) != null) {
+ virtualFile.isDirectory() && virtualFile.findChild(ProjectCoreUtil.DIRECTORY_BASED_PROJECT_DIR) != null) {
return openProject(path, projectToClose, forceOpenInNewFrame);
}
return null;
}
- if (file.isDirectory() && !new File(file, com.intellij.openapi.project.ProjectUtil.DIRECTORY_BASED_PROJECT_DIR).exists()) {
- Messages.showErrorDialog(IdeBundle.message("error.project.file.does.not.exist", new File(file, com.intellij.openapi.project.ProjectUtil.DIRECTORY_BASED_PROJECT_DIR).getPath()), CommonBundle.getErrorTitle());
+ if (file.isDirectory() && !new File(file, ProjectCoreUtil.DIRECTORY_BASED_PROJECT_DIR).exists()) {
+ Messages.showErrorDialog(IdeBundle.message("error.project.file.does.not.exist", new File(file, ProjectCoreUtil.DIRECTORY_BASED_PROJECT_DIR).getPath()), CommonBundle.getErrorTitle());
return null;
}
}
/**
- * @deprecated use {@linkplain com.intellij.openapi.project.ProjectUtil#isProjectOrWorkspaceFile(com.intellij.openapi.vfs.VirtualFile)} (to remove in IDEA 13)
+ * @deprecated use {@linkplain com.intellij.openapi.project.ProjectCoreUtil#isProjectOrWorkspaceFile(com.intellij.openapi.vfs.VirtualFile)} (to remove in IDEA 13)
*/
@SuppressWarnings("UnusedDeclaration")
public static boolean isProjectOrWorkspaceFile(final VirtualFile file) {
- return com.intellij.openapi.project.ProjectUtil.isProjectOrWorkspaceFile(file);
+ return ProjectCoreUtil.isProjectOrWorkspaceFile(file);
}
}
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypes;
import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectUtil;
+import com.intellij.openapi.project.ProjectCoreUtil;
import com.intellij.openapi.project.ex.ProjectManagerEx;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
public static void reportProjectFileChangeIfNeeded(Project project, VirtualFile file) {
if (file != null && ! file.isDirectory()) {
- if (ProjectUtil.isProjectOrWorkspaceFile(file) || isProjectFile(file)) {
+ if (ProjectCoreUtil.isProjectOrWorkspaceFile(file) || isProjectFile(file)) {
ProjectManagerEx.getInstanceEx().saveChangedProjectFile(file, project);
}
}
final Set<VirtualFile> vfs = new HashSet<VirtualFile>();
for (VirtualFile vf : files) {
if (vf != null && ! vf.isDirectory()) {
- if (ProjectUtil.isProjectOrWorkspaceFile(vf) || isProjectFile(vf)) {
+ if (ProjectCoreUtil.isProjectOrWorkspaceFile(vf) || isProjectFile(vf)) {
vfs.add(vf);
}
}
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.*;
-import com.intellij.openapi.project.ProjectUtil;
+import com.intellij.openapi.project.ProjectCoreUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDirectory;
return false;
}
- if (ProjectUtil.isProjectOrWorkspaceFile(file)) return false;
+ if (ProjectCoreUtil.isProjectOrWorkspaceFile(file)) return false;
FileType type = file.getFileType();
return types.get(type.getName()) != null;
}
final VirtualFile virtualFile = file.getVirtualFile();
if (virtualFile == null) return false;
- if (ProjectUtil.isProjectOrWorkspaceFile(virtualFile)) return false;
+ if (ProjectCoreUtil.isProjectOrWorkspaceFile(virtualFile)) return false;
return isSupportedType(virtualFile.getFileType());
}
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.project.ProjectUtil;
+import com.intellij.openapi.project.ProjectCoreUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.impl.include.FileIncludeInfo;
import com.intellij.psi.impl.include.FileIncludeProvider;
@Override
public boolean acceptFile(VirtualFile file) {
final FileType fileType = file.getFileType();
- return fileType == XmlFileType.INSTANCE && !ProjectUtil.isProjectOrWorkspaceFile(file, fileType);
+ return fileType == XmlFileType.INSTANCE && !ProjectCoreUtil.isProjectOrWorkspaceFile(file, fileType);
}
@NotNull