From 65e4f2e0054dffa9938d66811890fb0c07e450b9 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Thu, 5 Mar 2015 00:11:31 +0300 Subject: [PATCH] Scratches: substitute directory names too --- .../src/com/intellij/ide/scratch/ScratchFileServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java index 090127ed076d..a906c017c143 100644 --- a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java @@ -282,8 +282,8 @@ public class ScratchFileServiceImpl extends ScratchFileService implements Persis if (virtualFile == null || !virtualFile.isValid()) return null; RootType rootType = ScratchFileService.getInstance().getRootType(virtualFile); if (rootType == null) return null; - if (virtualFile.isDirectory()) { - return additionalRoots(project).contains(virtualFile) ? rootType.getDisplayName() : null; + if (virtualFile.isDirectory() && additionalRoots(project).contains(virtualFile)) { + return rootType.getDisplayName(); } return rootType.substituteName(project, virtualFile); }