MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

GTW-4830 Better JCEF support

Browse Source 
Remove code related to running JCEF on backend side

GitOrigin-RevId: 87029e2d347e0c85b7d382bfc857f7e5985fb5c4
This commit is contained in:
Dmitry Batrak
2024-05-27 11:01:05 +03:00
committed by intellij-monorepo-bot
parent ea06bf5246
commit 0b0fe86bfc
2 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
native/XPlatLauncher/src/remote_dev.rs
View File

@@ -207,24 +207,6 @@ impl RemoteDevLaunchConfiguration {
// ("jdk.lang.Process.launchMechanism", "vfork"),
];
if parse_bool_env_var("REMOTE_DEV_SERVER_JCEF_ENABLED", false)? {
let _ = self.setup_jcef();
remote_dev_properties.push(("ide.browser.jcef.gpu.disable", "true"));
remote_dev_properties.push(("ide.browser.jcef.log.level", "warning"));
remote_dev_properties.push(("idea.suppress.statistics.report", "true"));
} else {
if let Ok(trace_var) = env::var("REMOTE_DEV_SERVER_TRACE") {
if !trace_var.is_empty() {
info!("JCEF support is disabled. Set REMOTE_DEV_SERVER_JCEF_ENABLED=true to enable");
}
}
// Disable JCEF support for now since it does not work in headless environment now
// Also see IDEA-241709
remote_dev_properties.push(("ide.browser.jcef.enabled", "false"));
}
match parse_bool_env_var_optional("REMOTE_DEV_JDK_DETECTION")? {
Some(remote_dev_jdk_detection_value) => {
if remote_dev_jdk_detection_value {
@@ -293,16 +275,6 @@ impl RemoteDevLaunchConfiguration {
Ok(path)
}
#[cfg(target_os = "linux")]
fn setup_jcef(&self) -> Result<()> {
bail!("XVFB workarounds from linux are not ported yet");
}
#[cfg(not(target_os = "linux"))]
fn setup_jcef(&self) -> Result<()> {
Ok(())
}
}
fn get_temp_system_like_path() -> Result<PathBuf> {
@@ -433,7 +405,6 @@ impl std::fmt::Display for RemoteDevEnvVars {
fn get_remote_dev_env_vars() -> RemoteDevEnvVars {
RemoteDevEnvVars(vec![
RemoteDevEnvVar {name: "REMOTE_DEV_SERVER_TRACE".to_string(), description: "set to any value to get more debug output from the startup script".to_string()},
RemoteDevEnvVar {name: "REMOTE_DEV_SERVER_JCEF_ENABLED".to_string(), description: "set to '1' to enable JCEF (embedded Chromium) in IDE".to_string()},
RemoteDevEnvVar {name: "REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS".to_string(), description: "set to '0' to skip using bundled X11 and other Linux libraries from plugins/remote-dev-server/self-contained. Use everything from the system. by default bundled libraries are used".to_string()},
RemoteDevEnvVar {name: "REMOTE_DEV_TRUST_PROJECTS".to_string(), description: "set to any value to skip project trust warning (will execute build scripts automatically)".to_string()},
RemoteDevEnvVar {name: "REMOTE_DEV_NEW_UI_ENABLED".to_string(), description: "set to '1' to start with forced enabled new UI".to_string()},

10
native/XPlatLauncher/tests/remote_dev_tests.rs
View File

@@ -94,16 +94,6 @@ mod tests {
assert!(!output.contains("Config folder does not exist, considering this the first launch. Will launch with New UI as default"));
}
#[test]
fn remote_dev_jcef_enabled_test() {
let test = prepare_test_env(LauncherLocation::RemoteDev);
let env = HashMap::from([("REMOTE_DEV_SERVER_JCEF_ENABLED", "0"), ("REMOTE_DEV_SERVER_TRACE", "1")]);
let remote_dev_command = &["run", &test.project_dir.display().to_string()];
let output = run_launcher_ext(&test, LauncherRunSpec::remote_dev().with_args(remote_dev_command).with_env(&env)).stdout;
assert!(output.contains("JCEF support is disabled. Set REMOTE_DEV_SERVER_JCEF_ENABLED=true to enable"));
}
#[cfg(target_os = "linux")]
fn prepare_font_config_dir(dist_root: &PathBuf) {
let self_contained_root = &dist_root.join("plugins/remote-dev-server/selfcontained");