From 9e7eceb50903c2dd1adf2dc2c773d2c8721b3321 Mon Sep 17 00:00:00 2001 From: maxfilatov Date: Wed, 8 Jun 2016 20:39:03 +0300 Subject: [PATCH] #18 next try --- .../phpuaca/completion/PHPUnitTypeProvider.java | 17 ++++++++--------- .../completion/ProphecyTypeProvider.java | 11 ++++++++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/com/phpuaca/completion/PHPUnitTypeProvider.java b/src/com/phpuaca/completion/PHPUnitTypeProvider.java index 2881718..2048b9c 100644 --- a/src/com/phpuaca/completion/PHPUnitTypeProvider.java +++ b/src/com/phpuaca/completion/PHPUnitTypeProvider.java @@ -1,13 +1,10 @@ package com.phpuaca.completion; -import com.intellij.openapi.project.DumbService; -import com.intellij.openapi.project.Project; +import com.intellij.openapi.project.*; import com.intellij.psi.PsiElement; import com.jetbrains.php.PhpIndex; -import com.jetbrains.php.lang.psi.elements.Method; -import com.jetbrains.php.lang.psi.elements.MethodReference; -import com.jetbrains.php.lang.psi.elements.PhpClass; -import com.jetbrains.php.lang.psi.elements.PhpNamedElement; +import com.jetbrains.php.lang.psi.elements.*; +import com.jetbrains.php.lang.psi.resolve.types.PhpType; import com.phpuaca.util.PhpClassAdapter; import com.phpuaca.util.PhpClassResolver; import com.phpuaca.util.PhpMethodChain; @@ -41,9 +38,11 @@ public char getKey() { @Nullable @Override public String getType(PsiElement psiElement) { - Project project = psiElement.getProject(); - if (DumbService.isDumb(project)) { - return null; + Project[] projects = ProjectManager.getInstance().getOpenProjects(); + for (Project project : projects) { + if (DumbService.isDumb(project)) { + return null; + } } if (!(psiElement instanceof MethodReference)) { diff --git a/src/com/phpuaca/completion/ProphecyTypeProvider.java b/src/com/phpuaca/completion/ProphecyTypeProvider.java index d528731..b2e6fb6 100644 --- a/src/com/phpuaca/completion/ProphecyTypeProvider.java +++ b/src/com/phpuaca/completion/ProphecyTypeProvider.java @@ -2,6 +2,7 @@ import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; +import com.intellij.openapi.project.ProjectManager; import com.intellij.psi.PsiElement; import com.jetbrains.php.PhpIndex; import com.jetbrains.php.lang.psi.elements.*; @@ -39,11 +40,15 @@ public char getKey() { @Nullable @Override public String getType(PsiElement psiElement) { - Project project = psiElement.getProject(); - if (DumbService.isDumb(project)) { - return null; + Project[] projects = ProjectManager.getInstance().getOpenProjects(); + for (Project project : projects) { + if (DumbService.isDumb(project)) { + return null; + } } + Project project = psiElement.getProject(); + if (psiElement instanceof FieldReference) { FieldReference fieldReference = (FieldReference) psiElement;