package movements

This commit is contained in:
Dmitry Batkovich
2016-10-17 07:31:08 +03:00
parent 7542588613
commit 404db589ae
4 changed files with 12 additions and 8 deletions
@@ -13,9 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.compiler;
package com.intellij.compiler.backwardRefs;
import com.intellij.compiler.backwardRefs.LanguageLightUsageConverter;
import com.intellij.compiler.ClassResolvingCompilerSearchAdapter;
import com.intellij.compiler.CompilerElement;
import com.intellij.compiler.CompilerSearchAdapter;
import com.intellij.compiler.server.BuildManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
@@ -28,7 +30,6 @@ import com.intellij.psi.PsiNamedElement;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.ObjectUtils;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.Queue;
import com.sun.tools.javac.util.Convert;
import gnu.trove.THashMap;
@@ -42,7 +43,6 @@ import org.jetbrains.jps.backwardRefs.LightUsage;
import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.stream.Stream;
import static java.util.stream.Collectors.*;
@@ -13,9 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.compiler;
package com.intellij.compiler.backwardRefs;
import com.intellij.compiler.backwardRefs.LanguageLightUsageConverter;
import com.intellij.compiler.ClassResolvingCompilerSearchAdapter;
import com.intellij.compiler.CompilerElement;
import com.intellij.compiler.CompilerReferenceService;
import com.intellij.compiler.CompilerSearchAdapter;
import com.intellij.compiler.server.BuildManager;
import com.intellij.compiler.server.BuildManagerListener;
import com.intellij.lang.injection.InjectedLanguageManager;
@@ -243,7 +246,7 @@ public class CompilerReferenceServiceImpl extends CompilerReferenceService imple
}
private boolean isServiceEnabledFor(PsiElement element) {
return isServiceEnabled() && InjectedLanguageManager.getInstance(myProject).isInjectedFragment(ReadAction.compute(() -> element.getContainingFile()));
return isServiceEnabled() && !InjectedLanguageManager.getInstance(myProject).isInjectedFragment(ReadAction.compute(() -> element.getContainingFile()));
}
private boolean isServiceEnabled() {
@@ -17,6 +17,7 @@ package com.intellij.compiler;
import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.completion.AbstractCompilerAwareTest;
import com.intellij.compiler.backwardRefs.CompilerReferenceServiceImpl;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.pom.java.LanguageLevel;
+1 -1
View File
@@ -77,7 +77,7 @@
<component>
<interface-class>com.intellij.compiler.CompilerReferenceService</interface-class>
<implementation-class>com.intellij.compiler.CompilerReferenceServiceImpl</implementation-class>
<implementation-class>com.intellij.compiler.backwardRefs.CompilerReferenceServiceImpl</implementation-class>
</component>
</project-components>