From 501d6a5338370571801576425683353b34c34505 Mon Sep 17 00:00:00 2001 From: Vyacheslav Karpukhin Date: Thu, 23 Jan 2014 15:49:41 +0400 Subject: [PATCH 1/2] FileUtil#loadLines and ExecUtil#execAndReadLine allow to specify encoding --- .../com/intellij/execution/util/ExecUtil.java | 11 ++++++++- .../intellij/openapi/util/io/FileUtil.java | 24 ++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/platform/platform-api/src/com/intellij/execution/util/ExecUtil.java b/platform/platform-api/src/com/intellij/execution/util/ExecUtil.java index 3191ac046c19..082468b77c69 100644 --- a/platform/platform-api/src/com/intellij/execution/util/ExecUtil.java +++ b/platform/platform-api/src/com/intellij/execution/util/ExecUtil.java @@ -29,6 +29,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.*; +import java.nio.charset.Charset; import java.util.*; public class ExecUtil { @@ -160,9 +161,17 @@ public class ExecUtil { @Nullable public static String execAndReadLine(final String... command) { + return execAndReadLine(null, command); + } + + @Nullable + public static String execAndReadLine(@Nullable Charset charset, final String... command) { try { final Process process = new GeneralCommandLine(command).createProcess(); - final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); + InputStream inputStream = process.getInputStream(); + @SuppressWarnings("IOResourceOpenedButNotSafelyClosed") + InputStreamReader in = charset == null ? new InputStreamReader(inputStream) : new InputStreamReader(inputStream, charset); + final BufferedReader reader = new BufferedReader(in); try { return reader.readLine(); } diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java index 4465e366beff..f0ea90db845d 100644 --- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java @@ -1353,14 +1353,32 @@ public class FileUtil extends FileUtilRt { return loadLines(file.getPath()); } + @NotNull + public static List loadLines(@NotNull File file, @Nullable @NonNls String encoding) throws IOException { + return loadLines(file.getPath(), encoding); + } + @NotNull public static List loadLines(@NotNull String path) throws IOException { - BufferedReader reader = new BufferedReader(new FileReader(path)); + return loadLines(path, null); + } + + @NotNull + public static List loadLines(@NotNull String path, @Nullable @NonNls String encoding) throws IOException { + InputStream stream = new FileInputStream(path); try { - return loadLines(reader); + @SuppressWarnings("IOResourceOpenedButNotSafelyClosed") + InputStreamReader in = encoding == null ? new InputStreamReader(stream) : new InputStreamReader(stream, encoding); + BufferedReader reader = new BufferedReader(in); + try { + return loadLines(reader); + } + finally { + reader.close(); + } } finally { - reader.close(); + stream.close(); } } From 342182936abf43ffc1dcbc5c63b7bd341a9c1559 Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Thu, 23 Jan 2014 17:58:06 +0400 Subject: [PATCH 2/2] Add plugins to check: Pythonid, org.intellij.clojure, NodeJS --- .../platform-resources/src/brokenPlugins.json | 122 +++++++++++++++++- 1 file changed, 121 insertions(+), 1 deletion(-) diff --git a/platform/platform-resources/src/brokenPlugins.json b/platform/platform-resources/src/brokenPlugins.json index bdf43e3d071c..360f89a1dc13 100644 --- a/platform/platform-resources/src/brokenPlugins.json +++ b/platform/platform-resources/src/brokenPlugins.json @@ -114,6 +114,106 @@ "pluginId": "com.jetbrains.php", "version": "133.326" }, + { + "updateId": 14011, + "pluginId": "NodeJS", + "version": "132.15" + }, + { + "updateId": 14203, + "pluginId": "NodeJS", + "version": "132.324" + }, + { + "updateId": 14375, + "pluginId": "NodeJS", + "version": "132.709" + }, + { + "updateId": 14482, + "pluginId": "NodeJS", + "version": "132.944" + }, + { + "updateId": 14516, + "pluginId": "NodeJS", + "version": "132.947" + }, + { + "updateId": 14548, + "pluginId": "NodeJS", + "version": "132.1054" + }, + { + "updateId": 14581, + "pluginId": "NodeJS", + "version": "133.50" + }, + { + "updateId": 14595, + "pluginId": "NodeJS", + "version": "133.74" + }, + { + "updateId": 14665, + "pluginId": "NodeJS", + "version": "133.134" + }, + { + "updateId": 14693, + "pluginId": "NodeJS", + "version": "133.162" + }, + { + "updateId": 14706, + "pluginId": "NodeJS", + "version": "133.195" + }, + { + "updateId": 14707, + "pluginId": "NodeJS", + "version": "133.193" + }, + { + "updateId": 14715, + "pluginId": "NodeJS", + "version": "133.168" + }, + { + "updateId": 14790, + "pluginId": "NodeJS", + "version": "133.260" + }, + { + "updateId": 14820, + "pluginId": "NodeJS", + "version": "133.293" + }, + { + "updateId": 14868, + "pluginId": "NodeJS", + "version": "133.373" + }, + { + "updateId": 14031, + "pluginId": "org.intellij.clojure", + "version": "0.7.34" + }, + { + "updateId": 14076, + "pluginId": "org.intellij.clojure", + "version": "0.7.36" + }, + { + "updateId": 14428, + "pluginId": "org.intellij.clojure", + "version": "0.7.57" + }, + { + "updateId": 14604, + "pluginId": "org.intellij.clojure", + "version": "0.7.60" + }, { "updateId": 8976, "pluginId": "org.intellij.scala", @@ -268,5 +368,25 @@ "updateId": 14812, "pluginId": "org.jetbrains.plugins.ruby", "version": "6.0.0.20131207" + }, + { + "updateId": 14036, + "pluginId": "Pythonid", + "version": "2.11.2" + }, + { + "updateId": 14295, + "pluginId": "Pythonid", + "version": "3.0.1" + }, + { + "updateId": 14654, + "pluginId": "Pythonid", + "version": "3.1 Beta" + }, + { + "updateId": 14824, + "pluginId": "Pythonid", + "version": "3.1 Beta 2" } -] +] \ No newline at end of file