Merge branch 'main' into fix/improve-marker-placements

Author: cpendery

build/gulpfile.js

@@ -7,6 +7,13 @@
 
 // Increase max listeners for event emitters
 require('events').EventEmitter.defaultMaxListeners = 100;
+const { gracefulify } = require('graceful-fs');
+const fs = require('fs');
+try {
+	gracefulify(fs);
+} catch (e) {
+	logger.log(`Error enabling graceful-fs: ${e}`);
+}
 
 const gulp = require('gulp');
 const util = require('./lib/util');

build/package.json

@@ -43,6 +43,7 @@
     "electron-osx-sign": "^0.4.16",
     "esbuild": "0.20.0",
     "extract-zip": "^2.0.1",
+    "graceful-fs": "^4.2.11",
     "gulp-merge-json": "^2.1.1",
     "gulp-shell": "^0.8.0",
     "jsonc-parser": "^2.3.0",

build/win32/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "inno_updater"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Microsoft <[email protected]>"]
 build = "build.rs"
 
@@ -9,7 +9,7 @@ byteorder = "1.4.3"
 crc = "3.0.1"
 slog = "2.7.0"
 slog-async = "2.7.0"
-slog-term = "2.9.0"
+slog-term = "2.9.1"
 
 [target.'cfg(windows)'.dependencies.windows-sys]
 version = "0.42"

build/win32/Cargo.toml

@@ -1563,6 +1563,11 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
   integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
+graceful-fs@^4.2.11:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"

build/win32/inno_updater.exe

@@ -187,13 +187,6 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 			const config = getEmmetConfiguration(syntax!);
 			const result = helper.doComplete(toLSTextDocument(document), position, syntax, config);
 
-			// https://github.com/microsoft/vscode/issues/86941
-			if (result && result.items && result.items.length === 1) {
-				if (result.items[0].label === 'widows: ;') {
-					return undefined;
-				}
-			}
-
 			const newItems: vscode.CompletionItem[] = [];
 			if (result && result.items) {
 				result.items.forEach((item: any) => {

build/yarn.lock

@@ -29,8 +29,30 @@ suite('Tests for completion in CSS embedded in HTML', () => {
 	});
 
 	// https://github.com/microsoft/vscode/issues/86941
-	test('#86941, widows should not be completed', async () => {
-		await testCompletionProvider('css', `.foo { wi| }`, undefined);
+	test('#86941, widows should be completed after width', async () => {
+		await testCompletionProvider('css', `.foo { wi| }`, [
+			{ label: 'width: ;', documentation: `width: |;` }
+		]);
+		await testCompletionProvider('css', `.foo { wid| }`, [
+			{ label: 'width: ;', documentation: `width: |;` }
+		]);
+		try {
+			await testCompletionProvider('css', `.foo { wi| }`, [
+				{ label: 'widows: ;', documentation: `widows: |;` }
+			]);
+		} catch (e) {
+			assert.strictEqual(e.message, "Didn't find completion item with label widows: ;");
+		}
+		try {
+			await testCompletionProvider('css', `.foo { wid| }`, [
+				{ label: 'widows: ;', documentation: `widows: |;` }
+			]);
+		} catch (e) {
+			assert.strictEqual(e.message, "Didn't find completion item with label widows: ;");
+		}
+		await testCompletionProvider('css', `.foo { wido| }`, [
+			{ label: 'widows: ;', documentation: `widows: |;` }
+		]);
 	});
 
 	// https://github.com/microsoft/vscode/issues/117020

extensions/emmet/src/defaultCompletionProvider.ts

@@ -59,9 +59,9 @@
   integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
 
 "@vscode/emmet-helper@^2.8.8":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@vscode/emmet-helper/-/emmet-helper-2.9.2.tgz#cd5d1e64e7138ad76300e8cba5fd84f1c03e13ee"
-  integrity sha512-MaGuyW+fa13q3aYsluKqclmh62Hgp0BpKIqS66fCxfOaBcVQ1OnMQxRRgQUYnCkxFISAQlkJ0qWWPyXjro1Qrg==
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/@vscode/emmet-helper/-/emmet-helper-2.9.3.tgz#8a8b228981fcf2d9346fdca77b9ad5a31dc09dba"
+  integrity sha512-rB39LHWWPQYYlYfpv9qCoZOVioPCftKXXqrsyqN1mTWZM6dTnONT63Db+03vgrBbHzJN45IrgS/AGxw9iiqfEw==
   dependencies:
     emmet "^2.4.3"
     jsonc-parser "^2.3.0"
@@ -70,9 +70,9 @@
     vscode-uri "^2.1.2"
 
 emmet@^2.4.3:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.4.4.tgz#801aad64659dc76f3003130db767d77a78ac298e"
-  integrity sha512-v8Mwpjym55CS3EjJgiCLWUB3J2HSR93jhzXW325720u8KvYxdI2voYLstW3pHBxFz54H6jFjayR9G4LfTG0q+g==
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/emmet/-/emmet-2.4.7.tgz#19893c34e6274af14ea3c5729101e3c4ed18f01e"
+  integrity sha512-O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA==
   dependencies:
     "@emmetio/abbreviation" "^2.3.3"
     "@emmetio/css-abbreviation" "^2.1.8"

extensions/emmet/src/test/completion.test.ts

@@ -287,7 +287,13 @@ export class PackageJSONContribution implements IJSONContribution {
 		return new Promise((resolve, _reject) => {
 			const args = ['view', '--json', '--', pack, 'description', 'dist-tags.latest', 'homepage', 'version', 'time'];
 			const cwd = resource && resource.scheme === 'file' ? dirname(resource.fsPath) : undefined;
-			cp.execFile(npmCommandPath, args, { cwd }, (error, stdout) => {
+
+			// corepack npm wrapper would automatically update package.json. disable that behavior.
+			// COREPACK_ENABLE_AUTO_PIN disables the package.json overwrite, and
+			// COREPACK_ENABLE_PROJECT_SPEC makes the npm view command succeed
+			//   even if packageManager specified a package manager other than npm.
+			const env = { COREPACK_ENABLE_AUTO_PIN: "0", COREPACK_ENABLE_PROJECT_SPEC: "0" };
+			cp.execFile(npmCommandPath, args, { cwd, env }, (error, stdout) => {
 				if (!error) {
 					try {
 						const content = JSON.parse(stdout);