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

do not call toCanonicalName twice

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-04-21 15:38:57 +02:00
parent 2fb861076b
commit 870a72ccd9
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+3 -4
View File
@@ -62,7 +62,6 @@ import javax.swing.*;
import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -485,13 +484,13 @@ public class ProjectManagerImpl extends ProjectManagerEx implements Disposable {
@Override
@Nullable
public Project convertAndLoadProject(@NotNull String filePath) throws IOException {
final String fp = toCanonicalName(filePath);
final ConversionResult conversionResult = ConversionService.getInstance().convert(fp);
final String canonicalFilePath = toCanonicalName(filePath);
final ConversionResult conversionResult = ConversionService.getInstance().convert(canonicalFilePath);
if (conversionResult.openingIsCanceled()) {
return null;
}
ProjectImpl project = createProject(null, toCanonicalName(filePath), false);
ProjectImpl project = createProject(null, canonicalFilePath, false);
if (!loadProjectWithProgress(project)) return null;
if (!conversionResult.conversionNotNeeded()) {
StartupManager.getInstance(project).registerPostStartupActivity(() -> conversionResult.postStartupActivity(project));