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

Code style issues: use iterable instead of enum set, remove public in interface.

Browse Source 
Adapted from https://github.com/develar/kotlin/commit/a9e0a42fb1347fa8e21c86b5a073ef8a7c873da0.
This commit is contained in:
Pavel V. Talanov
2012-08-13 15:48:45 +04:00
parent fe9a2b6e5e
commit a7c6776876
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoResultChecker.java
+1 -1
View File
@@ -23,5 +23,5 @@ import org.mozilla.javascript.Scriptable;
* @author Pavel Talanov * @author Pavel Talanov
*/ */
public interface RhinoResultChecker { public interface RhinoResultChecker {
public void runChecks(Context context, Scriptable scope) throws Exception; void runChecks(Context context, Scriptable scope) throws Exception;
} }
js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java
+2 -6
View File
@@ -17,21 +17,17 @@
*/ */
package org.jetbrains.k2js.test.semantics; package org.jetbrains.k2js.test.semantics;
import com.google.common.base.Function;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.intellij.util.ArrayUtil; import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.cli.common.ExitCode; import org.jetbrains.jet.cli.common.ExitCode;
import org.jetbrains.jet.cli.js.K2JSCompiler; import org.jetbrains.jet.cli.js.K2JSCompiler;
import org.jetbrains.jet.cli.js.K2JSCompilerArguments; import org.jetbrains.jet.cli.js.K2JSCompilerArguments;
import org.jetbrains.k2js.config.Config;
import org.jetbrains.k2js.config.EcmaVersion; import org.jetbrains.k2js.config.EcmaVersion;
import org.jetbrains.k2js.test.SingleFileTranslationTest; import org.jetbrains.k2js.test.SingleFileTranslationTest;
import org.jetbrains.k2js.test.utils.LibraryFilePathsUtil; import org.jetbrains.k2js.test.utils.LibraryFilePathsUtil;
import javax.annotation.Nullable;
import java.io.File; import java.io.File;
import java.util.EnumSet;
import java.util.List; import java.util.List;
@SuppressWarnings("UseOfSystemOutOrSystemErr") @SuppressWarnings("UseOfSystemOutOrSystemErr")
@@ -41,13 +37,13 @@ abstract class StdLibTestBase extends SingleFileTranslationTest {
super("stdlib/"); super("stdlib/");
} }
protected void performStdLibTest(@NotNull EnumSet<EcmaVersion> ecmaVersions, protected void performStdLibTest(@NotNull Iterable<EcmaVersion> ecmaVersions,
@NotNull String sourceDir, @NotNull String... stdLibFiles) throws Exception { @NotNull String sourceDir, @NotNull String... stdLibFiles) throws Exception {
List<String> files = constructFilesToCompileList(sourceDir, stdLibFiles); List<String> files = constructFilesToCompileList(sourceDir, stdLibFiles);
compileFiles(ecmaVersions, files); compileFiles(ecmaVersions, files);
} }
private void compileFiles(@NotNull EnumSet<EcmaVersion> ecmaVersions, @NotNull List<String> files) throws Exception { private void compileFiles(@NotNull Iterable<EcmaVersion> ecmaVersions, @NotNull List<String> files) throws Exception {
List<String> libFiles = LibraryFilePathsUtil.getBasicLibraryFiles(); List<String> libFiles = LibraryFilePathsUtil.getBasicLibraryFiles();
for (EcmaVersion version : ecmaVersions) { for (EcmaVersion version : ecmaVersions) {
String outputFilePath = getOutputFilePath(getTestName(false) + ".compiler.kt", version); String outputFilePath = getOutputFilePath(getTestName(false) + ".compiler.kt", version);