From fb7ddcd4c90be3c91e873c0c13b859bdf988ec37 Mon Sep 17 00:00:00 2001
From: Enzo <enzo.baldisserri@outlook.fr>
Date: Sun, 2 May 2021 20:46:12 +0200
Subject: [PATCH] checker: fix looking for unprefixed `os` functions (#9968)

---
 vlib/os/os_test.v                  | 32 +++++++++++++++---------------
 vlib/v/checker/checker.v           |  2 +-
 vlib/v/checker/tests/os_prefix.out | 18 +++++++++++++++++
 vlib/v/checker/tests/os_prefix.vv  |  7 +++++++
 4 files changed, 42 insertions(+), 17 deletions(-)
 create mode 100644 vlib/v/checker/tests/os_prefix.out
 create mode 100644 vlib/v/checker/tests/os_prefix.vv

diff --git a/vlib/os/os_test.v b/vlib/os/os_test.v
index 0412ca08de..ce324a74f6 100644
--- a/vlib/os/os_test.v
+++ b/vlib/os/os_test.v
@@ -229,31 +229,31 @@ fn test_mv() {
 	os.mv(tfile1, tdir1) or { panic(err) }
 	mut expected := os.join_path(tdir1, 'file')
 	assert os.exists(expected)
-	assert !is_dir(expected)
+	assert !os.is_dir(expected)
 	// Move dir with contents to other dir
 	os.mv(tdir1, tdir2) or { panic(err) }
 	expected = os.join_path(tdir2, 'dir')
 	assert os.exists(expected)
-	assert is_dir(expected)
+	assert os.is_dir(expected)
 	expected = os.join_path(tdir2, 'dir', 'file')
 	assert os.exists(expected)
-	assert !is_dir(expected)
+	assert !os.is_dir(expected)
 	// Move dir with contents to other dir (by renaming)
 	os.mv(os.join_path(tdir2, 'dir'), tdir3) or { panic(err) }
 	expected = tdir3
 	assert os.exists(expected)
-	assert is_dir(expected)
+	assert os.is_dir(expected)
 	assert os.is_dir_empty(tdir2)
 	// Move file with extension to dir
 	os.mv(tfile2, tdir2) or { panic(err) }
 	expected = os.join_path(tdir2, 'file.test')
 	assert os.exists(expected)
-	assert !is_dir(expected)
+	assert !os.is_dir(expected)
 	// Move file to dir (by renaming)
 	os.mv(os.join_path(tdir2, 'file.test'), tfile3) or { panic(err) }
 	expected = tfile3
 	assert os.exists(expected)
-	assert !is_dir(expected)
+	assert !os.is_dir(expected)
 }
 
 fn test_cp_all() {
@@ -520,8 +520,8 @@ fn test_posix_set_bit() {
 		assert true
 	} $else {
 		fpath := '/tmp/permtest'
-		create(fpath) or { panic("Couldn't create file") }
-		chmod(fpath, 0o7777)
+		os.create(fpath) or { panic("Couldn't create file") }
+		os.chmod(fpath, 0o7777)
 		c_fpath := &char(fpath.str)
 		mut s := C.stat{}
 		unsafe {
@@ -531,37 +531,37 @@ fn test_posix_set_bit() {
 		mut mode := u32(s.st_mode) & 0o7777
 		assert mode == 0o7777
 		// `chmod u-r`
-		posix_set_permission_bit(fpath, os.s_irusr, false)
+		os.posix_set_permission_bit(fpath, os.s_irusr, false)
 		unsafe {
 			C.stat(c_fpath, &s)
 		}
 		mode = u32(s.st_mode) & 0o7777
 		assert mode == 0o7377
 		// `chmod u+r`
-		posix_set_permission_bit(fpath, os.s_irusr, true)
+		os.posix_set_permission_bit(fpath, os.s_irusr, true)
 		unsafe {
 			C.stat(c_fpath, &s)
 		}
 		mode = u32(s.st_mode) & 0o7777
 		assert mode == 0o7777
 		// `chmod -s -g -t`
-		posix_set_permission_bit(fpath, os.s_isuid, false)
-		posix_set_permission_bit(fpath, os.s_isgid, false)
-		posix_set_permission_bit(fpath, os.s_isvtx, false)
+		os.posix_set_permission_bit(fpath, os.s_isuid, false)
+		os.posix_set_permission_bit(fpath, os.s_isgid, false)
+		os.posix_set_permission_bit(fpath, os.s_isvtx, false)
 		unsafe {
 			C.stat(c_fpath, &s)
 		}
 		mode = u32(s.st_mode) & 0o7777
 		assert mode == 0o0777
 		// `chmod g-w o-w`
-		posix_set_permission_bit(fpath, os.s_iwgrp, false)
-		posix_set_permission_bit(fpath, os.s_iwoth, false)
+		os.posix_set_permission_bit(fpath, os.s_iwgrp, false)
+		os.posix_set_permission_bit(fpath, os.s_iwoth, false)
 		unsafe {
 			C.stat(c_fpath, &s)
 		}
 		mode = u32(s.st_mode) & 0o7777
 		assert mode == 0o0755
-		rm(fpath) or {}
+		os.rm(fpath) or {}
 	}
 }
 
diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
index 47e48dd458..078eb78480 100644
--- a/vlib/v/checker/checker.v
+++ b/vlib/v/checker/checker.v
@@ -2223,7 +2223,7 @@ pub fn (mut c Checker) fn_call(mut call_expr ast.CallExpr) ast.Type {
 			return ast.void_type
 		}
 	}
-	if !found && c.pref.is_script && !found {
+	if !found && c.pref.is_vsh {
 		os_name := 'os.$fn_name'
 		if f := c.table.find_fn(os_name) {
 			if f.generic_names.len == call_expr.concrete_types.len {
diff --git a/vlib/v/checker/tests/os_prefix.out b/vlib/v/checker/tests/os_prefix.out
new file mode 100644
index 0000000000..4b87a6fff7
--- /dev/null
+++ b/vlib/v/checker/tests/os_prefix.out
@@ -0,0 +1,18 @@
+vlib/v/checker/tests/os_prefix.vv:1:8: warning: module 'os' is imported but never used
+    1 | import os
+      |        ~~
+    2 |
+    3 | fn main() {
+vlib/v/checker/tests/os_prefix.vv:5:12: error: unknown function: execute
+    3 | fn main() {
+    4 |     cmd := "ls"
+    5 |     result := execute(cmd)
+      |               ~~~~~~~~~~~~
+    6 |     println(result)
+    7 | }
+vlib/v/checker/tests/os_prefix.vv:6:2: error: `println` can not print void expressions
+    4 |     cmd := "ls"
+    5 |     result := execute(cmd)
+    6 |     println(result)
+      |     ~~~~~~~~~~~~~~~
+    7 | }
diff --git a/vlib/v/checker/tests/os_prefix.vv b/vlib/v/checker/tests/os_prefix.vv
new file mode 100644
index 0000000000..b9342d350d
--- /dev/null
+++ b/vlib/v/checker/tests/os_prefix.vv
@@ -0,0 +1,7 @@
+import os
+
+fn main() {
+	cmd := "ls"
+	result := execute(cmd)
+	println(result)
+}