JS backend: using JetPsiFactory instead of JetFileUtils. Drop JetFileUtils.

js/js.tests/test/org/jetbrains/k2js/test/utils/TranslationUtils.java

@@ -27,13 +27,13 @@ import org.jetbrains.jet.OutputFileCollection;
 import org.jetbrains.jet.analyzer.AnalyzeExhaust;
 import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage;
 import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.psi.JetPsiFactory;
 import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS;
 import org.jetbrains.k2js.config.Config;
 import org.jetbrains.k2js.config.EcmaVersion;
 import org.jetbrains.k2js.facade.MainCallParameters;
 import org.jetbrains.k2js.facade.exceptions.TranslationException;
 import org.jetbrains.k2js.test.config.TestConfigFactory;
-import org.jetbrains.k2js.utils.JetFileUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -147,7 +147,7 @@ public final class TranslationUtils {
             try {
                 String path = root == null ? libFileName : (root + libFileName);
                 String text = FileUtil.loadFile(new File(path), true);
-                JetFile jetFile = JetFileUtils.createJetFile(path, text, project);
+                JetFile jetFile = JetPsiFactory.createFile(project, path, text);
                 libFiles.add(jetFile);
             }
             catch (IOException e) {

js/js.translator/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java

@@ -26,7 +26,7 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.k2js.utils.JetFileUtils;
+import org.jetbrains.jet.lang.psi.JetPsiFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -121,7 +121,7 @@ public class LibrarySourcesConfig extends Config {
             if (!entry.isDirectory() && entry.getName().endsWith(".kt")) {
                 InputStream stream = file.getInputStream(entry);
                 String text = FileUtil.loadTextAndClose(stream);
-                JetFile jetFile = JetFileUtils.createJetFile(entry.getName(), text, getProject());
+                JetFile jetFile = JetPsiFactory.createFile(getProject(), entry.getName(), text);
                 jetFile.putUserData(EXTERNAL_MODULE_NAME, UNKNOWN_EXTERNAL_MODULE_NAME);
                 result.add(jetFile);
             }

js/js.translator/src/org/jetbrains/k2js/config/MetaInfServices.java

@@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.k2js.utils.JetFileUtils;
+import org.jetbrains.jet.lang.psi.JetPsiFactory;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -74,7 +74,7 @@ public final class MetaInfServices {
                                 InputStream stream = loadClasspathResource(line);
                                 if (stream != null) {
                                     String text = FileUtil.loadTextAndClose(stream);
-                                    libFiles.add(JetFileUtils.createJetFile(line, text, project));
+                                    libFiles.add(JetPsiFactory.createFile(project, line, text));
                                 }
                             }
                         }

js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java

@@ -31,6 +31,7 @@ import org.jetbrains.jet.OutputFileCollection;
 import org.jetbrains.jet.SimpleOutputFile;
 import org.jetbrains.jet.SimpleOutputFileCollection;
 import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.psi.JetPsiFactory;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.utils.fileUtils.FileUtilsPackage;
 import org.jetbrains.js.compiler.JsSourceGenerationVisitor;
@@ -40,7 +41,6 @@ import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS;
 import org.jetbrains.k2js.config.Config;
 import org.jetbrains.k2js.facade.exceptions.TranslationException;
 import org.jetbrains.k2js.translate.general.Translation;
-import org.jetbrains.k2js.utils.JetFileUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -108,7 +108,7 @@ public final class K2JSTranslator {
     @SuppressWarnings("UnusedDeclaration")
     @NotNull
     public String translateStringWithCallToMain(@NotNull String programText, @NotNull String argumentsString) throws TranslationException {
-        JetFile file = JetFileUtils.createJetFile("test", programText, getProject());
+        JetFile file = JetPsiFactory.createFile(getProject(), "test", programText);
         String programCode = generateProgramCode(file, MainCallParameters.mainWithArguments(parseString(argumentsString))) + "\n";
         return FLUSH_SYSTEM_OUT + programCode + GET_SYSTEM_OUT;
     }

js/js.translator/src/org/jetbrains/k2js/utils/JetFileUtils.java

@@ -1,39 +0,0 @@
-/*
- * 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.k2js.utils;
-
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiFileFactory;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.plugin.JetLanguage;
-
-public final class JetFileUtils {
-
-    private JetFileUtils() {
-    }
-
-    @NotNull
-    public static JetFile createJetFile(
-            @NotNull String name,
-            @NotNull String text,
-            @NotNull Project project
-    ) {
-        return (JetFile) PsiFileFactory.getInstance(project)
-                .createFileFromText(name.endsWith(".kt") ? name : name + ".kt", JetLanguage.INSTANCE, text, true, false);
-    }
-}