Refactor dependencies, so jet-as-java might be used in cli.

build.xml

@@ -34,9 +34,7 @@
             <include name="backend/src"/>
             <include name="cli/src"/>
             <include name="util/src"/>
-<!--
             <include name="jet.as.java.psi/src"/>
--->
         </dirset>
     </path>
 

compiler/cli/src/org/jetbrains/jet/compiler/CliJetFilesProvider.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010-2012 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * @author max
+ */
+package org.jetbrains.jet.compiler;
+
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.util.Function;
+import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public class CliJetFilesProvider extends JetFilesProvider {
+    private final JetCoreEnvironment environment;
+    private Function<JetFile,Collection<JetFile>> all_files = new Function<JetFile, Collection<JetFile>>() {
+        @Override
+        public Collection<JetFile> fun(JetFile file) {
+            return environment.getSession().getSourceFiles();
+        }
+
+    };
+
+    public CliJetFilesProvider(JetCoreEnvironment environment) {
+        this.environment = environment;
+    }
+
+    @Override
+    public Function<JetFile, Collection<JetFile>> sampleToAllFilesInModule() {
+        return all_files;
+    }
+
+    @Override
+    public List<JetFile> allInScope(GlobalSearchScope scope) {
+        List<JetFile> answer = new ArrayList<JetFile>();
+        for (JetFile file : environment.getSession().getSourceFiles()) {
+            if (scope.contains(file.getVirtualFile())) {
+                answer.add(file);
+            }
+        }
+        return answer;
+    }
+}

compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java

@@ -394,7 +394,7 @@ public class CompileEnvironment {
         session.addSources(sourceFileOrDir);
 
         FqName mainClass = null;
-        for (JetFile file : session.getSourceFileNamespaces()) {
+        for (JetFile file : session.getSourceFiles()) {
             if (JetMainDetector.hasMain(file.getDeclarations())) {
                 FqName fqName = JetPsiUtil.getFQName(file);
                 mainClass = fqName.child(JvmAbi.PACKAGE_CLASS);
@@ -426,7 +426,9 @@ public class CompileEnvironment {
     }
 
     private CompileSession newCompileSession() {
-        return new CompileSession(environment, messageRenderer, errorStream, verbose);
+        CompileSession answer = new CompileSession(environment, messageRenderer, errorStream, verbose);
+        environment.setSession(answer);
+        return answer;
     }
 
     public static void writeToOutputDirectory(ClassFileFactory factory, final String outputDir) {

compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java

@@ -26,7 +26,10 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiRecursiveElementWalkingVisitor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.codegen.*;
+import org.jetbrains.jet.codegen.ClassBuilderFactories;
+import org.jetbrains.jet.codegen.CompilationErrorHandler;
+import org.jetbrains.jet.codegen.GenerationState;
+import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
@@ -136,7 +139,7 @@ public class CompileSession {
         }
     }
 
-    public List<JetFile> getSourceFileNamespaces() {
+    public List<JetFile> getSourceFiles() {
         return sourceFiles;
     }
 
@@ -221,7 +224,7 @@ public class CompileSession {
         List<CompilerPlugin> plugins = environment.getCompilerPlugins();
         if (!module) {
             if (plugins != null) {
-                CompilerPluginContext context = new CompilerPluginContext(project, bindingContext.getBindingContext(), getSourceFileNamespaces());
+                CompilerPluginContext context = new CompilerPluginContext(project, bindingContext.getBindingContext(), getSourceFiles());
                 for (CompilerPlugin plugin : plugins) {
                     plugin.processFiles(context);
                 }

compiler/cli/src/org/jetbrains/jet/compiler/JetCoreEnvironment.java

@@ -20,8 +20,12 @@ import com.intellij.core.JavaCoreEnvironment;
 import com.intellij.lang.java.JavaParserDefinition;
 import com.intellij.mock.MockApplication;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiElementFinder;
+import org.jetbrains.jet.asJava.JavaElementFinder;
 import org.jetbrains.jet.lang.parsing.JetParserDefinition;
+import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
 import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
 import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.jet.utils.PathUtil;
@@ -37,6 +41,7 @@ import java.util.List;
  */
 public class JetCoreEnvironment extends JavaCoreEnvironment {
     private List<CompilerPlugin> compilerPlugins = new ArrayList<CompilerPlugin>();
+    private CompileSession session;
 
     public JetCoreEnvironment(Disposable parentDisposable) {
         super(parentDisposable);
@@ -47,11 +52,11 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
         registerParserDefinition(new JavaParserDefinition());
         registerParserDefinition(new JetParserDefinition());
 
-/*
+
+        myProject.registerService(JetFilesProvider.class, new CliJetFilesProvider(this));
         Extensions.getArea(myProject)
                 .getExtensionPoint(PsiElementFinder.EP_NAME)
                 .registerExtension(new JavaElementFinder(myProject));
-*/
 
         for (VirtualFile root : PathUtil.getAltHeadersRoots()) {
             addLibraryRoot(root);
@@ -85,4 +90,12 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
             }
         }
     }
+
+    public void setSession(CompileSession session) {
+        this.session = session;
+    }
+
+    public CompileSession getSession() {
+        return session;
+    }
 }

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010-2012 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * @author max
+ */
+package org.jetbrains.jet.lang.resolve.java;
+
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.util.Function;
+import org.jetbrains.jet.lang.psi.JetFile;
+
+import java.util.Collection;
+import java.util.List;
+
+public abstract class JetFilesProvider {
+    public static JetFilesProvider getInstance(Project project) {
+        return ServiceManager.getService(project, JetFilesProvider.class);
+    }
+
+    public abstract Function<JetFile, Collection<JetFile>> sampleToAllFilesInModule();
+    public abstract List<JetFile> allInScope(GlobalSearchScope scope);
+}

compiler/jet.as.java.psi/jet.as.java.psi.iml

@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="library" name="idea-full" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
   </component>
 </module>
 

compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java

@@ -32,6 +32,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.FqName;
+import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.util.QualifiedNamesUtil;
 
@@ -51,7 +52,7 @@ public class JavaElementFinder extends PsiElementFinder {
         psiManager = PsiManager.getInstance(project);
 
         // Monitoring for files instead of collecting them each time
-        VirtualFileManager.getInstance().addVirtualFileListener(new VirtualFileAdapter() {
+        VirtualFileManager.getInstance().addVirtualFileListener(new VirtualFileListener() {
             @Override
             public void fileCreated(VirtualFileEvent event) {
                 invalidateJetFilesCache();
@@ -71,6 +72,24 @@ public class JavaElementFinder extends PsiElementFinder {
             public void fileCopied(VirtualFileCopyEvent event) {
                 invalidateJetFilesCache();
             }
+
+            @Override
+            public void propertyChanged(VirtualFilePropertyEvent event) {}
+
+            @Override
+            public void contentsChanged(VirtualFileEvent event) {}
+
+            @Override
+            public void beforePropertyChange(VirtualFilePropertyEvent event) {}
+
+            @Override
+            public void beforeContentsChange(VirtualFileEvent event) {}
+
+            @Override
+            public void beforeFileDeletion(VirtualFileEvent event) {}
+
+            @Override
+            public void beforeFileMovement(VirtualFileMoveEvent event) {}
         });
     }
 
@@ -230,7 +249,7 @@ public class JavaElementFinder extends PsiElementFinder {
         List<JetFile> cachedFiles = jetFiles.get(scope);
         
         if (cachedFiles == null) {
-            cachedFiles = JetFileUtil.collectJetFiles(project, scope);
+            cachedFiles = JetFilesProvider.getInstance(project).allInScope(scope);
              jetFiles.put(scope, cachedFiles);
         }
 

compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetFileUtil.java

@@ -1,67 +0,0 @@
-/*
- * Copyright 2010-2012 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.asJava;
-
-import com.intellij.openapi.compiler.ex.CompilerPathsEx;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.FileTypeManager;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.search.GlobalSearchScope;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.plugin.JetFileType;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author Nikolay Krasko
- */
-public final class JetFileUtil {
-
-    private JetFileUtil() {}
-
-    public static List<JetFile> collectJetFiles(final Project project, @NotNull final GlobalSearchScope scope) {
-        final List<JetFile> answer = new ArrayList<JetFile>();
-
-        final FileTypeManager fileTypeManager = FileTypeManager.getInstance();
-        List<VirtualFile> contentRoots = Arrays.asList(ProjectRootManager.getInstance(project).getContentRoots());
-        final PsiManager manager = PsiManager.getInstance(project);
-
-        CompilerPathsEx.visitFiles(contentRoots, new CompilerPathsEx.FileVisitor() {
-            @Override
-            protected void acceptFile(VirtualFile file, String fileRoot, String filePath) {
-                final FileType fileType = fileTypeManager.getFileTypeByFile(file);
-                if (fileType != JetFileType.INSTANCE) return;
-
-                if (scope.accept(file)) {
-                    final PsiFile psiFile = manager.findFile(file);
-                    if (psiFile instanceof JetFile) {
-                        answer.add((JetFile) psiFile);
-                    }
-                }
-            }
-        });
-
-        return answer;
-    }
-}

compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java

@@ -50,9 +50,9 @@ import org.jetbrains.jet.lang.psi.JetPsiUtil;
 import org.jetbrains.jet.lang.resolve.FqName;
 import org.jetbrains.jet.lang.resolve.java.AnalyzeExhaust;
 import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
+import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
 import org.jetbrains.jet.lang.resolve.java.JetJavaMirrorMarker;
 import org.jetbrains.jet.plugin.JetLanguage;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.util.QualifiedNamesUtil;
 
 import javax.swing.*;
@@ -158,7 +158,8 @@ public class JetLightClass extends AbstractLightClass implements JetJavaMirrorMa
         // The context must reflect _all files in the module_. not only the current file
         // Otherwise, the analyzer gets confused and can't, for example, tell which files come as sources and which
         // must be loaded from .class files
-        AnalyzeExhaust context = AnalyzerFacadeForJVM.shallowAnalyzeFiles(WholeProjectAnalyzerFacade.WHOLE_PROJECT_DECLARATION_PROVIDER.fun(file));
+        AnalyzeExhaust context = AnalyzerFacadeForJVM.shallowAnalyzeFiles(
+            JetFilesProvider.getInstance(project).sampleToAllFilesInModule().fun(file));
 
         final GenerationState state = new GenerationState(project, builderFactory, context, Collections.singletonList(file)) {
             @Override

compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java

@@ -23,7 +23,6 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.compiler.CompileSession;
 import org.jetbrains.jet.compiler.MessageRenderer;
-import org.jetbrains.jet.di.InjectorForJvmCodegen;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.psi.JetClass;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
@@ -101,7 +100,7 @@ public class TestlibTest extends CodegenTestCase {
             JetTypeMapper typeMapper = state.getInjector().getJetTypeMapper();
             TestSuite suite = new TestSuite("stdlib_test");
             try {
-                for(JetFile jetFile : session.getSourceFileNamespaces()) {
+                for(JetFile jetFile : session.getSourceFiles()) {
                     for(JetDeclaration decl : jetFile.getDeclarations()) {
                         if(decl instanceof JetClass) {
                             JetClass jetClass = (JetClass) decl;

idea/src/META-INF/plugin.xml

@@ -52,6 +52,9 @@
       <applicationService serviceInterface="org.jetbrains.jet.lang.psi.stubs.elements.StubIndexService"
                           serviceImplementation="org.jetbrains.jet.plugin.stubindex.StubIndexServiceImpl" />
 
+      <projectService serviceInterface="org.jetbrains.jet.lang.resolve.java.JetFilesProvider"
+                      serviceImplementation="org.jetbrains.jet.plugin.project.PluginJetFilesProvider"/>
+
       <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
 
       <internalFileTemplate name="Kotlin File"/>

idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java

@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetReferenceExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingContextUtils;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.resolve.DescriptorRenderer;
 
 /**

idea/src/org/jetbrains/jet/plugin/actions/CopyAsDiagnosticTestAction.java

@@ -22,14 +22,13 @@ import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiErrorElement;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.jet.checkers.CheckerTestUtil;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 import java.awt.*;
 import java.awt.datatransfer.Clipboard;

idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java

@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.plugin.JetLanguage;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 /**
  * @author yole

idea/src/org/jetbrains/jet/plugin/annotations/DebugInfoAnnotator.java

@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.types.ErrorUtils;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.plugin.JetHighlighter;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 import java.util.Collection;
 import java.util.Set;

idea/src/org/jetbrains/jet/plugin/annotations/JetLineMarkerProvider.java

@@ -39,7 +39,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.resolve.DescriptorRenderer;
 
 import javax.swing.*;

idea/src/org/jetbrains/jet/plugin/annotations/JetPsiChecker.java

@@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.plugin.JetHighlighter;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.plugin.quickfix.JetIntentionActionFactory;
 import org.jetbrains.jet.plugin.quickfix.QuickFixes;
 

idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java

@@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils;
 import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
 import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.plugin.stubindex.JetExtensionFunctionNameIndex;
 import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex;
 import org.jetbrains.jet.plugin.stubindex.JetShortClassNameIndex;

idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java

@@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper;
 import org.jetbrains.jet.resolve.DescriptorRenderer;
 

idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java

@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.plugin.caches.JetCacheManager;
 import org.jetbrains.jet.plugin.caches.JetShortNamesCache;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.plugin.references.JetSimpleNameReference;
 
 import java.util.Collection;

idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java

@@ -34,16 +34,14 @@ import com.sun.jdi.ReferenceType;
 import com.sun.jdi.request.ClassPrepareRequest;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.codegen.ClosureAnnotator;
 import org.jetbrains.jet.codegen.JetTypeMapper;
 import org.jetbrains.jet.codegen.NamespaceCodegen;
 import org.jetbrains.jet.di.InjectorForJetTypeMapper;
-import org.jetbrains.jet.di.InjectorForJvmCodegen;
+import org.jetbrains.jet.lang.psi.JetClassOrObject;
-import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.jet.lang.psi.JetPsiUtil;
 import org.jetbrains.jet.lang.resolve.java.AnalyzeExhaust;
-import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
 
 import java.util.*;
 

idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java

@@ -42,7 +42,7 @@ import org.jetbrains.jet.codegen.CompilationErrorHandler;
 import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.AnalyzeExhaust;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 import javax.swing.*;
 import java.awt.*;

idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolwindow.java

@@ -47,8 +47,8 @@ import org.jetbrains.jet.lang.resolve.calls.inference.BoundsOwner;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.plugin.JetFileType;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.plugin.internal.codewindow.BytecodeToolwindow;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.util.slicedmap.ReadOnlySlice;
 import org.jetbrains.jet.util.slicedmap.WritableSlice;
 

idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java

@@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetReferenceExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 import java.util.HashMap;
 import java.util.Map;

idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java

@@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;

idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java

@@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.plugin.JetBundle;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;

idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java

@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.compiler;
+/*
+ * @author max
+ */
+package org.jetbrains.jet.plugin.project;
 
 import com.google.common.collect.Sets;
+import com.intellij.openapi.compiler.ex.CompilerPathsEx;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.module.Module;
@@ -24,34 +28,25 @@ import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ContentIterator;
 import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.Function;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.asJava.JetFileUtil;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
-import org.jetbrains.jet.lang.resolve.java.AnalyzeExhaust;
-import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
 import org.jetbrains.jet.plugin.JetFileType;
 
-import java.util.Collection;
+import java.util.*;
-import java.util.HashSet;
-import java.util.Set;
 
-/**
+public class PluginJetFilesProvider extends JetFilesProvider {
- * @author abreslav
+    private final Project project;
- */
-public final class WholeProjectAnalyzerFacade {
 
-    /** Forbid creating */
+    public PluginJetFilesProvider(Project project) {
-    private WholeProjectAnalyzerFacade() {}
+        this.project = project;
+    }
 
-    /**
-     * Will collect all root-namespaces in all kotlin files in the project.
-     */
     public static final Function<JetFile, Collection<JetFile>> WHOLE_PROJECT_DECLARATION_PROVIDER = new Function<JetFile, Collection<JetFile>>() {
 
         @Override
@@ -89,13 +84,34 @@ public final class WholeProjectAnalyzerFacade {
         }
     };
 
-    @NotNull
+    @Override
-    public static AnalyzeExhaust analyzeProjectWithCacheOnAFile(@NotNull JetFile file) {
+    public Function<JetFile, Collection<JetFile>> sampleToAllFilesInModule() {
-        return AnalyzerFacadeForJVM.analyzeFileWithCache(file, WHOLE_PROJECT_DECLARATION_PROVIDER);
+        return WHOLE_PROJECT_DECLARATION_PROVIDER;
     }
 
-    @NotNull
+    @Override
-    public static AnalyzeExhaust analyzeProjectWithCache(@NotNull Project project, @NotNull GlobalSearchScope scope) {
+    public List<JetFile> allInScope(final GlobalSearchScope scope) {
-        return AnalyzerFacadeForJVM.analyzeProjectWithCache(project, JetFileUtil.collectJetFiles(project, scope));
+        final List<JetFile> answer = new ArrayList<JetFile>();
+
+        final FileTypeManager fileTypeManager = FileTypeManager.getInstance();
+        List<VirtualFile> contentRoots = Arrays.asList(ProjectRootManager.getInstance(project).getContentRoots());
+        final PsiManager manager = PsiManager.getInstance(project);
+
+        CompilerPathsEx.visitFiles(contentRoots, new CompilerPathsEx.FileVisitor() {
+            @Override
+            protected void acceptFile(VirtualFile file, String fileRoot, String filePath) {
+                final FileType fileType = fileTypeManager.getFileTypeByFile(file);
+                if (fileType != JetFileType.INSTANCE) return;
+
+                if (scope.accept(file)) {
+                    final PsiFile psiFile = manager.findFile(file);
+                    if (psiFile instanceof JetFile) {
+                        answer.add((JetFile) psiFile);
+                    }
+                }
+            }
+        });
+
+        return answer;
     }
 }

idea/src/org/jetbrains/jet/plugin/project/WholeProjectAnalyzerFacade.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2012 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.project;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.search.GlobalSearchScope;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.resolve.java.AnalyzeExhaust;
+import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
+import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
+
+/**
+ * @author abreslav
+ */
+public final class WholeProjectAnalyzerFacade {
+
+    /** Forbid creating */
+    private WholeProjectAnalyzerFacade() {}
+
+
+    @NotNull
+    public static AnalyzeExhaust analyzeProjectWithCacheOnAFile(@NotNull JetFile file) {
+        return AnalyzerFacadeForJVM.analyzeFileWithCache(file, JetFilesProvider.getInstance(file.getProject()).sampleToAllFilesInModule());
+    }
+
+    @NotNull
+    public static AnalyzeExhaust analyzeProjectWithCache(@NotNull Project project, @NotNull GlobalSearchScope scope) {
+        return AnalyzerFacadeForJVM.analyzeProjectWithCache(project, JetFilesProvider.getInstance(project).allInScope(scope));
+    }
+}

idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java

@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.psi.JetClassInitializer;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.plugin.structureView.JetStructureViewElement;
 
 import java.util.Collection;

idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java

@@ -22,17 +22,13 @@ import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.compiler.TipsManager;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.psi.JetElement;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetVisitorVoid;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
 
 /**
  * User: Alefas

idea/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java

@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 import java.util.ArrayList;
 import java.util.List;

idea/src/org/jetbrains/jet/plugin/references/JetPackageReference.java

@@ -22,8 +22,8 @@ import org.jetbrains.jet.compiler.TipsManager;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetNamespaceHeader;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.plugin.completion.DescriptorLookupConverter;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 /**
  * @author Nikolay Krasko

idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java

@@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetReferenceExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingContextUtils;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 import java.util.ArrayList;
 import java.util.Collection;

idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java

@@ -25,8 +25,8 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetPsiFactory;
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.plugin.completion.DescriptorLookupConverter;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 /**
 * @author yole

idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java

@@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
 import org.jetbrains.jet.lang.types.JetType;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 import org.jetbrains.jet.resolve.DescriptorRenderer;
 
 import javax.swing.*;

idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java

@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.FqName;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
-import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
+import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
 
 import java.io.File;