diff --git a/java/java-impl/src/com/intellij/psi/impl/search/AnnotatedElementsSearcher.java b/java/java-impl/src/com/intellij/psi/impl/search/AnnotatedElementsSearcher.java
index 4da8609cb45c..d5270b733954 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/AnnotatedElementsSearcher.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/AnnotatedElementsSearcher.java
@@ -36,7 +36,7 @@ public class AnnotatedElementsSearcher implements QueryExecutor<PsiModifierListO
     final String annotationFQN = annClass.getQualifiedName();
     assert annotationFQN != null;
 
-    final PsiManagerImpl psiManager = (PsiManagerImpl)PsiManager.getInstance(annClass.getProject());
+    final PsiManagerImpl psiManager = (PsiManagerImpl)annClass.getManager();
 
     final SearchScope useScope = p.getScope();
     Class<? extends PsiModifierListOwner>[] types = p.getTypes();
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/AnnotatedPackagesSearcher.java b/java/java-impl/src/com/intellij/psi/impl/search/AnnotatedPackagesSearcher.java
index bf1eac47d521..397c85cc9642 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/AnnotatedPackagesSearcher.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/AnnotatedPackagesSearcher.java
@@ -47,7 +47,7 @@ public class AnnotatedPackagesSearcher implements QueryExecutor<PsiPackage, Anno
     final String annotationFQN = annClass.getQualifiedName();
     assert annotationFQN != null;
 
-    final PsiManagerImpl psiManager = (PsiManagerImpl)PsiManager.getInstance(annClass.getProject());
+    final PsiManagerImpl psiManager = (PsiManagerImpl)annClass.getManager();
     final SearchScope useScope = p.getScope();
 
     final String annotationShortName = annClass.getName();
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearcher.java b/java/java-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearcher.java
index ba972624cb5a..daa403fbb5cd 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearcher.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/ConstructorReferencesSearcher.java
@@ -21,7 +21,7 @@ public class ConstructorReferencesSearcher extends QueryExecutorBase<PsiReferenc
   public void processQuery(@NotNull ReferencesSearch.SearchParameters p, @NotNull Processor<PsiReference> consumer) {
     final PsiElement element = p.getElementToSearch();
     if (element instanceof PsiMethod && ((PsiMethod)element).isConstructor()) {
-      new ConstructorReferencesSearchHelper(PsiManager.getInstance(element.getProject()))
+      new ConstructorReferencesSearchHelper(element.getManager())
         .processConstructorReferences(consumer, (PsiMethod)p.getElementToSearch(), p.getScope(), p.isIgnoreAccessScope(), true, p.getOptimizer());
     }
   }
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java b/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
index 8ae1fbf9b0b4..b495b2bd0d8b 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
@@ -36,7 +36,7 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
   @Override
   public boolean execute(@NotNull final DirectClassInheritorsSearch.SearchParameters p, @NotNull final Processor<PsiClass> consumer) {
     final PsiClass aClass = p.getClassToProcess();
-    final PsiManagerImpl psiManager = (PsiManagerImpl)PsiManager.getInstance(aClass.getProject());
+    final PsiManagerImpl psiManager = (PsiManagerImpl)aClass.getManager();
 
     final SearchScope useScope = ApplicationManager.getApplication().runReadAction(new Computable<SearchScope>() {
       @Override
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java b/java/java-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
index e71cbe46e173..42ccde45a785 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
@@ -25,7 +25,7 @@ public class MethodUsagesSearcher extends QueryExecutorBase<PsiReference, Method
 
     final SearchScope searchScope = p.getScope();
 
-    final PsiManager psiManager = PsiManager.getInstance(method.getProject());
+    final PsiManager psiManager = method.getManager();
 
     final PsiClass aClass = method.getContainingClass();
     if (aClass == null) return;
diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
index d710ee9948d7..a931ba654458 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
@@ -931,7 +931,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
         PsiMethod prototype;
         final PsiMethod method = myChangeInfo.getMethod();
         if (!StdLanguages.JAVA.equals(method.getLanguage())) return;
-        PsiManager manager = PsiManager.getInstance(method.getProject());
+        PsiManager manager = method.getManager();
         PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
         final CanonicalTypes.Type returnType = myChangeInfo.getNewReturnType();
         if (returnType != null) {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveCache.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveCache.java
index e63943379f8b..30c34b725ca9 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveCache.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveCache.java
@@ -148,7 +148,7 @@ public class JavaResolveCache {
         if (physicalContext != null &&
             (physicalFile = physicalContext.getContainingFile()) != null &&
             physicalFile.getVirtualFile() != null &&
-            !((PsiManagerEx)PsiManager.getInstance(dummyHolder.getProject())).isAssertOnFileLoading(physicalFile.getVirtualFile())) {
+            !((PsiManagerEx)dummyHolder.getManager()).isAssertOnFileLoading(physicalFile.getVirtualFile())) {
           DebugUtil.trackInvalidation(physicalContext, "dummy holder was invalidated", new Processor<PsiElement>() {
             @Override
             public boolean process(PsiElement element) {
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefDirectoryImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefDirectoryImpl.java
index 418cd296aa76..2a2ed840ab04 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefDirectoryImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefDirectoryImpl.java
@@ -31,7 +31,7 @@ public class RefDirectoryImpl extends RefElementImpl implements RefDirectory{
   protected RefDirectoryImpl(PsiDirectory psiElement, RefManager refManager) {
     super(psiElement.getName(), psiElement, refManager);
     final PsiDirectory parentDirectory = psiElement.getParentDirectory();
-    if (parentDirectory != null && PsiManager.getInstance(parentDirectory.getProject()).isInProject(parentDirectory)) {
+    if (parentDirectory != null && parentDirectory.getManager().isInProject(parentDirectory)) {
       final RefElementImpl refElement = (RefElementImpl)refManager.getReference(parentDirectory);
       if (refElement != null) {
         refElement.add(this);
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefFileImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefFileImpl.java
index 2a355cf90654..2c09c7144f35 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefFileImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefFileImpl.java
@@ -32,7 +32,7 @@ public class RefFileImpl extends RefElementImpl implements RefFile {
     if (vFile == null) return;
     final VirtualFile parentDirectory = vFile.getParent();
     if (parentDirectory == null) return;
-    final PsiDirectory psiDirectory = PsiManager.getInstance(elem.getProject()).findDirectory(parentDirectory);
+    final PsiDirectory psiDirectory = elem.getManager().findDirectory(parentDirectory);
     if (psiDirectory != null) {
       final RefElement element = getRefManager().getReference(psiDirectory);
       if (element != null) {
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AssertEqualsBetweenInconvertibleTypesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AssertEqualsBetweenInconvertibleTypesInspection.java
index e8b19fecd47c..9375239fe32b 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AssertEqualsBetweenInconvertibleTypesInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AssertEqualsBetweenInconvertibleTypesInspection.java
@@ -123,8 +123,7 @@ public class AssertEqualsBetweenInconvertibleTypesInspection
       if (!parameterType1.equals(parameterType2)) {
         return;
       }
-      final PsiManager manager =
-        PsiManager.getInstance(expression.getProject());
+      final PsiManager manager = expression.getManager();
       final GlobalSearchScope scope = expression.getResolveScope();
       if (type2 instanceof PsiPrimitiveType &&
           parameterType2.equals(PsiType.getJavaLangObject(manager,
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
index dfec9b262f16..af7f059585a4 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
@@ -149,7 +149,7 @@ public abstract class AndroidLintInspectionBase extends GlobalInspectionTool {
             final VirtualFile manifestFile = AndroidRootUtil.getManifestFile(module);
 
             if (manifestFile != null) {
-              f = PsiManager.getInstance(f.getProject()).findFile(manifestFile);
+              f = f.getManager().findFile(manifestFile);
             }
           }
         }
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java
index ea74435e3085..0685b8de739a 100644
--- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java
+++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java
@@ -83,7 +83,7 @@ public abstract class AntDomProject extends AntDomNamedElement implements Proper
     if (parent == null) {
       return null;
     }
-    return PsiManager.getInstance(tag.getProject()).findDirectory(parent);
+    return tag.getManager().findDirectory(parent);
   }
 
   @Nullable
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyInArgumentCheckInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyInArgumentCheckInspection.java
index 3b5e58883af0..f81fdb554fa5 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyInArgumentCheckInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyInArgumentCheckInspection.java
@@ -91,7 +91,7 @@ public class GroovyInArgumentCheckInspection extends BaseInspection {
 
       if (component == null) return;
       
-      if (TypesUtil.isAssignable(ltype, component, PsiManager.getInstance(expression.getProject()), expression.getResolveScope(), false)) return;
+      if (TypesUtil.isAssignable(ltype, component, expression.getManager(), expression.getResolveScope(), false)) return;
 
       registerError(expression, ltype, rtype);
     }
@@ -105,7 +105,7 @@ public class GroovyInArgumentCheckInspection extends BaseInspection {
 
       if (lclass == null || rclass == null) return;
 
-      if (PsiManager.getInstance(expression.getProject()).areElementsEquivalent(lclass, rclass)) return;
+      if (expression.getManager().areElementsEquivalent(lclass, rclass)) return;
 
       if (lclass.isInterface() || rclass.isInterface()) return;
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java
index ec55633f7873..442255bd8359 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java
@@ -142,7 +142,7 @@ public class GrKindWeigher extends CompletionWeigher {
     final PsiClass psiClass = ((PsiClassType)type).resolve();
     if (psiClass == null) return false;
 
-    return PsiManager.getInstance(qualifier.getProject()).areElementsEquivalent(member.getContainingClass(), psiClass);
+    return qualifier.getManager().areElementsEquivalent(member.getContainingClass(), psiClass);
   }
 
   private static enum NotQualifiedKind {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/GdkMethodDslProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/GdkMethodDslProvider.java
index 767dc1ddb53f..d9c0a9bb5600 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/GdkMethodDslProvider.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/GdkMethodDslProvider.java
@@ -108,7 +108,7 @@ public class GdkMethodDslProvider implements GdslMembersProvider {
       myStatic = isStatic;
       myScope = scope;
       final MultiMap<String, PsiMethod> byName = new MultiMap<String, PsiMethod>();
-      myPsiManager = PsiManager.getInstance(categoryClass.getProject());
+      myPsiManager = categoryClass.getManager();
       for (PsiMethod m : categoryClass.getMethods()) {
         final PsiParameter[] params = m.getParameterList().getParameters();
         if (params.length == 0) continue;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureConflictSearcher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureConflictSearcher.java
index 6a9e1fb90e7d..142c90bb9cd0 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureConflictSearcher.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureConflictSearcher.java
@@ -134,7 +134,7 @@ class GrChangeSignatureConflictSearcher {
       GrMethod prototype;
       final PsiMethod method = myChangeInfo.getMethod();
       if (!(method instanceof GrMethod)) return;
-      PsiManager manager = PsiManager.getInstance(method.getProject());
+      PsiManager manager = method.getManager();
       GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(manager.getProject());
       final CanonicalTypes.Type returnType = myChangeInfo.getNewReturnType();
       String newMethodName = myChangeInfo.getNewName();
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenDependencySystemPathConverter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenDependencySystemPathConverter.java
index eb72c96beb80..427ad7cc66d9 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenDependencySystemPathConverter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenDependencySystemPathConverter.java
@@ -41,7 +41,7 @@ public class MavenDependencySystemPathConverter extends ResolvingConverter<PsiFi
     if (s == null) return null;
     VirtualFile f = LocalFileSystem.getInstance().findFileByPath(s);
     if (f == null) return null;
-    return PsiManager.getInstance(context.getXmlElement().getProject()).findFile(f);
+    return context.getXmlElement().getManager().findFile(f);
   }
 
   public String toString(@Nullable PsiFile file, ConvertContext context) {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenParentRelativePathConverter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenParentRelativePathConverter.java
index 9f50e885873f..3420614dcae8 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenParentRelativePathConverter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenParentRelativePathConverter.java
@@ -55,7 +55,7 @@ public class MavenParentRelativePathConverter extends ResolvingConverter<PsiFile
     if (f.isDirectory()) f = f.findFileByRelativePath(MavenConstants.POM_XML);
     if (f == null) return null;
 
-    return PsiManager.getInstance(context.getXmlElement().getProject()).findFile(f);
+    return context.getXmlElement().getManager().findFile(f);
   }
 
   @Override
diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/support/jaxen/PsiDocumentNavigator.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/support/jaxen/PsiDocumentNavigator.java
index 537b0dce5e2f..5039707ad419 100644
--- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/support/jaxen/PsiDocumentNavigator.java
+++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/support/jaxen/PsiDocumentNavigator.java
@@ -176,7 +176,7 @@ public class PsiDocumentNavigator extends DefaultNavigator {
         final VirtualFile virtualFile = VfsUtil.findRelativeFile(url, file.getVirtualFile());
         if (virtualFile != null) {
             LOG.debug("document() -> VirtualFile = " + virtualFile.getPath());
-            final PsiFile file = PsiManager.getInstance(this.file.getProject()).findFile(virtualFile);
+            final PsiFile file = this.file.getManager().findFile(virtualFile);
             if (file instanceof XmlFile) {
                 return ((XmlFile)file).getDocument();
             }
diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java
index 0fae94e6cf32..34dad92dfc53 100644
--- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java
+++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java
@@ -70,7 +70,7 @@ public class XmlTagTreeHighlightingPass extends TextEditorHighlightingPass {
     super(file.getProject(), editor.getDocument(), true);
     myFile = file;
     myEditor = editor;
-    final FileViewProvider viewProvider = PsiManager.getInstance(file.getProject()).findViewProvider(file.getVirtualFile());
+    final FileViewProvider viewProvider = file.getManager().findViewProvider(file.getVirtualFile());
     myInfoProvider = BreadcrumbsXmlWrapper.findInfoProvider(viewProvider);
   }
 
diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/RncFileReferenceManipulator.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/RncFileReferenceManipulator.java
index e9bd6a354e1e..bc17a9db2287 100644
--- a/xml/relaxng/src/org/intellij/plugins/relaxNG/RncFileReferenceManipulator.java
+++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/RncFileReferenceManipulator.java
@@ -21,7 +21,7 @@ public class RncFileReferenceManipulator extends AbstractElementManipulator<RncF
     final ASTNode literal = node.findChildByType(RncTokenTypes.LITERAL);
     if (literal != null) {
       assert range.equals(element.getReferenceRange());
-      final PsiManager manager = PsiManager.getInstance(element.getProject());
+      final PsiManager manager = element.getManager();
       final ASTNode newChild = RenameUtil.createLiteralNode(manager, newContent);
       literal.getTreeParent().replaceChild(literal, newChild);
     }