azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite JetPsiFactory to kotlin, make project a property

Browse Source 
Instead of passing to every function
All static methods are now member functions
This commit is contained in:
Pavel V. Talanov
2014-07-14 18:59:56 +04:00
parent 307522ddd2
commit 7269e383cf
147 changed files with 905 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/utils/TranslationUtils.java
+2 -2
View File
@@ -27,7 +27,6 @@ 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;
@@ -40,6 +39,7 @@ import java.io.IOException;
import java.lang.ref.SoftReference;
import java.util.List;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.k2js.facade.K2JSTranslator.translateWithMainCallParameters;
//TODO: use method object
@@ -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 = JetPsiFactory.createFile(project, path, text);
JetFile jetFile = JetPsiFactory(project).createFile(path, text);
libFiles.add(jetFile);
}
catch (IOException e) {
js/js.translator/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java
+3 -2
View File
@@ -27,7 +27,6 @@ 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.jet.lang.psi.JetPsiFactory;
import java.io.IOException;
import java.io.InputStream;
@@ -38,6 +37,8 @@ import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
public class LibrarySourcesConfig extends Config {
@NotNull
public static final Key<String> EXTERNAL_MODULE_NAME = Key.create("externalModule");
@@ -122,7 +123,7 @@ public class LibrarySourcesConfig extends Config {
if (!entry.isDirectory() && entry.getName().endsWith(".kt")) {
InputStream stream = file.getInputStream(entry);
String text = StringUtil.convertLineSeparators(FileUtil.loadTextAndClose(stream));
JetFile jetFile = JetPsiFactory.createFile(getProject(), entry.getName(), text);
JetFile jetFile = JetPsiFactory(getProject()).createFile(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
+3 -2
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import java.io.BufferedReader;
import java.io.IOException;
@@ -30,6 +29,8 @@ import java.io.InputStreamReader;
import java.net.URL;
import java.util.*;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
/**
* A helper class to discover a META-INF/services file on the classpath and load the files referenced inside it
*/
@@ -75,7 +76,7 @@ public final class MetaInfServices {
InputStream stream = loadClasspathResource(line);
if (stream != null) {
String text = StringUtil.convertLineSeparators(FileUtil.loadTextAndClose(stream));
libFiles.add(JetPsiFactory.createFile(project, line, text));
libFiles.add(JetPsiFactory(project).createFile(line, text));
}
}
}
js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
+2 -2
View File
@@ -31,7 +31,6 @@ 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;
@@ -47,6 +46,7 @@ import java.io.IOException;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.k2js.facade.FacadeUtils.parseString;
/**
@@ -108,7 +108,7 @@ public final class K2JSTranslator {
@SuppressWarnings("UnusedDeclaration")
@NotNull
public String translateStringWithCallToMain(@NotNull String programText, @NotNull String argumentsString) throws TranslationException {
JetFile file = JetPsiFactory.createFile(getProject(), "test", programText);
JetFile file = JetPsiFactory(getProject()).createFile("test", programText);
String programCode = generateProgramCode(file, MainCallParameters.mainWithArguments(parseString(argumentsString))) + "\n";
return FLUSH_SYSTEM_OUT + programCode + GET_SYSTEM_OUT;
}