This commit is contained in:
Alexey Kudravtsev
2014-06-12 15:22:44 +04:00
parent 970978782f
commit 3d7a4cea6d
3 changed files with 4 additions and 6 deletions
@@ -30,9 +30,7 @@ public class DelegatingGlobalSearchScope extends GlobalSearchScope {
private final Object myEquality;
public DelegatingGlobalSearchScope(@NotNull GlobalSearchScope baseScope) {
super(baseScope.getProject());
myBaseScope = baseScope;
myEquality = ArrayUtil.EMPTY_OBJECT_ARRAY;
this(baseScope, ArrayUtil.EMPTY_OBJECT_ARRAY);
}
public DelegatingGlobalSearchScope(@NotNull GlobalSearchScope baseScope, @NotNull Object... equality) {
@@ -59,7 +59,7 @@ public class ModuleWithDependenciesScope extends GlobalSearchScope {
myModule = module;
myOptions = options;
myProjectFileIndex = ProjectRootManager.getInstance(getProject()).getFileIndex();
myProjectFileIndex = ProjectRootManager.getInstance(module.getProject()).getFileIndex();
OrderEnumerator en = ModuleRootManager.getInstance(module).orderEntries();
/*if (myIncludeOtherModules) */en.recursively();
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ public class GroovyGenerationInfo<T extends PsiMember> extends PsiGenerationInfo
final T member = getPsiMember();
if (member == null) return;
LOG.assertTrue(member instanceof GroovyPsiElement);
LOG.assertTrue(member instanceof GroovyPsiElement, member);
final GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(member.getProject());
final PsiElement prev = member.getPrevSibling();