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

EA-127607 - IAE: VfsUtilCore.$$$reportNull$$$

Browse Source
This commit is contained in:
Sergey Simonchik
2018-09-17 18:48:16 +03:00
parent c60b8aab8f
commit 46d29c54b4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java
+10 -3
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.util.ClassLoaderUtil;
import com.intellij.openapi.util.ThrowableComputable;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.util.ArrayUtil;
@@ -305,9 +306,9 @@ public class FileTemplateUtil {
}
}
propsMap.put(FileTemplate.ATTRIBUTE_FILE_NAME, fileName + (StringUtil.isEmpty(template.getExtension()) ? "" : "." + template.getExtension()));
String path = VfsUtilCore.getRelativePath(directory.getVirtualFile(), directory.getProject().getBaseDir());
if (path != null) {
propsMap.put(FileTemplate.ATTRIBUTE_DIR_PATH, path);
String dirPath = getDirPathRelativeToProjectBaseDir(directory);
if (dirPath != null) {
propsMap.put(FileTemplate.ATTRIBUTE_DIR_PATH, dirPath);
}
//Set escaped references to dummy values to remove leading "\" (if not already explicitly set)
@@ -331,6 +332,12 @@ public class FileTemplateUtil {
.compute(()->handler.createFromTemplate(project, directory, fileName_, template, templateText, props_));
}
@Nullable
private static String getDirPathRelativeToProjectBaseDir(@NotNull PsiDirectory directory) {
VirtualFile baseDir = directory.getProject().getBaseDir();
return baseDir != null ? VfsUtilCore.getRelativePath(directory.getVirtualFile(), baseDir) : null;
}
@NotNull
public static CreateFromTemplateHandler findHandler(@NotNull FileTemplate template) {
for (CreateFromTemplateHandler handler : Extensions.getExtensions(CreateFromTemplateHandler.EP_NAME)) {