MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Launch terminal with fixed locale (IDEA-116401, IDEA-118832, IDEA-120131).

Browse Source
This commit is contained in:
Dmitry Trofimov
2014-03-05 18:42:16 +01:00
parent 6822332324
commit bd3cf45098
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/execution/configurations/EncodingEnvironmentUtil.java
+24 -10
View File
@@ -40,28 +40,44 @@ public class EncodingEnvironmentUtil {
* Sets default encoding on Mac if it's undefined. <br/>
* On Mac default character encoding is defined by several environment variables: LC_ALL, LC_CTYPE and LANG.
* See <a href='http://www.gnu.org/software/gettext/manual/html_node/Locale-Environment-Variables.html'>details</a>.
* <p>
* <p/>
* Unfortunately, Mac OSX has a special behavior:<br/>
* These environment variables aren't passed to an IDE, if the IDE is launched from Spotlight.<br/>
* Unfortunately, even {@link com.intellij.util.EnvironmentUtil#getEnvironment()} doesn't have these variables.<p/>
* As a result, no encoding environment variables are passed to Ruby/Node.js/Python/other processes that are launched from IDE.
* Thus, these processes wrongly assume that the default encoding is US-ASCII.
* <p/>
*
* <p/>
* The workaround this method applies is to set LC_CTYPE environment variable if LC_ALL, LC_CTYPE or LANG aren't set before. <br/>
* LC_CTYPE value is taken from "Settings | File Encodings".
*
* @param commandLine GeneralCommandLine instance
* @param project Project instance if any
* @param project Project instance if any
*/
public static void fixDefaultEncodingIfMac(@NotNull GeneralCommandLine commandLine, @Nullable Project project) {
if (SystemInfo.isMac) {
if (!isLocaleDefined(commandLine)) {
Charset charset = getCharset(project);
commandLine.getEnvironment().put(LC_CTYPE, charset.name());
if (LOG.isDebugEnabled()) {
LOG.debug("Fixed mac locale: " + charset.name());
}
fixLocale(commandLine.getEnvironment(), project);
}
}
}
private static void fixLocale(@NotNull Map<String, String> env, @Nullable Project project) {
Charset charset = getCharset(project);
env.put(LC_CTYPE, charset.name());
if (LOG.isDebugEnabled()) {
LOG.debug("Fixed mac locale: " + charset.name());
}
}
/**
* Sets default encoding on Mac if it's undefined. <br/>
*/
public static void fixDefaultEncodingIfMac(@NotNull Map<String, String> env, @Nullable Project project) {
if (SystemInfo.isMac) {
if (!isLocaleDefined(env)) {
fixLocale(env, project);
}
}
}
@@ -100,6 +116,4 @@ public class EncodingEnvironmentUtil {
}
return charset;
}
}
plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+2
View File
@@ -1,6 +1,7 @@
package org.jetbrains.plugins.terminal;
import com.intellij.execution.TaskExecutor;
import com.intellij.execution.configurations.EncodingEnvironmentUtil;
import com.intellij.execution.process.*;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
@@ -67,6 +68,7 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
protected PtyProcess createProcess() throws ExecutionException {
Map<String, String> envs = new HashMap<String, String>(System.getenv());
envs.put("TERM", "xterm");
EncodingEnvironmentUtil.fixDefaultEncodingIfMac(envs, getProject());
try {
return PtyProcess.exec(getCommand(), envs, currentProjectFolder());
}