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

more appropriate solution for name clashing in case of VirtualFilePathWrapper (part of DBE-704)

Browse Source
This commit is contained in:
Sergey Ignatov
2014-09-26 17:24:02 +04:00
parent 39b42a0c0e
commit 32082ecc48
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2014 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.
@@ -55,7 +55,7 @@ public class ProjectUtil {
final boolean includeFilePath,
final boolean includeUniqueFilePath,
final boolean keepModuleAlwaysOnTheLeft) {
if (file instanceof VirtualFilePathWrapper) {
if (file instanceof VirtualFilePathWrapper && ((VirtualFilePathWrapper)file).enforcePresentableName()) {
return includeFilePath ? ((VirtualFilePathWrapper)file).getPresentablePath() : file.getName();
}
String url;
platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueNameEditorTabTitleProvider.java
+1 -1
View File
@@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile;
public class UniqueNameEditorTabTitleProvider implements EditorTabTitleProvider {
@Override
public String getEditorTabTitle(Project project, VirtualFile file) {
if (!UISettings.getInstance().SHOW_DIRECTORY_FOR_NON_UNIQUE_FILENAMES || DumbService.isDumb(project) || !file.isInLocalFileSystem()) {
if (!UISettings.getInstance().SHOW_DIRECTORY_FOR_NON_UNIQUE_FILENAMES || DumbService.isDumb(project)) {
return null;
}
final String uniqueName = UniqueVFilePathBuilder.getInstance().getUniqueVirtualFilePathWithinOpenedFileEditors(project, file);
platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueVFilePathBuilderImpl.java
+4
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.io.UniqueNameBuilder;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFilePathWrapper;
import com.intellij.psi.search.FilenameIndex;
import com.intellij.psi.search.ProjectScope;
import gnu.trove.THashSet;
@@ -63,6 +64,9 @@ public class UniqueVFilePathBuilderImpl extends UniqueVFilePathBuilder {
filesWithSameName = setOfFilesWithTheSameName;
if (filesWithSameName.size() > 1 && filesWithSameName.contains(file)) {
if (file instanceof VirtualFilePathWrapper) {
return ((VirtualFilePathWrapper)file).getPresentablePath();
}
String path = project.getBasePath();
path = path == null ? "" : FileUtil.toSystemIndependentName(path);
UniqueNameBuilder<VirtualFile> builder = new UniqueNameBuilder<VirtualFile>(path, File.separator, 25);
platform/platform-api/src/com/intellij/openapi/vfs/VirtualFilePathWrapper.java
+3 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
* Copyright 2000-2014 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.
@@ -29,4 +29,6 @@ import org.jetbrains.annotations.NotNull;
public interface VirtualFilePathWrapper {
@NotNull
String getPresentablePath();
boolean enforcePresentableName();
}
platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
+1 -1
View File
@@ -1128,7 +1128,7 @@ public class Switcher extends AnAction implements DumbAware {
if (value instanceof FileInfo) {
Project project = mySwitcherPanel.project;
VirtualFile virtualFile = ((FileInfo)value).getFirst();
String name = virtualFile instanceof VirtualFilePathWrapper
String name = virtualFile instanceof VirtualFilePathWrapper && ((VirtualFilePathWrapper)virtualFile).enforcePresentableName()
? ((VirtualFilePathWrapper)virtualFile).getPresentablePath()
: UISettings.getInstance().SHOW_DIRECTORY_FOR_NON_UNIQUE_FILENAMES
? UniqueVFilePathBuilder.getInstance().getUniqueVirtualFilePath(project, virtualFile)