MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

ipr file should be the same project

Browse Source
This commit is contained in:
Dennis Ushakov
2017-03-27 18:17:30 +03:00
parent f04c9cc2cd
commit de65871de4
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java
+4 -2
View File
@@ -33,6 +33,7 @@ import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.ActionCallback;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.wm.*;
@@ -298,10 +299,11 @@ public class ProjectUtil {
File parent = projectFile.getParentFile();
if (parent.getName().equals(Project.DIRECTORY_STORE_FOLDER)) {
projectFile = parent;
parent = parent.getParentFile();
return parent != null && FileUtil.pathsEqual(parent.getPath(), existingBaseDirPath);
}
return parent != null && FileUtil.pathsEqual(parent.getPath(), existingBaseDirPath) && projectFile.getName().equals(Project.DIRECTORY_STORE_FOLDER);
return FileUtil.pathsEqual(parent.getPath(), existingBaseDirPath) &&
ProjectFileType.DEFAULT_EXTENSION.equals(FileUtilRt.getExtension(projectFile.getName()));
}
public static void focusProjectWindow(final Project p, boolean executeIfAppInactive) {
platform/platform-tests/testSrc/com/intellij/openapi/project/impl/ProjectOpeningTest.java
+3 -1
View File
@@ -93,9 +93,11 @@ public class ProjectOpeningTest extends PlatformTestCase {
assertTrue(ProjectUtil.isSameProject(projectDir.getAbsolutePath(), dirBasedProject));
assertFalse(ProjectUtil.isSameProject(createTempDir("project2").getAbsolutePath(), dirBasedProject));
File iprFilePath = new File(projectDir, "project.ipr");
assertFalse(ProjectUtil.isSameProject(iprFilePath.getAbsolutePath(), dirBasedProject));
assertTrue(ProjectUtil.isSameProject(iprFilePath.getAbsolutePath(), dirBasedProject));
File miscXmlFilePath = new File(projectDir, ".idea/misc.xml");
assertTrue(ProjectUtil.isSameProject(miscXmlFilePath.getAbsolutePath(), dirBasedProject));
File someOtherFilePath = new File(projectDir, "misc.xml");
assertFalse(ProjectUtil.isSameProject(someOtherFilePath.getAbsolutePath(), dirBasedProject));
}
public void testIsSameProjectForFileBasedProject() throws IOException {