builder: "v run src" and "v run ./scr" behaves differently (fixes #24205)

Author: medvednikov

01KKEFK1PV8GPPZGSR1K41WMB6

@@ -13,6 +13,16 @@ fn testsuite_end() {
 	os.rmdir_all(test_path) or {}
 }
 
+fn run_v_ok(command string) string {
+	res := os.execute(command)
+	if res.exit_code != 0 {
+		eprintln('> failing cmd: ${command}')
+		eprintln('> output:\n${res.output}')
+		assert res.exit_code == 0
+	}
+	return res.output
+}
+
 fn test_conditional_executable_removal() {
 	os.chdir(test_path)!
 	os.mkdir_all('src')!
@@ -82,3 +92,30 @@ pub struct BS{}
 	assert executable in after_compile_file_list
 	assert os.execute('./${executable}').output.trim_space() == 'AS{}=>BS{}'
 }
+
+fn test_run_explicit_src_directory_uses_project_root_lookup() {
+	os.chdir(test_path)!
+	project_dir := os.join_path(test_path, 'run_src_project')
+	defer {
+		os.chdir(test_path) or {}
+	}
+	os.mkdir_all(os.join_path(project_dir, 'src'))!
+	os.mkdir_all(os.join_path(project_dir, 'modules', 'somemoduletwo'))!
+	os.write_file(os.join_path(project_dir, 'src', 'main.v'), 'module main
+import somemoduletwo
+
+fn main() {
+	println(somemoduletwo.name())
+}
+')!
+	os.write_file(os.join_path(project_dir, 'modules', 'somemoduletwo', 'somemoduletwo.v'),
+		'module somemoduletwo
+
+pub fn name() string {
+	return "somemoduletwo"
+}
+')!
+	os.chdir(project_dir)!
+	assert run_v_ok('${os.quoted_path(vexe)} run src').trim_space() == 'somemoduletwo'
+	assert run_v_ok('${os.quoted_path(vexe)} run ./src').trim_space() == 'somemoduletwo'
+}

vlib/v/builder/builder_test.v

@@ -6,6 +6,7 @@ module builder
 import os
 import v.pref
 import v.util
+import v.vmod
 
 pub type FnBackend = fn (mut b Builder)
 
@@ -227,33 +228,22 @@ pub fn (mut v Builder) set_module_lookup_paths() {
 	// By default, these are what (3) contains:
 	// 3.1) search in vlib/
 	// 3.2) search in ~/.vmodules/ (i.e. modules installed with vpm)
+	lookup_root := v.module_lookup_root()
 	v.module_search_paths = []
 	if v.pref.is_test {
 		v.module_search_paths << os.dir(v.compiled_dir) // pdir of _test.v
 	}
-	v.module_search_paths << v.compiled_dir
-	mut source_root := ''
-	src_root := os.join_path(v.compiled_dir, 'src')
-	if os.exists(src_root) && !v.pref.is_vsh {
-		root_files := os.ls(v.compiled_dir) or { []string{} }
-		if v.pref.should_compile_filtered_files(v.compiled_dir, root_files).len == 0 {
-			source_root = src_root
-			v.module_search_paths << source_root
-		}
-	}
-	x := os.join_path(v.compiled_dir, 'modules')
+	v.module_search_paths << lookup_root
+	x := os.join_path(lookup_root, 'modules')
 	if v.pref.is_verbose {
 		println('x: "${x}"')
 	}
 
-	if source_root != '' && os.exists(os.join_path(source_root, 'modules')) {
-		v.module_search_paths << os.join_path(source_root, 'modules')
-	}
-	if source_root == '' && os.exists(os.join_path(v.compiled_dir, 'src/modules')) {
-		v.module_search_paths << os.join_path(v.compiled_dir, 'src/modules')
+	if os.exists(os.join_path(lookup_root, 'src/modules')) {
+		v.module_search_paths << os.join_path(lookup_root, 'src/modules')
 	}
-	if os.exists(os.join_path(v.compiled_dir, 'modules')) {
-		v.module_search_paths << os.join_path(v.compiled_dir, 'modules')
+	if os.exists(os.join_path(lookup_root, 'modules')) {
+		v.module_search_paths << os.join_path(lookup_root, 'modules')
 	}
 
 	v.module_search_paths << v.pref.lookup_path
@@ -263,6 +253,27 @@ pub fn (mut v Builder) set_module_lookup_paths() {
 	}
 }
 
+fn (v &Builder) module_lookup_root() string {
+	if os.file_name(v.compiled_dir) != 'src' {
+		return v.compiled_dir
+	}
+	project_dir := os.dir(v.compiled_dir)
+	if project_dir == v.compiled_dir {
+		return v.compiled_dir
+	}
+	mut mcache := vmod.get_cache()
+	if mcache.get_by_folder(v.compiled_dir).vmod_folder == project_dir {
+		return project_dir
+	}
+	if os.real_path(os.getwd()) == project_dir {
+		return project_dir
+	}
+	if os.is_dir(os.join_path(project_dir, 'modules')) {
+		return project_dir
+	}
+	return v.compiled_dir
+}
+
 pub fn (v Builder) get_builtin_files() []string {
 	if v.pref.no_builtin {
 		v.log('v.pref.no_builtin is true, get_builtin_files == []')