add new isEnabledForIndex check, to not force re-indexing for new projects, after enabling plugin

Author: Haehnchen

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

@@ -194,6 +194,28 @@ public static boolean isEnabled(Project project) {
  return Settings.getInstance(project).pluginEnabled;
  }
 
+ /**
+ * If plugin is not enabled on first project start/indexing we will never get a filled
+ * index until a forced cache rebuild, we check also for vendor path
+ */
+ public static boolean isEnabledForIndex(Project project) {
+
+ if(Settings.getInstance(project).pluginEnabled) {
+ return true;
+ }
+
+ if(VfsUtil.findRelativeFile(project.getBaseDir(), "vendor", "symfony") != null) {
+ return true;
+ }
+
+ // drupal8; this should not really here
+ if(VfsUtil.findRelativeFile(project.getBaseDir(), "core", "vendor", "symfony") != null) {
+ return true;
+ }
+
+ return false;
+ }
+
  public static boolean isEnabled(@Nullable PsiElement psiElement) {
  return psiElement != null && isEnabled(psiElement.getProject());
  }

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/AnnotationRoutesStubIndex.java

@@ -47,7 +47,7 @@ public Map<String, Void> map(FileContent inputData) {
  final Map<String, Void> map = new THashMap<String, Void>();
 
  PsiFile psiFile = inputData.getPsiFile();
- if(!Symfony2ProjectComponent.isEnabled(psiFile.getProject())) {
+ if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
  return map;
  }
 

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ContainerParameterStubIndex.java

@@ -42,7 +42,7 @@ public Map<String, String> map(FileContent inputData) {
  Map<String, String> map = new HashMap<String, String>();
 
  PsiFile psiFile = inputData.getPsiFile();
- if(!Symfony2ProjectComponent.isEnabled(psiFile.getProject())) {
+ if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
  return map;
  }
 

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

@@ -47,7 +47,7 @@ public Map<String, String[]> map(FileContent inputData) {
  Map<String, String[]> map = new THashMap<String, String[]>();
 
  PsiFile psiFile = inputData.getPsiFile();
- if(!Symfony2ProjectComponent.isEnabled(psiFile.getProject())) {
+ if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
  return map;
  }
  if (!isValidForIndex(inputData, psiFile)) {

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/ServicesTagStubIndex.java

@@ -48,7 +48,7 @@ public Map<String, String[]> map(FileContent inputData) {
  Map<String, String[]> map = new THashMap<String, String[]>();
 
  PsiFile psiFile = inputData.getPsiFile();
- if(!Symfony2ProjectComponent.isEnabled(psiFile.getProject())) {
+ if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
  return map;
  }
 

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigExtendsStubIndex.java

@@ -42,7 +42,7 @@ public Map<String, Void> map(FileContent inputData) {
  Map<String, Void> map = new THashMap<String, Void>();
 
  PsiFile psiFile = inputData.getPsiFile();
- if(!Symfony2ProjectComponent.isEnabled(psiFile.getProject())) {
+ if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
  return map;
  }
 

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigIncludeStubIndex.java

@@ -44,7 +44,7 @@ public Map<String, Void> map(FileContent inputData) {
  final Map<String, Void> map = new THashMap<String, Void>();
 
  PsiFile psiFile = inputData.getPsiFile();
- if(!Symfony2ProjectComponent.isEnabled(psiFile.getProject())) {
+ if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
  return map;
  }
 

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigMacroFromStubIndex.java

@@ -43,7 +43,7 @@ public Map<String, Void> map(FileContent inputData) {
  final Map<String, Void> map = new THashMap<String, Void>();
 
  PsiFile psiFile = inputData.getPsiFile();
- if(!Symfony2ProjectComponent.isEnabled(psiFile.getProject())) {
+ if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
  return map;
  }
 

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigMacroFunctionStubIndex.java

@@ -45,7 +45,7 @@ public Map<String, Void> map(FileContent inputData) {
  final Map<String, Void> map = new THashMap<String, Void>();
 
  PsiFile psiFile = inputData.getPsiFile();
- if(!Symfony2ProjectComponent.isEnabled(psiFile.getProject())) {
+ if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
  return map;
  }
 

src/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/YamlRoutesStubIndex.java

@@ -42,7 +42,7 @@ public Map<String, Void> map(FileContent inputData) {
  Map<String, Void> map = new THashMap<String, Void>();
 
  PsiFile psiFile = inputData.getPsiFile();
- if(!Symfony2ProjectComponent.isEnabled(psiFile.getProject())) {
+ if(!Symfony2ProjectComponent.isEnabledForIndex(psiFile.getProject())) {
  return map;
  }