Merge pull request #711 from denoland/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

Cargo.lock

@@ -74,7 +74,7 @@ deno_config.workspace = true
 deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
 deno_doc = { version = "=0.161.3", features = ["rust", "comrak"] }
 deno_error.workspace = true
-deno_graph = { version = "=0.86.7" }
+deno_graph = { version = "=0.86.8" }
 deno_lint = { version = "=0.68.2", features = ["docs"] }
 deno_lockfile.workspace = true
 deno_npm.workspace = true

cli/Cargo.toml

@@ -406,8 +406,9 @@ export function splitSelectors(input) {
     }
   }
 
-  if (last < input.length - 1) {
-    out.push(input.slice(last).trim());
+  const remaining = input.slice(last).trim();
+  if (remaining.length > 0) {
+    out.push(remaining);
   }
 
   return out;

cli/js/40_lint_selector.js

@@ -853,7 +853,8 @@ impl Settings {
       Some(false)
     } else if let Some(enable_paths) = &enable_paths {
       for enable_path in enable_paths {
-        if path.starts_with(enable_path) {
+        // Also enable if the checked path is a dir containing an enabled path.
+        if path.starts_with(enable_path) || enable_path.starts_with(&path) {
           return Some(true);
         }
       }

cli/lsp/config.rs

@@ -4005,12 +4005,14 @@ mod tests {
     temp_dir.write("root1/target/main.ts", ""); // no, because there is a Cargo.toml in the root directory
 
     temp_dir.create_dir_all("root2/folder");
+    temp_dir.create_dir_all("root2/folder2/inner_folder");
     temp_dir.create_dir_all("root2/sub_folder");
     temp_dir.create_dir_all("root2/root2.1");
     temp_dir.write("root2/file1.ts", ""); // yes, enabled
     temp_dir.write("root2/file2.ts", ""); // no, not enabled
     temp_dir.write("root2/folder/main.ts", ""); // yes, enabled
     temp_dir.write("root2/folder/other.ts", ""); // no, disabled
+    temp_dir.write("root2/folder2/inner_folder/main.ts", ""); // yes, enabled (regression test for https://github.com/denoland/vscode_deno/issues/1239)
     temp_dir.write("root2/sub_folder/a.js", ""); // no, not enabled
     temp_dir.write("root2/sub_folder/b.ts", ""); // no, not enabled
     temp_dir.write("root2/sub_folder/c.js", ""); // no, not enabled
@@ -4051,6 +4053,7 @@ mod tests {
             enable_paths: Some(vec![
               "file1.ts".to_string(),
               "folder".to_string(),
+              "folder2/inner_folder".to_string(),
             ]),
             disable_paths: vec!["folder/other.ts".to_string()],
             ..Default::default()
@@ -4101,6 +4104,10 @@ mod tests {
         temp_dir.url().join("root1/folder/mod.ts").unwrap(),
         temp_dir.url().join("root2/folder/main.ts").unwrap(),
         temp_dir.url().join("root2/root2.1/main.ts").unwrap(),
+        temp_dir
+          .url()
+          .join("root2/folder2/inner_folder/main.ts")
+          .unwrap(),
       ])
     );
   }

cli/lsp/language_server.rs

@@ -54,21 +54,24 @@ const fn str_to_utf16<const N: usize>(s: &str) -> [u16; N] {
 // - clearTimeout (both, but different implementation)
 // - global (node only)
 // - performance (both, but different implementation)
+// - process (always available in Node, while the availability in Deno depends
+//   on project creation time in Deno Deploy)
 // - setImmediate (node only)
 // - setInterval (both, but different implementation)
 // - setTimeout (both, but different implementation)
 // - window (deno only)
 
 // UTF-16 encodings of the managed globals. THIS LIST MUST BE SORTED.
 #[rustfmt::skip]
-const MANAGED_GLOBALS: [&[u16]; 12] = [
+const MANAGED_GLOBALS: [&[u16]; 13] = [
   &str_to_utf16::<6>("Buffer"),
   &str_to_utf16::<17>("WorkerGlobalScope"),
   &str_to_utf16::<14>("clearImmediate"),
   &str_to_utf16::<13>("clearInterval"),
   &str_to_utf16::<12>("clearTimeout"),
   &str_to_utf16::<6>("global"),
   &str_to_utf16::<11>("performance"),
+  &str_to_utf16::<7>("process"),
   &str_to_utf16::<4>("self"),
   &str_to_utf16::<12>("setImmediate"),
   &str_to_utf16::<11>("setInterval"),

ext/node/global.rs

@@ -946,7 +946,7 @@ Module.prototype.require = function (id) {
 // wrapper function we run the users code in. The only observable difference is
 // that in Deno `arguments.callee` is not null.
 Module.wrapper = [
-  "(function (exports, require, module, __filename, __dirname, Buffer, clearImmediate, clearInterval, clearTimeout, global, setImmediate, setInterval, setTimeout, performance) { (function (exports, require, module, __filename, __dirname) {",
+  "(function (exports, require, module, __filename, __dirname, Buffer, clearImmediate, clearInterval, clearTimeout, global, process, setImmediate, setInterval, setTimeout, performance) { (function (exports, require, module, __filename, __dirname) {",
   "\n}).call(this, exports, require, module, __filename, __dirname); })",
 ];
 Module.wrap = function (script) {
@@ -1031,6 +1031,7 @@ Module.prototype._compile = function (content, filename, format) {
     clearInterval,
     clearTimeout,
     global,
+    process,
     setImmediate,
     setInterval,
     setTimeout,
@@ -1049,6 +1050,7 @@ Module.prototype._compile = function (content, filename, format) {
     clearInterval,
     clearTimeout,
     global,
+    process,
     setImmediate,
     setInterval,
     setTimeout,

ext/node/polyfills/01_require.js

@@ -153,7 +153,7 @@ export function openPromise(
   return new Promise((resolve, reject) => {
     open(path, flags, mode, (err, fd) => {
       if (err) reject(err);
-      else resolve(new FileHandle(fd));
+      else resolve(new FileHandle(fd, path));
     });
   });
 }

ext/node/polyfills/_fs/_fs_open.ts

@@ -5,7 +5,7 @@
 
 import { EventEmitter } from "node:events";
 import { Buffer } from "node:buffer";
-import { promises, read, write } from "node:fs";
+import { Mode, promises, read, write } from "node:fs";
 export type { BigIntStats, Stats } from "ext:deno_node/_fs/_fs_stat.ts";
 import {
   BinaryOptionsArgument,
@@ -26,11 +26,15 @@ interface ReadResult {
   buffer: Buffer;
 }
 
+type Path = string | Buffer | URL;
 export class FileHandle extends EventEmitter {
   #rid: number;
-  constructor(rid: number) {
+  #path: Path;
+
+  constructor(rid: number, path: Path) {
     super();
     this.#rid = rid;
+    this.#path = path;
   }
 
   get fd() {
@@ -144,17 +148,24 @@ export class FileHandle extends EventEmitter {
   stat(options?: { bigint: boolean }): Promise<Stats | BigIntStats> {
     return fsCall(promises.fstat, this, options);
   }
+  chmod(mode: Mode): Promise<void> {
+    assertNotClosed(this, promises.chmod.name);
+    return promises.chmod(this.#path, mode);
+  }
 }
 
-function fsCall(fn, handle, ...args) {
+function assertNotClosed(handle: FileHandle, syscall: string) {
   if (handle.fd === -1) {
     const err = new Error("file closed");
     throw Object.assign(err, {
       code: "EBADF",
-      syscall: fn.name,
+      syscall,
     });
   }
+}
 
+function fsCall(fn, handle, ...args) {
+  assertNotClosed(handle, fn.name);
   return fn(handle.fd, ...args);
 }
 

ext/node/polyfills/internal/fs/handle.ts

@@ -20,6 +20,9 @@ import {
 import { assertThrows } from "@std/assert";
 
 Deno.test("splitSelectors", () => {
+  assertEquals(splitSelectors("*"), ["*"]);
+  assertEquals(splitSelectors("*,*"), ["*", "*"]);
+  assertEquals(splitSelectors("*,*     "), ["*", "*"]);
   assertEquals(splitSelectors("foo"), ["foo"]);
   assertEquals(splitSelectors("foo, bar"), ["foo", "bar"]);
   assertEquals(splitSelectors("foo:f(bar, baz)"), ["foo:f(bar, baz)"]);