Skip to content

Commit

Permalink
#18 next try
Browse files Browse the repository at this point in the history
  • Loading branch information
maxfilatov committed Jun 8, 2016
1 parent 47e990c commit 9e7eceb
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
17 changes: 8 additions & 9 deletions src/com/phpuaca/completion/PHPUnitTypeProvider.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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)) {
Expand Down
11 changes: 8 additions & 3 deletions src/com/phpuaca/completion/ProphecyTypeProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 9e7eceb

Please sign in to comment.