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

Cleanup (deprecated API dropped in preparation for IDEA-121713 fix)

Browse Source
This commit is contained in:
Roman Shevchenko
2015-09-08 19:53:53 +03:00
parent 4137276318
commit f6048bf6da
3 changed files with 17 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/execution/configurations/EncodingEnvironmentUtil.java
+12 -72
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,22 +16,17 @@
package com.intellij.execution.configurations;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.vfs.encoding.EncodingManager;
import com.intellij.openapi.vfs.encoding.EncodingProjectManager;
import com.intellij.util.EnvironmentUtil;
import com.intellij.util.PlatformUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.nio.charset.Charset;
import java.util.Locale;
import java.util.Map;
public class EncodingEnvironmentUtil {
private static final Logger LOG = Logger.getInstance(EncodingEnvironmentUtil.class);
private static final String LC_ALL = "LC_ALL";
private static final String LC_CTYPE = "LC_CTYPE";
private static final String LANG = "LANG";
@@ -43,7 +38,7 @@ public class EncodingEnvironmentUtil {
* <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/>
* Unfortunately, even {@link 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/>
@@ -54,22 +49,17 @@ public class EncodingEnvironmentUtil {
* @param commandLine GeneralCommandLine instance
*/
public static void setLocaleEnvironmentIfMac(@NotNull GeneralCommandLine commandLine) {
if (SystemInfo.isMac) {
if (!isLocaleDefined(commandLine)) {
setLocaleEnvironment(commandLine.getEnvironment(), commandLine.getCharset());
}
if (SystemInfo.isMac && !isLocaleDefined(commandLine)) {
setLocaleEnvironment(commandLine.getEnvironment(), commandLine.getCharset());
}
}
/**
* @deprecated Use {@link #setLocaleEnvironmentIfMac(GeneralCommandLine)} instead. To be removed in IDEA 15.
* Sets default encoding on Mac if it's undefined. <br/>
*/
@Deprecated
public static void fixDefaultEncodingIfMac(@NotNull GeneralCommandLine commandLine, @Nullable Project project) {
if (SystemInfo.isMac) {
if (!isLocaleDefined(commandLine)) {
setLocaleEnvironment(commandLine.getEnvironment(), getCharset(project));
}
public static void setLocaleEnvironmentIfMac(@NotNull Map<String, String> env, @NotNull Charset charset) {
if (SystemInfo.isMac && !isLocaleDefined(env)) {
setLocaleEnvironment(env, charset);
}
}
@@ -85,65 +75,15 @@ public class EncodingEnvironmentUtil {
Locale locale = Locale.getDefault();
String language = locale.getLanguage();
String country = locale.getCountry();
if (language.isEmpty() || country.isEmpty()) {
return "en_US." + charset.name();
}
return language + "_" + country + "." + charset.name();
}
/**
* Sets default encoding on Mac if it's undefined. <br/>
* @deprecated Use {@link #setLocaleEnvironmentIfMac(java.util.Map, java.nio.charset.Charset)} instead. To be removed in IDEA 15.
*/
@Deprecated
public static void fixDefaultEncodingIfMac(@NotNull Map<String, String> env, @Nullable Project project) {
if (SystemInfo.isMac) {
if (!isLocaleDefined(env)) {
setLocaleEnvironment(env, getCharset(project));
}
}
}
/**
* Sets default encoding on Mac if it's undefined. <br/>
*/
public static void setLocaleEnvironmentIfMac(@NotNull Map<String, String> env, @NotNull Charset charset) {
if (SystemInfo.isMac) {
if (!isLocaleDefined(env)) {
setLocaleEnvironment(env, charset);
}
}
return (language.isEmpty() || country.isEmpty() ? "en_US" : language + "_" + country) + "." + charset.name();
}
private static boolean isLocaleDefined(@NotNull GeneralCommandLine commandLine) {
Map<String, String> env = commandLine.getEnvironment();
if (isLocaleDefined(env)) {
return true;
}
if (commandLine.isPassParentEnvironment()) {
// 'parentEnv' calculation logic should be kept in sync with GeneralCommandLine.setupEnvironment
Map<String, String> parentEnv = PlatformUtils.isAppCode() ? System.getenv() // Temporarily fix for OC-8606
: EnvironmentUtil.getEnvironmentMap();
if (isLocaleDefined(parentEnv)) {
return true;
}
}
return false;
return isLocaleDefined(commandLine.getEnvironment()) ||
commandLine.isPassParentEnvironment() && isLocaleDefined(commandLine.getParentEnvironment());
}
private static boolean isLocaleDefined(@NotNull Map<String, String> env) {
return env.containsKey(LC_ALL) || env.containsKey(LC_CTYPE) || env.containsKey(LANG);
}
@NotNull
private static Charset getCharset(@Nullable Project project) {
Charset charset;
if (project == null) {
charset = EncodingManager.getInstance().getDefaultCharset();
}
else {
charset = EncodingProjectManager.getInstance(project).getDefaultCharset();
}
return charset;
}
}
plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandExecutor.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -158,7 +158,7 @@ public class CommandExecutor {
}
protected void beforeCreateProcess() throws SvnBindException {
EncodingEnvironmentUtil.fixDefaultEncodingIfMac(myCommandLine, null);
EncodingEnvironmentUtil.setLocaleEnvironmentIfMac(myCommandLine);
setupLocale();
ensureMessageFile();
ensureTargetsAdded();
python/src/com/jetbrains/python/console/PydevConsoleRunner.java
+3 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -446,10 +446,9 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
myCommandLine = myCommandLineArgumentsProvider.getCommandLineString();
Map<String, String> envs = myCommandLineArgumentsProvider.getAdditionalEnvs();
if (envs != null) {
EncodingEnvironmentUtil.fixDefaultEncodingIfMac(envs, getProject());
EncodingEnvironmentUtil.setLocaleEnvironmentIfMac(envs, EncodingProjectManager.getInstance(getProject()).getDefaultCharset());
}
final Process server = ProcessRunner
.createProcess(getWorkingDir(), envs, myCommandLineArgumentsProvider.getArguments());
Process server = ProcessRunner.createProcess(getWorkingDir(), envs, myCommandLineArgumentsProvider.getArguments());
try {
myPydevConsoleCommunication = new PydevConsoleCommunication(getProject(), myPorts[0], server, myPorts[1]);
}