Skip to content

Commit 6826000

Browse files
HaehnchenHaehnchen
committed
wrapped the deprecated "getBaseDir" for getting the project root directory
1 parent 5bddea9 commit 6826000

32 files changed

+100
-50
lines changed

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/SettingsForm.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.intellij.openapi.vfs.VirtualFile;
1414
import fr.adrienbrault.idea.symfony2plugin.stubs.util.IndexUtil;
1515
import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
16+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
1617
import fr.adrienbrault.idea.symfony2plugin.webDeployment.WebDeploymentUtil;
1718
import org.jetbrains.annotations.Nls;
1819
import org.jetbrains.annotations.NotNull;
@@ -175,7 +176,7 @@ private TextBrowseFolderListener createBrowseFolderListener(final JTextField tex
175176
return new TextBrowseFolderListener(fileChooserDescriptor) {
176177
@Override
177178
public void actionPerformed(ActionEvent e) {
178-
VirtualFile projectDirectory = project.getBaseDir();
179+
VirtualFile projectDirectory = ProjectUtil.getProjectDir(project);
179180
VirtualFile selectedFile = FileChooser.chooseFile(
180181
fileChooserDescriptor,
181182
project,

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/Symfony2ProjectComponent.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import fr.adrienbrault.idea.symfony2plugin.profiler.widget.SymfonyProfilerWidget;
2020
import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
2121
import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
22+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
2223
import fr.adrienbrault.idea.symfony2plugin.util.service.ServiceXmlParserFactory;
2324
import org.jetbrains.annotations.NotNull;
2425
import org.jetbrains.annotations.Nullable;
@@ -129,7 +130,7 @@ public Collection<File> getContainerFiles() {
129130
private void checkProject() {
130131
if(!this.isEnabled()
131132
&& !Settings.getInstance(project).dismissEnableNotification
132-
&& VfsUtil.findRelativeFile(this.project.getBaseDir(), "vendor", "symfony") != null
133+
&& VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(this.project), "vendor", "symfony") != null
133134
) {
134135

135136
IdeHelper.notifyEnableMessage(project);
@@ -155,12 +156,12 @@ public static boolean isEnabledForIndex(Project project) {
155156
return true;
156157
}
157158

158-
if(VfsUtil.findRelativeFile(project.getBaseDir(), "vendor", "symfony") != null) {
159+
if(VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), "vendor", "symfony") != null) {
159160
return true;
160161
}
161162

162163
// drupal8; this should not really here
163-
if(VfsUtil.findRelativeFile(project.getBaseDir(), "core", "vendor", "symfony") != null) {
164+
if(VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), "core", "vendor", "symfony") != null) {
164165
return true;
165166
}
166167

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/action/dict/TranslationFileModel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.intellij.openapi.vfs.VfsUtil;
44
import com.intellij.psi.PsiFile;
5+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
56
import fr.adrienbrault.idea.symfony2plugin.util.dict.SymfonyBundle;
67
import org.jetbrains.annotations.Nullable;
78

@@ -34,7 +35,7 @@ public void addWeight(int weight) {
3435

3536
@Nullable
3637
public String getRelativePath() {
37-
return VfsUtil.getRelativePath(psiFile.getVirtualFile(), psiFile.getProject().getBaseDir(), '/');
38+
return VfsUtil.getRelativePath(psiFile.getVirtualFile(), ProjectUtil.getProjectDir(psiFile), '/');
3839
}
3940

4041
public String getDomain() {

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/JavascriptServiceNameStrategy.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import fr.adrienbrault.idea.symfony2plugin.Settings;
88
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
99
import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
10+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
1011
import org.apache.commons.lang.StringUtils;
1112
import org.jetbrains.annotations.NotNull;
1213
import org.jetbrains.annotations.Nullable;
@@ -54,7 +55,7 @@ public static Object run(@NotNull Project project, @NotNull String className, @N
5455

5556
PhpClass aClass = PhpElementsUtil.getClass(project, className);
5657
if(aClass != null) {
57-
String relativePath = VfsUtil.getRelativePath(aClass.getContainingFile().getVirtualFile(), project.getBaseDir(), '/');
58+
String relativePath = VfsUtil.getRelativePath(aClass.getContainingFile().getVirtualFile(), ProjectUtil.getProjectDir(aClass), '/');
5859
if(relativePath != null) {
5960
jsonObject.addProperty("relativePath", relativePath);
6061
}

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetDirectoryReader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.intellij.openapi.vfs.VirtualFileVisitor;
77
import com.intellij.psi.PsiDirectory;
88
import fr.adrienbrault.idea.symfony2plugin.Settings;
9+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
910
import fr.adrienbrault.idea.symfony2plugin.util.SymfonyBundleUtil;
1011
import fr.adrienbrault.idea.symfony2plugin.util.dict.SymfonyBundle;
1112
import org.apache.commons.lang.StringUtils;
@@ -42,9 +43,8 @@ public AssetDirectoryReader(@NotNull String[] filterExtension, boolean includeBu
4243

4344
@Nullable
4445
private static VirtualFile getProjectAssetRoot(@NotNull Project project) {
45-
VirtualFile projectDirectory = project.getBaseDir();
4646
String webDirectoryName = Settings.getInstance(project).directoryToWeb;
47-
return VfsUtil.findRelativeFile(projectDirectory, webDirectoryName.split("/"));
47+
return VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), webDirectoryName.split("/"));
4848
}
4949

5050
@NotNull

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.jetbrains.php.lang.psi.elements.*;
1212
import fr.adrienbrault.idea.symfony2plugin.util.FilesystemUtil;
1313
import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
14+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
1415
import org.apache.commons.lang.StringUtils;
1516
import org.jetbrains.annotations.NotNull;
1617
import org.jetbrains.yaml.YAMLFileType;
@@ -171,7 +172,7 @@ public static Collection<VirtualFile> getConfigurations(@NotNull Project project
171172
Collection<VirtualFile> virtualFiles = new HashSet<>();
172173

173174
for (String[] path : paths) {
174-
VirtualFile configFile = VfsUtil.findRelativeFile(project.getBaseDir(), path);
175+
VirtualFile configFile = VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), path);
175176
if(configFile != null) {
176177
virtualFiles.add(configFile);
177178
}

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/completion/ConfigCompletionProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.intellij.util.containers.ContainerUtil;
1313
import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
1414
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
15+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
1516
import fr.adrienbrault.idea.symfony2plugin.util.yaml.YamlHelper;
1617
import org.apache.commons.lang.StringUtils;
1718
import org.apache.xerces.dom.CommentImpl;
@@ -81,7 +82,7 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters
8182
// reverse to get top most item first
8283
Collections.reverse(items);
8384

84-
Document document = getConfigTemplate(element.getProject().getBaseDir());
85+
Document document = getConfigTemplate(ProjectUtil.getProjectDir(element));
8586
if(document == null) {
8687
return;
8788
}
@@ -332,7 +333,7 @@ private Map<String, String> getNodeCommentVars(@Nullable Node node) {
332333

333334
private void attachRootConfig(CompletionResultSet completionResultSet, PsiElement element) {
334335

335-
Document document = getConfigTemplate(element.getProject().getBaseDir());
336+
Document document = getConfigTemplate(ProjectUtil.getProjectDir(element));
336337
if(document == null) {
337338
return;
338339
}

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ContainerFile.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.intellij.openapi.vfs.VirtualFile;
77
import com.intellij.util.xmlb.annotations.Tag;
88
import fr.adrienbrault.idea.symfony2plugin.ui.dict.AbstractUiFilePath;
9+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
910
import org.jetbrains.annotations.Nullable;
1011

1112
import java.io.File;
@@ -26,7 +27,7 @@ public ContainerFile(String path) {
2627
@Nullable
2728
public File getFile(Project project) {
2829
if (!FileUtil.isAbsolute(this.path)) {
29-
VirtualFile virtualFile = VfsUtil.findRelativeFile(this.path, project.getBaseDir());
30+
VirtualFile virtualFile = VfsUtil.findRelativeFile(this.path, ProjectUtil.getProjectDir(project));
3031
if(virtualFile == null) {
3132
return null;
3233
}

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/DotEnvUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.intellij.psi.search.FilenameIndex;
1212
import com.intellij.psi.search.GlobalSearchScope;
1313
import com.intellij.psi.util.*;
14+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
1415
import fr.adrienbrault.idea.symfony2plugin.util.yaml.YamlHelper;
1516
import org.apache.commons.lang.StringUtils;
1617
import org.jetbrains.annotations.NotNull;
@@ -102,7 +103,7 @@ private static void visitEnvironment(@NotNull Project project, @NotNull Consumer
102103
}
103104

104105
// search root directory for all ".env*" files
105-
VirtualFile projectDir = VfsUtil.findRelativeFile(project.getBaseDir());
106+
VirtualFile projectDir = VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project));
106107
if (projectDir != null) {
107108
for (VirtualFile child : projectDir.getChildren()) {
108109
if (child.getName().startsWith(".env")) {

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ private static Collection<String> getContainerFilesInner(@NotNull Project projec
697697

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

702702
VirtualFile relativeFile = VfsUtil.findRelativeFile(root, baseDir);
703703
if (relativeFile == null) {

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/intention/PhpServiceArgumentIntention.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import fr.adrienbrault.idea.symfony2plugin.action.ServiceActionUtil;
1818
import fr.adrienbrault.idea.symfony2plugin.stubs.ContainerCollectionResolver;
1919
import fr.adrienbrault.idea.symfony2plugin.stubs.ServiceIndexUtil;
20+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
2021
import org.jetbrains.annotations.Nls;
2122
import org.jetbrains.annotations.NotNull;
2223
import org.jetbrains.yaml.psi.YAMLKeyValue;
@@ -54,7 +55,7 @@ public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement
5455
Map<String, PsiElement> map = new HashMap<>();
5556

5657
for (PsiElement element : psiElements) {
57-
map.put(VfsUtil.getRelativePath(element.getContainingFile().getVirtualFile(), element.getProject().getBaseDir()), element);
58+
map.put(VfsUtil.getRelativePath(element.getContainingFile().getVirtualFile(), ProjectUtil.getProjectDir(element)), element);
5859
}
5960

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

99-
String relativePath = VfsUtil.getRelativePath(psiElement.getContainingFile().getVirtualFile(), psiElement.getProject().getBaseDir());
100+
String relativePath = VfsUtil.getRelativePath(psiElement.getContainingFile().getVirtualFile(), ProjectUtil.getProjectDir(psiElement));
100101
if (relativePath == null) {
101102
relativePath = "n/a";
102103
}

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/factory/LocalProfilerFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
88
import fr.adrienbrault.idea.symfony2plugin.profiler.LocalProfilerIndex;
99
import fr.adrienbrault.idea.symfony2plugin.profiler.ProfilerIndexInterface;
10+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
1011
import org.apache.commons.lang.StringUtils;
1112
import org.jetbrains.annotations.NotNull;
1213
import org.jetbrains.annotations.Nullable;
@@ -47,7 +48,7 @@ private File findCsvProfilerFile(@NotNull Project project) {
4748
return getCsvIndex(project);
4849
}
4950

50-
VirtualFile relativeFile = VfsUtil.findRelativeFile(project.getBaseDir(), profilerCsvPath.replace("\\", "/").split("/"));
51+
VirtualFile relativeFile = VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), profilerCsvPath.replace("\\", "/").split("/"));
5152
if (relativeFile != null) {
5253
return VfsUtil.virtualToIoFile(relativeFile);
5354
}

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.intellij.openapi.vfs.VfsUtil;
1212
import com.intellij.openapi.vfs.VirtualFile;
1313
import fr.adrienbrault.idea.symfony2plugin.Settings;
14+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
1415
import org.jetbrains.annotations.Nls;
1516
import org.jetbrains.annotations.NotNull;
1617
import org.jetbrains.annotations.Nullable;
@@ -114,7 +115,7 @@ private TextBrowseFolderListener createBrowseFolderListener(final JTextField tex
114115
return new TextBrowseFolderListener(fileChooserDescriptor) {
115116
@Override
116117
public void actionPerformed(ActionEvent e) {
117-
VirtualFile projectDirectory = project.getBaseDir();
118+
VirtualFile projectDirectory = ProjectUtil.getProjectDir(project);
118119

119120
String text = textField.getText();
120121
VirtualFile toSelect = VfsUtil.findRelativeFile(text, projectDirectory);

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerBuilderStubIndex.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import fr.adrienbrault.idea.symfony2plugin.dic.container.dict.ContainerBuilderCall;
2323
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
2424
import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
25+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
2526
import gnu.trove.THashMap;
2627
import one.util.streamex.StreamEx;
2728
import org.apache.commons.lang.StringUtils;
@@ -123,7 +124,7 @@ private static boolean isValidForIndex(FileContent inputData, PsiFile psiFile) {
123124
}
124125

125126
// is Test file in path name
126-
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), psiFile.getProject().getBaseDir(), '/');
127+
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), ProjectUtil.getProjectDir(psiFile), '/');
127128
if(relativePath != null && (relativePath.contains("/Test/") || relativePath.contains("/Tests/") || relativePath.contains("/Fixture/") || relativePath.contains("/Fixtures/"))) {
128129
return false;
129130
}

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/RoutesStubIndex.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import fr.adrienbrault.idea.symfony2plugin.stubs.dict.StubIndexedRoute;
1919
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
2020
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.visitor.AnnotationRouteElementWalkingVisitor;
21+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
2122
import gnu.trove.THashMap;
2223
import org.jetbrains.annotations.NotNull;
2324
import org.jetbrains.yaml.YAMLFileType;
@@ -123,7 +124,7 @@ private static boolean isValidForIndex(FileContent inputData, PsiFile psiFile) {
123124
return false;
124125
}
125126

126-
VirtualFile baseDir = inputData.getProject().getBaseDir();
127+
VirtualFile baseDir = ProjectUtil.getProjectDir(psiFile);
127128
if(baseDir == null) {
128129
return false;
129130
}

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesDefinitionStubIndex.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import fr.adrienbrault.idea.symfony2plugin.dic.container.ServiceSerializable;
1212
import fr.adrienbrault.idea.symfony2plugin.dic.container.util.ServiceContainerUtil;
1313
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer;
14+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
1415
import gnu.trove.THashMap;
1516
import org.jetbrains.annotations.NotNull;
1617
import org.jetbrains.yaml.YAMLFileType;
@@ -101,7 +102,7 @@ public static boolean isValidForIndex(FileContent inputData, PsiFile psiFile) {
101102

102103
// possible fixture or test file
103104
// to support also library paths, only filter them on project files
104-
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), psiFile.getProject().getBaseDir(), '/');
105+
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), ProjectUtil.getProjectDir(psiFile), '/');
105106
if(relativePath != null && (relativePath.contains("/Test/") || relativePath.contains("/Tests/") || relativePath.contains("/Fixture/") || relativePath.contains("/Fixtures/"))) {
106107
return false;
107108
}

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.StringSetDataExternalizer;
1111
import fr.adrienbrault.idea.symfony2plugin.translation.collector.YamlTranslationVisitor;
1212
import fr.adrienbrault.idea.symfony2plugin.translation.dict.TranslationUtil;
13+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
1314
import gnu.trove.THashMap;
1415
import org.apache.commons.lang.StringUtils;
1516
import org.jetbrains.annotations.NotNull;
@@ -82,7 +83,7 @@ private boolean isValidTranslationFile(@NotNull FileContent inputData, @NotNull
8283
// dont index all yaml files; valid:
8384
// - "Resources/translations"
8485
// - "translations/[.../]foo.de.yml"
85-
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), psiFile.getProject().getBaseDir(), '/');
86+
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), ProjectUtil.getProjectDir(psiFile), '/');
8687
if(relativePath != null) {
8788
return relativePath.contains("/translations") || relativePath.startsWith("translations/");
8889
}
@@ -96,7 +97,7 @@ private boolean isValidTranslationFile(@NotNull FileContent inputData, @NotNull
9697
@NotNull
9798
private Map<String, Set<String>> getXlfStringMap(@NotNull FileContent inputData) {
9899
// testing files are not that nice
99-
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), inputData.getProject().getBaseDir(), '/');
100+
String relativePath = VfsUtil.getRelativePath(inputData.getFile(), ProjectUtil.getProjectDir(inputData.getPsiFile()), '/');
100101
if(relativePath != null && (relativePath.contains("/Test/") || relativePath.contains("/Tests/") || relativePath.contains("/Fixture/") || relativePath.contains("/Fixtures/"))) {
101102
return Collections.emptyMap();
102103
}

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import fr.adrienbrault.idea.symfony2plugin.twig.loader.FileImplementsLazyLoader;
3333
import fr.adrienbrault.idea.symfony2plugin.twig.loader.FileOverwritesLazyLoader;
3434
import fr.adrienbrault.idea.symfony2plugin.twig.utils.TwigBlockUtil;
35+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
3536
import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils;
3637
import icons.TwigIcons;
3738
import org.apache.commons.lang.StringUtils;
@@ -310,7 +311,7 @@ public String getElementText(PsiElement psiElement) {
310311
protected String getContainerText(PsiElement psiElement, String s) {
311312
// relative path else fallback to default name extraction
312313
PsiFile containingFile = psiElement.getContainingFile();
313-
String relativePath = VfsUtil.getRelativePath(containingFile.getVirtualFile(), psiElement.getProject().getBaseDir(), '/');
314+
String relativePath = VfsUtil.getRelativePath(containingFile.getVirtualFile(), ProjectUtil.getProjectDir(psiElement), '/');
314315
return relativePath != null ? relativePath : SymbolPresentationUtil.getSymbolContainerText(psiElement);
315316
}
316317

‎src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TemplateCreateByNameLocalQuickFix.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.jetbrains.twig.TwigFileType;
1717
import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
1818
import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper;
19+
import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
1920
import org.jetbrains.annotations.Nls;
2021
import org.jetbrains.annotations.NotNull;
2122
import org.jetbrains.annotations.Nullable;
@@ -102,12 +103,12 @@ private static void createFile(@NotNull Project project, @NotNull String relativ
102103

103104
int i = relativePath.lastIndexOf("/");
104105
if(i > 0) {
105-
relativeBlockScopeFile = VfsUtil.findRelativeFile(project.getBaseDir(), relativePath.substring(0, i).split("/"));
106+
relativeBlockScopeFile = VfsUtil.findRelativeFile(ProjectUtil.getProjectDir(project), relativePath.substring(0, i).split("/"));
106107
}
107108

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

110-
IdeHelper.RunnableCreateAndOpenFile runnableCreateAndOpenFile = IdeHelper.getRunnableCreateAndOpenFile(project, TwigFileType.INSTANCE, project.getBaseDir(), relativePath);
111+
IdeHelper.RunnableCreateAndOpenFile runnableCreateAndOpenFile = IdeHelper.getRunnableCreateAndOpenFile(project, TwigFileType.INSTANCE, ProjectUtil.getProjectDir(project), relativePath);
111112
if(content != null) {
112113
runnableCreateAndOpenFile.setContent(content);
113114
}

0 commit comments

Comments
 (0)