diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinitionProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinitionProvider.java index 89ac6f8db20..05d2dce5bdf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinitionProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinitionProvider.java @@ -26,11 +26,15 @@ import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import java.util.*; public class JetScriptDefinitionProvider { - private final HashMap scripts = new HashMap(); - private final HashSet scriptsFiles = new HashSet(); + private final Map scripts = new HashMap(); + private final Set scriptsFiles = new HashSet(); private static final JetScriptDefinition standardScript = new JetScriptDefinition(JetParserDefinition.STD_SCRIPT_EXT, Collections.emptyList()); + public static JetScriptDefinitionProvider getInstance(Project project) { + return ServiceManager.getService(project, JetScriptDefinitionProvider.class); + } + public JetScriptDefinitionProvider() { // .kts will take analyzer parameters explicitly specified on compilation addScriptDefinition(standardScript); @@ -40,10 +44,6 @@ public class JetScriptDefinitionProvider { scriptsFiles.add(file); } - public static JetScriptDefinitionProvider getInstance(Project project) { - return ServiceManager.getService(project, JetScriptDefinitionProvider.class); - } - public JetScriptDefinition findScriptDefinition(PsiFile psiFile) { boolean force = scriptsFiles.contains(psiFile); diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java index d09300338ae..53e2d80254a 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java @@ -19,13 +19,9 @@ package org.jetbrains.k2js.test.semantics; import org.jetbrains.annotations.Nullable; import org.jetbrains.k2js.test.rhino.RhinoResultChecker; -/** - */ public class StdLibToJSTest extends StdLibTestBase { - public void testCompileJavaScriptFiles() throws Exception { - performStdLibTest(DEFAULT_ECMA_VERSIONS, - "libraries/stdlib/src"); + performStdLibTest(DEFAULT_ECMA_VERSIONS, "libraries/stdlib/src"); } @Nullable