Minor: code enhancements
This commit is contained in:
+6
-6
@@ -26,11 +26,15 @@ import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
|
|||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
public class JetScriptDefinitionProvider {
|
public class JetScriptDefinitionProvider {
|
||||||
private final HashMap<String,JetScriptDefinition> scripts = new HashMap<String, JetScriptDefinition>();
|
private final Map<String, JetScriptDefinition> scripts = new HashMap<String, JetScriptDefinition>();
|
||||||
private final HashSet<PsiFile> scriptsFiles = new HashSet<PsiFile>();
|
private final Set<PsiFile> scriptsFiles = new HashSet<PsiFile>();
|
||||||
|
|
||||||
private static final JetScriptDefinition standardScript = new JetScriptDefinition(JetParserDefinition.STD_SCRIPT_EXT, Collections.<AnalyzerScriptParameter>emptyList());
|
private static final JetScriptDefinition standardScript = new JetScriptDefinition(JetParserDefinition.STD_SCRIPT_EXT, Collections.<AnalyzerScriptParameter>emptyList());
|
||||||
|
|
||||||
|
public static JetScriptDefinitionProvider getInstance(Project project) {
|
||||||
|
return ServiceManager.getService(project, JetScriptDefinitionProvider.class);
|
||||||
|
}
|
||||||
|
|
||||||
public JetScriptDefinitionProvider() {
|
public JetScriptDefinitionProvider() {
|
||||||
// .kts will take analyzer parameters explicitly specified on compilation
|
// .kts will take analyzer parameters explicitly specified on compilation
|
||||||
addScriptDefinition(standardScript);
|
addScriptDefinition(standardScript);
|
||||||
@@ -40,10 +44,6 @@ public class JetScriptDefinitionProvider {
|
|||||||
scriptsFiles.add(file);
|
scriptsFiles.add(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static JetScriptDefinitionProvider getInstance(Project project) {
|
|
||||||
return ServiceManager.getService(project, JetScriptDefinitionProvider.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public JetScriptDefinition findScriptDefinition(PsiFile psiFile) {
|
public JetScriptDefinition findScriptDefinition(PsiFile psiFile) {
|
||||||
boolean force = scriptsFiles.contains(psiFile);
|
boolean force = scriptsFiles.contains(psiFile);
|
||||||
|
|
||||||
|
|||||||
@@ -19,13 +19,9 @@ package org.jetbrains.k2js.test.semantics;
|
|||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
|
import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
|
||||||
|
|
||||||
/**
|
|
||||||
*/
|
|
||||||
public class StdLibToJSTest extends StdLibTestBase {
|
public class StdLibToJSTest extends StdLibTestBase {
|
||||||
|
|
||||||
public void testCompileJavaScriptFiles() throws Exception {
|
public void testCompileJavaScriptFiles() throws Exception {
|
||||||
performStdLibTest(DEFAULT_ECMA_VERSIONS,
|
performStdLibTest(DEFAULT_ECMA_VERSIONS, "libraries/stdlib/src");
|
||||||
"libraries/stdlib/src");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
|
|||||||
Reference in New Issue
Block a user