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

Fixed compilation.

Browse Source 
Ffter accidental using of method from too fresh IDEA.
This commit is contained in:
Evgeny Gerashchenko
2013-11-21 19:12:59 +04:00
parent 2ecac63405
commit 9a8d639ac5
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java
+1 -15
View File
@@ -78,27 +78,13 @@ public class CliBaseTest {
JetTestUtils.assertEqualsToFile(new File(testDataDir + "/" + testName.getMethodName() + ".out"), actual); JetTestUtils.assertEqualsToFile(new File(testDataDir + "/" + testName.getMethodName() + ".out"), actual);
} }
// TODO: remove after update to newer IDEA where there is a FileUtil.loadLines(String)
@NotNull
public static List<String> loadLines(@NotNull String path) throws IOException {
BufferedReader reader = new BufferedReader(new FileReader(path));
try {
return FileUtil.loadLines(reader);
}
finally {
reader.close();
}
}
@NotNull @NotNull
static String[] readArgs( static String[] readArgs(
@NotNull String argsFilePath, @NotNull String argsFilePath,
@NotNull final String testDataDir, @NotNull final String testDataDir,
@NotNull final String tempDir @NotNull final String tempDir
) throws IOException { ) throws IOException {
List<String> lines = FileUtil.loadLines(new FileInputStream(argsFilePath));
List<String> lines = loadLines(argsFilePath);
return ArrayUtil.toStringArray(ContainerUtil.mapNotNull(lines, new Function<String, String>() { return ArrayUtil.toStringArray(ContainerUtil.mapNotNull(lines, new Function<String, String>() {
@Override @Override