Extract descriptor.loader.java module from frontend.java

Will be used in runtime to load reflected classes

compiler/cli/cli.iml

@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="js.translator" />
     <orderEntry type="library" name="jline" level="project" />
     <orderEntry type="module" module-name="cli-common" exported="" />
+    <orderEntry type="module" module-name="descriptor.loader.java" />
   </component>
 </module>
 

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/ClassPath.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2013 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.cli.jvm.compiler;
+
+import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public final class ClassPath implements Iterable<VirtualFile> {
+
+    @NotNull
+    private final List<VirtualFile> roots = new ArrayList<VirtualFile>();
+
+    @Override
+    public Iterator<VirtualFile> iterator() {
+        return roots.iterator();
+    }
+
+    public void add(@NotNull VirtualFile root) {
+        roots.add(root);
+    }
+}

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2010-2013 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.cli.jvm.compiler;
+
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.search.GlobalSearchScope;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.cli.jvm.compiler.ClassPath;
+import org.jetbrains.jet.lang.resolve.java.resolver.KotlinClassFileHeader;
+import org.jetbrains.jet.lang.resolve.java.vfilefinder.VirtualFileFinder;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+
+public class CliVirtualFileFinder implements VirtualFileFinder {
+
+    @NotNull
+    private final ClassPath classPath;
+
+    public CliVirtualFileFinder(@NotNull ClassPath path) {
+        classPath = path;
+    }
+
+
+    @Nullable
+    @Override
+    public VirtualFile find(@NotNull FqName className, @NotNull GlobalSearchScope scope) {
+        //TODO: use scope
+        return find(className);
+    }
+
+    @Nullable
+    @Override
+    public VirtualFile find(@NotNull FqName className) {
+        for (VirtualFile root : classPath) {
+            VirtualFile fileInRoot = findFileInRoot(className.asString(), root);
+            if (fileInRoot != null) {
+                return fileInRoot;
+            }
+        }
+        return null;
+    }
+
+    //NOTE: copied with some changes from CoreJavaFileManager
+    @Nullable
+    private static VirtualFile findFileInRoot(@NotNull String qName, @NotNull VirtualFile root) {
+        String pathRest = qName;
+        VirtualFile cur = root;
+
+        while (true) {
+            int dot = pathRest.indexOf('.');
+            if (dot < 0) break;
+
+            String pathComponent = pathRest.substring(0, dot);
+            VirtualFile child = cur.findChild(pathComponent);
+
+            if (child == null) break;
+            pathRest = pathRest.substring(dot + 1);
+            cur = child;
+        }
+
+        String className = pathRest.replace('.', '$');
+        VirtualFile vFile = cur.findChild(className + ".class");
+        if (vFile != null) {
+            if (!vFile.isValid()) {
+                //TODO: log
+                return null;
+            }
+            //NOTE: currently we use VirtualFileFinder to find Kotlin binaries only
+            if (KotlinClassFileHeader.readKotlinHeaderFromClassFile(vFile).getType() != KotlinClassFileHeader.HeaderType.NONE) {
+                return vFile;
+            }
+        }
+        return null;
+    }
+}

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

@@ -51,7 +51,6 @@ import org.jetbrains.jet.lang.parsing.JetParserDefinition;
 import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
-import org.jetbrains.jet.lang.resolve.java.vfilefinder.CliVirtualFileFinder;
 import org.jetbrains.jet.lang.resolve.java.vfilefinder.VirtualFileFinder;
 import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.jet.utils.PathUtil;