The IDE you know, rebuilt in Rust. IntelliJ IDEA–style keymap, tool windows and search-everywhere in a fast native app: editor, code insight, debugger, Git, terminal, database and HTTP clients for 60+ languages.
TypeScript code-editorcross-platformdapdatabase-clientdebuggerdesktop-appdeveloper-toolsgithttp-clientideintellijlsprusttauriterminal
fix(build): compile all Go workspace modules (#1992)
Shohruh Ismoilov4dcf7b0fb285
diff --git a/crates/ide-build/src/compile/mod.rs b/crates/ide-build/src/compile/mod.rsindex ce41a1089..8b4119225 100644--- a/crates/ide-build/src/compile/mod.rs+++ b/crates/ide-build/src/compile/mod.rs@@ -153,7 +153,7 @@ fn detect_dir(dir: &Path, model: &BuildModel, root: &Path) -> Option<BuildSystemSome(BuildSystem::Gradle)} else if has(dir, &["Cargo.toml"]) {Some(BuildSystem::Cargo)- } else if has(dir, &["go.mod"]) {+ } else if has(dir, &["go.mod", "go.work"]) {Some(BuildSystem::Go)} else if has(dir, &["tsconfig.json", "package.json"]) {Some(BuildSystem::TypeScript)@@ -227,7 +227,7 @@ pub fn plan(BuildSystem::Gradle => gradle_steps(root, model, kind, module_dir.as_deref())?,BuildSystem::Cargo => cargo_steps(&dir, kind),// Go builds the file's package (a module holds many).- BuildSystem::Go => go_steps(file.and_then(Path::parent).unwrap_or(&dir), kind),+ BuildSystem::Go => go_steps(file.and_then(Path::parent).unwrap_or(&dir), kind)?,BuildSystem::TypeScript => ts_steps(&dir, kind),BuildSystem::CMake => cmake_steps(&dir, kind, cmake.and_then(<[_]>::first)),};@@ -374,7 +374,31 @@ fn cmake_steps(dir: &Path, kind: BuildKind, profile: Option<&CMakeProfile>) -> Vsteps}-fn go_steps(dir: &Path, kind: BuildKind) -> Vec<BuildStep> {+fn go_steps(dir: &Path, kind: BuildKind) -> IdeResult<Vec<BuildStep>> {+ if dir.join("go.work").is_file() {+ let work_file = dunce::canonicalize(dir.join("go.work"))?;+ let modules = ide_core::go::work_modules(&std::fs::read_to_string(dir.join("go.work"))?);+ if modules.is_empty() {+ return Err(IdeError::invalid("The Go workspace contains no modules"));+ }+ let mut steps = Vec::new();+ for module in modules {+ let module = dir.join(module);+ if !module.join("go.mod").is_file() {+ return Err(IdeError::not_found(format!("Go workspace module has no go.mod: {}", module.display())));+ }+ let mut module_steps = go_module_steps(&module, kind);+ for step in &mut module_steps {+ step.env.insert("GOWORK".into(), work_file.to_string_lossy().into_owned());+ }+ steps.extend(module_steps);+ }+ return Ok(steps);+ }+ Ok(go_module_steps(dir, kind))+}++fn go_module_steps(dir: &Path, kind: BuildKind) -> Vec<BuildStep> {let module_root = dir.ancestors().find(|d| d.join("go.mod").is_file()).unwrap_or(dir);let target = if module_root == dir { "./...".to_owned() } else { format!("./{}/...", rel_str(module_root, dir)) };let mut args = vec!["build"];@@ -813,6 +837,68 @@ fn launch_class_dirs(system: BuildSystem, module: &Path, test: bool) -> Vec<Path#[cfg(test)]mod tests {+ #[test]+ fn go_workspace_build_commands_compile_members_with_local_dependencies() {+ let Some(go) = ide_core::process::find_executable("go", &ide_core::tool_path::search_path()) else {+ return;+ };+ let tmp = tempfile::tempdir().unwrap();+ let root = &tmp.path().join("workspace");+ write(root, "go.work", "go 1.22\nuse (\n ./app\n ./lib\n ../external\n)\n");+ write(root, "lib/go.mod", "module example.com/lib\ngo 1.22\n");+ write(root, "lib/lib.go", "package lib\nfunc Value() int { return 1 }\n");+ write(root, "app/go.mod", "module example.com/app\ngo 1.22\nrequire example.com/lib v0.0.0\n");+ write(root, "app/main.go", "package main\nimport \"example.com/lib\"\nfunc main(){_ = lib.Value()}\n");+ write(root, "../external/go.mod", "module example.com/external\ngo 1.22\nrequire example.com/lib v0.0.0\n");+ write(root, "../external/main.go", "package main\nimport \"example.com/lib\"\nfunc main(){_ = lib.Value()}\n");+ let plan = plan(root, &BuildModel::default(), BuildKind::Build, None, None).unwrap();+ for step in plan.steps {+ let result = std::process::Command::new(&go)+ .args(&step.args)+ .envs(&step.env)+ .env("GOPROXY", "off")+ .current_dir(&step.cwd)+ .output()+ .unwrap();+ assert!(result.status.success(), "{}", String::from_utf8_lossy(&result.stderr));+ }+ }++ #[test]+ fn go_workspace_builds_every_use_module() {+ let tmp = tempfile::tempdir().unwrap();+ let root = tmp.path().join("workspace");+ write(&root, "go.work", "go 1.22\nuse (\n ./api\n \"./lib with spaces\"\n ../shared\n)\n");+ for module in ["api", "lib with spaces", "../shared"] {+ write(&root.join(module), "go.mod", "module example.com/p\ngo 1.22\n");+ }+ for kind in [BuildKind::Build, BuildKind::Rebuild, BuildKind::Artifacts] {+ let p = plan(&root, &BuildModel::default(), kind, None, None).unwrap();+ assert_eq!(p.system, BuildSystem::Go);+ assert_eq!(p.steps.len(), 3);+ for (step, module) in p.steps.iter().zip(["api", "lib with spaces", "../shared"]) {+ assert_eq!(step.cwd, root.join(module));+ let expected =+ if kind == BuildKind::Rebuild { vec!["build", "-a", "./..."] } else { vec!["build", "./..."] };+ assert_eq!(step.args, expected);+ }+ }+ let member =+ plan(&root, &BuildModel::default(), BuildKind::Build, Some(&root.join("api/pkg/a.go")), None).unwrap();+ assert_eq!(member.steps.len(), 1);+ assert_eq!(member.steps[0].cwd, root.join("api"));+ assert_eq!(member.steps[0].args, ["build", "./pkg/..."]);+ write(&root, "go.work", "use ./missing\n");+ assert!(+ plan(&root, &BuildModel::default(), BuildKind::Build, None, None)+ .unwrap_err()+ .to_string()+ .contains("go.mod")+ );+ write(&root, "go.work", "go 1.22\n");+ assert!(plan(&root, &BuildModel::default(), BuildKind::Build, None, None).is_err());+ }+#[test]fn independent_gradle_builds_keep_their_launchers_and_task_paths() {let wrapper = if cfg!(windows) { "gradlew.bat" } else { "gradlew" };diff --git a/crates/ide-core/src/go.rs b/crates/ide-core/src/go.rsnew file mode 100644index 000000000..b31960c4f--- /dev/null+++ b/crates/ide-core/src/go.rs@@ -0,0 +1,124 @@+//! Go workspace module paths shared by project builds and run detection.+use std::path::PathBuf;++/// Module directories from a go.work file. Quoted paths and comments follow Go's file syntax.+pub fn work_modules(text: &str) -> Vec<PathBuf> {+ let mut tokens = Vec::new();+ let mut chars = text.chars().peekable();+ while let Some(ch) = chars.next() {+ match ch {+ '\n' | '(' | ')' => tokens.push(ch.to_string()),+ ch if ch.is_whitespace() => {}+ '/' if chars.peek() == Some(&'/') => {+ for c in chars.by_ref() {+ if c == '\n' {+ tokens.push("\n".into());+ break;+ }+ }+ }+ '"' | '`' => {+ let Some(token) = quoted_work_path(&mut chars, ch) else { return Vec::new() };+ tokens.push(token);+ }+ _ => {+ let mut token = ch.to_string();+ while chars.peek().is_some_and(|c| !c.is_whitespace() && *c != '(' && *c != ')') {+ token.push(chars.next().unwrap());+ }+ tokens.push(token);+ }+ }+ }+ let mut out = Vec::new();+ let mut start = true;+ let mut tokens = tokens.into_iter();+ while let Some(token) = tokens.next() {+ if token == "\n" {+ start = true;+ continue;+ }+ if start+ && token == "use"+ && let Some(path) = tokens.next()+ {+ if path == "(" {+ let mut paths = Vec::new();+ let mut closed = false;+ for path in tokens.by_ref() {+ if path == ")" {+ closed = true;+ break;+ }+ if path != "\n" && !path.is_empty() {+ paths.push(PathBuf::from(path));+ }+ }+ if closed {+ out.extend(paths);+ }+ } else if path != "\n" && !path.is_empty() {+ out.push(PathBuf::from(path));+ }+ }+ start = false;+ }+ let mut seen = std::collections::HashSet::new();+ out.retain(|path| seen.insert(path.clone()));+ out+}++fn quoted_work_path(chars: &mut std::iter::Peekable<std::str::Chars<'_>>, quote: char) -> Option<String> {+ let mut bytes = Vec::new();+ while let Some(ch) = chars.next() {+ if ch == quote {+ return String::from_utf8(bytes).ok();+ }+ if ch == '\\' && quote == '"' {+ let escaped = chars.next()?;+ let byte = match escaped {+ 'a' => 7,+ 'b' => 8,+ 'f' => 12,+ 'n' => 10,+ 'r' => 13,+ 't' => 9,+ 'v' => 11,+ '\\' => b'\\',+ '"' => b'"',+ 'x' => {+ let digits: String = chars.by_ref().take(2).collect();+ if digits.len() != 2 {+ return None;+ }+ u8::from_str_radix(&digits, 16).ok()?+ }+ 'u' | 'U' => {+ let width = if escaped == 'u' { 4 } else { 8 };+ let digits: String = chars.by_ref().take(width).collect();+ if digits.len() != width {+ return None;+ }+ let ch = char::from_u32(u32::from_str_radix(&digits, 16).ok()?)?;+ bytes.extend_from_slice(ch.to_string().as_bytes());+ continue;+ }+ '0'..='7' => {+ let digits = format!("{escaped}{}", chars.by_ref().take(2).collect::<String>());+ if digits.len() != 3 {+ return None;+ }+ u8::from_str_radix(&digits, 8).ok()?+ }+ _ => return None,+ };+ bytes.push(byte);+ } else {+ if ch == '\n' && quote == '"' {+ return None;+ }+ bytes.extend_from_slice(ch.to_string().as_bytes());+ }+ }+ None+}diff --git a/crates/ide-core/src/lib.rs b/crates/ide-core/src/lib.rsindex aa7db963a..6234af032 100644--- a/crates/ide-core/src/lib.rs+++ b/crates/ide-core/src/lib.rs@@ -7,6 +7,7 @@pub mod editor_settings;pub mod error;pub mod event;+pub mod go;pub mod ids;pub mod ignored;pub mod inspection_settings;diff --git a/crates/ide-run/src/go.rs b/crates/ide-run/src/go.rsindex 18e8225bb..5593b46e0 100644--- a/crates/ide-run/src/go.rs+++ b/crates/ide-run/src/go.rs@@ -269,127 +269,7 @@ pub fn prepare_test_file(root: &Path, config: &mut RunConfig) -> IdeResult<()> {Ok(())}-/// Module directories from a go.work file. Quoted paths and comments follow Go's file syntax.-pub fn work_modules(text: &str) -> Vec<PathBuf> {- let mut tokens = Vec::new();- let mut chars = text.chars().peekable();- while let Some(ch) = chars.next() {- match ch {- '\n' | '(' | ')' => tokens.push(ch.to_string()),- ch if ch.is_whitespace() => {}- '/' if chars.peek() == Some(&'/') => {- for c in chars.by_ref() {- if c == '\n' {- tokens.push("\n".into());- break;- }- }- }- '"' | '`' => {- let Some(token) = quoted_work_path(&mut chars, ch) else { return Vec::new() };- tokens.push(token);- }- _ => {- let mut token = ch.to_string();- while chars.peek().is_some_and(|c| !c.is_whitespace() && *c != '(' && *c != ')') {- token.push(chars.next().unwrap());- }- tokens.push(token);- }- }- }- let mut out = Vec::new();- let mut start = true;- let mut tokens = tokens.into_iter();- while let Some(token) = tokens.next() {- if token == "\n" {- start = true;- continue;- }- if start- && token == "use"- && let Some(path) = tokens.next()- {- if path == "(" {- let mut paths = Vec::new();- let mut closed = false;- for path in tokens.by_ref() {- if path == ")" {- closed = true;- break;- }- if path != "\n" && !path.is_empty() {- paths.push(PathBuf::from(path));- }- }- if closed {- out.extend(paths);- }- } else if path != "\n" && !path.is_empty() {- out.push(PathBuf::from(path));- }- }- start = false;- }- let mut seen = std::collections::HashSet::new();- out.retain(|path| seen.insert(path.clone()));- out-}--fn quoted_work_path(chars: &mut std::iter::Peekable<std::str::Chars<'_>>, quote: char) -> Option<String> {- let mut bytes = Vec::new();- while let Some(ch) = chars.next() {- if ch == quote {- return String::from_utf8(bytes).ok();- }- if ch == '\\' && quote == '"' {- let escaped = chars.next()?;- let byte = match escaped {- 'a' => 7,- 'b' => 8,- 'f' => 12,- 'n' => 10,- 'r' => 13,- 't' => 9,- 'v' => 11,- '\\' => b'\\',- '"' => b'"',- 'x' => {- let digits: String = chars.by_ref().take(2).collect();- if digits.len() != 2 {- return None;- }- u8::from_str_radix(&digits, 16).ok()?- }- 'u' | 'U' => {- let width = if escaped == 'u' { 4 } else { 8 };- let digits: String = chars.by_ref().take(width).collect();- if digits.len() != width {- return None;- }- let ch = char::from_u32(u32::from_str_radix(&digits, 16).ok()?)?;- bytes.extend_from_slice(ch.to_string().as_bytes());- continue;- }- '0'..='7' => {- let digits = format!("{escaped}{}", chars.by_ref().take(2).collect::<String>());- if digits.len() != 3 {- return None;- }- u8::from_str_radix(&digits, 8).ok()?- }- _ => return None,- };- bytes.push(byte);- } else {- if ch == '\n' && quote == '"' {- return None;- }- bytes.extend_from_slice(ch.to_string().as_bytes());- }- }- None-}+pub use ide_core::go::work_modules;#[cfg(test)]mod test_scope_tests {