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

Minor: code enhancements

Browse Source
This commit is contained in:
Nikolay Krasko
2014-09-22 15:08:30 +04:00
parent 27e9f9c926
commit e1d51e9879
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinitionProvider.java
+6 -6
View File
@@ -26,11 +26,15 @@ import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import java.util.*;
public class JetScriptDefinitionProvider {
private final HashMap<String,JetScriptDefinition> scripts = new HashMap<String, JetScriptDefinition>();
private final HashSet<PsiFile> scriptsFiles = new HashSet<PsiFile>();
private final Map<String, JetScriptDefinition> scripts = new HashMap<String, JetScriptDefinition>();
private final Set<PsiFile> scriptsFiles = new HashSet<PsiFile>();
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() {
// .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);
js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java
+1 -5
View File
@@ -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