Skip to content

wrapped the deprecated "getBaseDir" for getting the project root directory #1457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2020
Merged

wrapped the deprecated "getBaseDir" for getting the project root directory #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/fr/adrienbrault/idea/symfony2plugin/SettingsForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.intellij.openapi.vfs.VirtualFile;
import fr.adrienbrault.idea.symfony2plugin.stubs.util.IndexUtil;
import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import fr.adrienbrault.idea.symfony2plugin.webDeployment.WebDeploymentUtil;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -175,7 +176,7 @@ private TextBrowseFolderListener createBrowseFolderListener(final JTextField tex
return new TextBrowseFolderListener(fileChooserDescriptor) {
@Override
public void actionPerformed(ActionEvent e) {
VirtualFile projectDirectory = project.getBaseDir();
VirtualFile projectDirectory = ProjectUtil.getProjectDir(project);
VirtualFile selectedFile = FileChooser.chooseFile(
fileChooserDescriptor,
project,
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/Symfony2ProjectComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import fr.adrienbrault.idea.symfony2plugin.profiler.widget.SymfonyProfilerWidget;
import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import fr.adrienbrault.idea.symfony2plugin.util.service.ServiceXmlParserFactory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -129,7 +130,7 @@ public Collection<File> getContainerFiles() {
private void checkProject() {
if(!this.isEnabled()
&& !Settings.getInstance(project).dismissEnableNotification
&& VfsUtil.findRelativeFile(this.project.getBaseDir(), "vendor", "symfony") != null
&& VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(this.project), "vendor", "symfony") != null
) {

IdeHelper.notifyEnableMessage(project);
Expand All @@ -155,12 +156,12 @@ public static boolean isEnabledForIndex(Project project) {
return true;
}

if(VfsUtil.findRelativeFile(project.getBaseDir(), "vendor", "symfony") != null) {
if(VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), "vendor", "symfony") != null) {
return true;
}

// drupal8; this should not really here
if(VfsUtil.findRelativeFile(project.getBaseDir(), "core", "vendor", "symfony") != null) {
if(VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), "core", "vendor", "symfony") != null) {
return true;
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/fr/adrienbrault/idea/symfony2plugin/action/dict/TranslationFileModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.psi.PsiFile;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import fr.adrienbrault.idea.symfony2plugin.util.dict.SymfonyBundle;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -34,7 +35,7 @@ public void addWeight(int weight) {

@Nullable
public String getRelativePath() {
return VfsUtil.getRelativePath(psiFile.getVirtualFile(), psiFile.getProject().getBaseDir(), '/');
return VfsUtil.getRelativePath(psiFile.getVirtualFile(), ProjectUtil.getProjectDir(psiFile), '/');
}

public String getDomain() {
Expand Down
3 changes: 2 additions & 1 deletion ...rienbrault/idea/symfony2plugin/action/generator/naming/JavascriptServiceNameStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import fr.adrienbrault.idea.symfony2plugin.Settings;
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import org.apache.commons.lang.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -54,7 +55,7 @@ public static Object run(@NotNull Project project, @NotNull String className, @N

PhpClass aClass = PhpElementsUtil.getClass(project, className);
if(aClass != null) {
String relativePath = VfsUtil.getRelativePath(aClass.getContainingFile().getVirtualFile(), project.getBaseDir(), '/');
String relativePath = VfsUtil.getRelativePath(aClass.getContainingFile().getVirtualFile(), ProjectUtil.getProjectDir(aClass), '/');
if(relativePath != null) {
jsonObject.addProperty("relativePath", relativePath);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetDirectoryReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.intellij.openapi.vfs.VirtualFileVisitor;
import com.intellij.psi.PsiDirectory;
import fr.adrienbrault.idea.symfony2plugin.Settings;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import fr.adrienbrault.idea.symfony2plugin.util.SymfonyBundleUtil;
import fr.adrienbrault.idea.symfony2plugin.util.dict.SymfonyBundle;
import org.apache.commons.lang.StringUtils;
Expand Down Expand Up @@ -42,9 +43,8 @@ public AssetDirectoryReader(@NotNull String[] filterExtension, boolean includeBu

@Nullable
private static VirtualFile getProjectAssetRoot(@NotNull Project project) {
VirtualFile projectDirectory = project.getBaseDir();
String webDirectoryName = Settings.getInstance(project).directoryToWeb;
return VfsUtil.findRelativeFile(projectDirectory, webDirectoryName.split("/"));
return VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), webDirectoryName.split("/"));
}

@NotNull
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.jetbrains.php.lang.psi.elements.*;
import fr.adrienbrault.idea.symfony2plugin.util.FilesystemUtil;
import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import org.apache.commons.lang.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.yaml.YAMLFileType;
Expand Down Expand Up @@ -171,7 +172,7 @@ public static Collection<VirtualFile> getConfigurations(@NotNull Project project
Collection<VirtualFile> virtualFiles = new HashSet<>();

for (String[] path : paths) {
VirtualFile configFile = VfsUtil.findRelativeFile(project.getBaseDir(), path);
VirtualFile configFile = VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), path);
if(configFile != null) {
virtualFiles.add(configFile);
}
Expand Down
5 changes: 3 additions & 2 deletions .../fr/adrienbrault/idea/symfony2plugin/config/yaml/completion/ConfigCompletionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.intellij.util.containers.ContainerUtil;
import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import fr.adrienbrault.idea.symfony2plugin.util.yaml.YamlHelper;
import org.apache.commons.lang.StringUtils;
import org.apache.xerces.dom.CommentImpl;
Expand Down Expand Up @@ -81,7 +82,7 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters
// reverse to get top most item first
Collections.reverse(items);

Document document = getConfigTemplate(element.getProject().getBaseDir());
Document document = getConfigTemplate(ProjectUtil.getProjectDir(element));
if(document == null) {
return;
}
Expand Down Expand Up @@ -332,7 +333,7 @@ private Map<String, String> getNodeCommentVars(@Nullable Node node) {

private void attachRootConfig(CompletionResultSet completionResultSet, PsiElement element) {

Document document = getConfigTemplate(element.getProject().getBaseDir());
Document document = getConfigTemplate(ProjectUtil.getProjectDir(element));
if(document == null) {
return;
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ContainerFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.xmlb.annotations.Tag;
import fr.adrienbrault.idea.symfony2plugin.ui.dict.AbstractUiFilePath;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import org.jetbrains.annotations.Nullable;

import java.io.File;
Expand All @@ -26,7 +27,7 @@ public ContainerFile(String path) {
@Nullable
public File getFile(Project project) {
if (!FileUtil.isAbsolute(this.path)) {
VirtualFile virtualFile = VfsUtil.findRelativeFile(this.path, project.getBaseDir());
VirtualFile virtualFile = VfsUtil.findRelativeFile(this.path, ProjectUtil.getProjectDir(project));
if(virtualFile == null) {
return null;
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.intellij.psi.search.FilenameIndex;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.*;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import fr.adrienbrault.idea.symfony2plugin.util.yaml.YamlHelper;
import org.apache.commons.lang.StringUtils;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -102,7 +103,7 @@ private static void visitEnvironment(@NotNull Project project, @NotNull Consumer
}

// search root directory for all ".env*" files
VirtualFile projectDir = VfsUtil.findRelativeFile(project.getBaseDir());
VirtualFile projectDir = VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project));
if (projectDir != null) {
for (VirtualFile child : projectDir.getChildren()) {
if (child.getName().startsWith(".env")) {
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ private static Collection<String> getContainerFilesInner(@NotNull Project projec

// several Symfony cache folder structures
for (String root : new String[] {"var/cache", "app/cache"}) {
VirtualFile baseDir = project.getBaseDir();
VirtualFile baseDir = ProjectUtil.getProjectDir(project);

VirtualFile relativeFile = VfsUtil.findRelativeFile(root, baseDir);
if (relativeFile == null) {
Expand Down
5 changes: 3 additions & 2 deletions ...n/java/fr/adrienbrault/idea/symfony2plugin/dic/intention/PhpServiceArgumentIntention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import fr.adrienbrault.idea.symfony2plugin.action.ServiceActionUtil;
import fr.adrienbrault.idea.symfony2plugin.stubs.ContainerCollectionResolver;
import fr.adrienbrault.idea.symfony2plugin.stubs.ServiceIndexUtil;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.yaml.psi.YAMLKeyValue;
Expand Down Expand Up @@ -54,7 +55,7 @@ public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement
Map<String, PsiElement> map = new HashMap<>();

for (PsiElement element : psiElements) {
map.put(VfsUtil.getRelativePath(element.getContainingFile().getVirtualFile(), element.getProject().getBaseDir()), element);
map.put(VfsUtil.getRelativePath(element.getContainingFile().getVirtualFile(), ProjectUtil.getProjectDir(element)), element);
}

final JBList<String> list = new JBList<>(map.keySet());
Expand Down Expand Up @@ -96,7 +97,7 @@ private void invokeByScope(@NotNull PsiElement psiElement, @NotNull Editor edito
return;
}

String relativePath = VfsUtil.getRelativePath(psiElement.getContainingFile().getVirtualFile(), psiElement.getProject().getBaseDir());
String relativePath = VfsUtil.getRelativePath(psiElement.getContainingFile().getVirtualFile(), ProjectUtil.getProjectDir(psiElement));
if (relativePath == null) {
relativePath = "n/a";
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/factory/LocalProfilerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
import fr.adrienbrault.idea.symfony2plugin.profiler.LocalProfilerIndex;
import fr.adrienbrault.idea.symfony2plugin.profiler.ProfilerIndexInterface;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import org.apache.commons.lang.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -47,7 +48,7 @@ private File findCsvProfilerFile(@NotNull Project project) {
return getCsvIndex(project);
}

VirtualFile relativeFile = VfsUtil.findRelativeFile(project.getBaseDir(), profilerCsvPath.replace("\\", "/").split("/"));
VirtualFile relativeFile = VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), profilerCsvPath.replace("\\", "/").split("/"));
if (relativeFile != null) {
return VfsUtil.virtualToIoFile(relativeFile);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import fr.adrienbrault.idea.symfony2plugin.Settings;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -114,7 +115,7 @@ private TextBrowseFolderListener createBrowseFolderListener(final JTextField tex
return new TextBrowseFolderListener(fileChooserDescriptor) {
@Override
public void actionPerformed(ActionEvent e) {
VirtualFile projectDirectory = project.getBaseDir();
VirtualFile projectDirectory = ProjectUtil.getProjectDir(project);

String text = textField.getText();
VirtualFile toSelect = VfsUtil.findRelativeFile(text, projectDirectory);
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerBuilderStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import fr.adrienbrault.idea.symfony2plugin.dic.container.dict.ContainerBuilderCall;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import gnu.trove.THashMap;
import one.util.streamex.StreamEx;
import org.apache.commons.lang.StringUtils;
Expand Down Expand Up @@ -123,7 +124,7 @@ private static boolean isValidForIndex(FileContent inputData, PsiFile psiFile) {
}

// is Test file in path name
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), psiFile.getProject().getBaseDir(), '/');
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), ProjectUtil.getProjectDir(psiFile), '/');
if(relativePath != null && (relativePath.contains("/Test/") || relativePath.contains("/Tests/") || relativePath.contains("/Fixture/") || relativePath.contains("/Fixtures/"))) {
return false;
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/RoutesStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import fr.adrienbrault.idea.symfony2plugin.stubs.dict.StubIndexedRoute;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.visitor.AnnotationRouteElementWalkingVisitor;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.yaml.YAMLFileType;
Expand Down Expand Up @@ -123,7 +124,7 @@ private static boolean isValidForIndex(FileContent inputData, PsiFile psiFile) {
return false;
}

VirtualFile baseDir = inputData.getProject().getBaseDir();
VirtualFile baseDir = ProjectUtil.getProjectDir(psiFile);
if(baseDir == null) {
return false;
}
Expand Down
3 changes: 2 additions & 1 deletion ...n/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesDefinitionStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import fr.adrienbrault.idea.symfony2plugin.dic.container.ServiceSerializable;
import fr.adrienbrault.idea.symfony2plugin.dic.container.util.ServiceContainerUtil;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.yaml.YAMLFileType;
Expand Down Expand Up @@ -101,7 +102,7 @@ public static boolean isValidForIndex(FileContent inputData, PsiFile psiFile) {

// possible fixture or test file
// to support also library paths, only filter them on project files
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), psiFile.getProject().getBaseDir(), '/');
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), ProjectUtil.getProjectDir(psiFile), '/');
if(relativePath != null && (relativePath.contains("/Test/") || relativePath.contains("/Tests/") || relativePath.contains("/Fixture/") || relativePath.contains("/Fixtures/"))) {
return false;
}
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.StringSetDataExternalizer;
import fr.adrienbrault.idea.symfony2plugin.translation.collector.YamlTranslationVisitor;
import fr.adrienbrault.idea.symfony2plugin.translation.dict.TranslationUtil;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import gnu.trove.THashMap;
import org.apache.commons.lang.StringUtils;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -82,7 +83,7 @@ private boolean isValidTranslationFile(@NotNull FileContent inputData, @NotNull
// dont index all yaml files; valid:
// - "Resources/translations"
// - "translations/[.../]foo.de.yml"
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), psiFile.getProject().getBaseDir(), '/');
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), ProjectUtil.getProjectDir(psiFile), '/');
if(relativePath != null) {
return relativePath.contains("/translations") || relativePath.startsWith("translations/");
}
Expand All @@ -96,7 +97,7 @@ private boolean isValidTranslationFile(@NotNull FileContent inputData, @NotNull
@NotNull
private Map<String, Set<String>> getXlfStringMap(@NotNull FileContent inputData) {
// testing files are not that nice
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), inputData.getProject().getBaseDir(), '/');
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), ProjectUtil.getProjectDir(inputData.getPsiFile()), '/');
if(relativePath != null && (relativePath.contains("/Test/") || relativePath.contains("/Tests/") || relativePath.contains("/Fixture/") || relativePath.contains("/Fixtures/"))) {
return Collections.emptyMap();
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import fr.adrienbrault.idea.symfony2plugin.twig.loader.FileImplementsLazyLoader;
import fr.adrienbrault.idea.symfony2plugin.twig.loader.FileOverwritesLazyLoader;
import fr.adrienbrault.idea.symfony2plugin.twig.utils.TwigBlockUtil;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils;
import icons.TwigIcons;
import org.apache.commons.lang.StringUtils;
Expand Down Expand Up @@ -310,7 +311,7 @@ public String getElementText(PsiElement psiElement) {
protected String getContainerText(PsiElement psiElement, String s) {
// relative path else fallback to default name extraction
PsiFile containingFile = psiElement.getContainingFile();
String relativePath = VfsUtil.getRelativePath(containingFile.getVirtualFile(), psiElement.getProject().getBaseDir(), '/');
String relativePath = VfsUtil.getRelativePath(containingFile.getVirtualFile(), ProjectUtil.getProjectDir(psiElement), '/');
return relativePath != null ? relativePath : SymbolPresentationUtil.getSymbolContainerText(psiElement);
}

Expand Down
5 changes: 3 additions & 2 deletions ...enbrault/idea/symfony2plugin/templating/inspection/TemplateCreateByNameLocalQuickFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.jetbrains.twig.TwigFileType;
import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -102,12 +103,12 @@ private static void createFile(@NotNull Project project, @NotNull String relativ

int i = relativePath.lastIndexOf("/");
if(i > 0) {
relativeBlockScopeFile = VfsUtil.findRelativeFile(project.getBaseDir(), relativePath.substring(0, i).split("/"));
relativeBlockScopeFile = VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), relativePath.substring(0, i).split("/"));
}

String content = TwigUtil.buildStringFromTwigCreateContainer(project, relativeBlockScopeFile);

IdeHelper.RunnableCreateAndOpenFile runnableCreateAndOpenFile = IdeHelper.getRunnableCreateAndOpenFile(project, TwigFileType.INSTANCE, project.getBaseDir(), relativePath);
IdeHelper.RunnableCreateAndOpenFile runnableCreateAndOpenFile = IdeHelper.getRunnableCreateAndOpenFile(project, TwigFileType.INSTANCE, ProjectUtil.getProjectDir(project), relativePath);
if(content != null) {
runnableCreateAndOpenFile.setContent(content);
}
Expand Down
Loading