Merge branch 'main' into aiday/changingTheInlineChatBackgroundColor

Author: aiday-mar

.vscode/settings.json

@@ -148,5 +148,6 @@
 	],
 	"application.experimental.rendererProfiling": true,
 	"editor.experimental.asyncTokenization": true,
-	"editor.experimental.asyncTokenizationVerification": true
+	"editor.experimental.asyncTokenizationVerification": true,
+	"diffEditor.experimental.useVersion2": true,
 }

build/gulpfile.reh.js

@@ -125,8 +125,9 @@ const serverWithWebEntryPoints = [
 
 function getNodeVersion() {
 	const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
-	const target = /^target "(.*)"$/m.exec(yarnrc)[1];
-	return target;
+	const nodeVersion = /^target "(.*)"$/m.exec(yarnrc)[1];
+	const internalNodeVersion = /^ms_build_id "(.*)"$/m.exec(yarnrc)[1];
+	return { nodeVersion, internalNodeVersion };
 }
 
 function getNodeChecksum(nodeVersion, platform, arch) {
@@ -156,7 +157,7 @@ function getNodeChecksum(nodeVersion, platform, arch) {
 	return undefined;
 }
 
-const nodeVersion = getNodeVersion();
+const { nodeVersion, internalNodeVersion } = getNodeVersion();
 
 BUILD_TARGETS.forEach(({ platform, arch }) => {
 	gulp.task(task.define(`node-${platform}-${arch}`, () => {
@@ -193,7 +194,7 @@ function nodejs(platform, arch) {
 		arch = 'x64';
 	}
 
-	log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from ${product.nodejs.repository}...`);
+	log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from ${product.nodejsRepository}...`);
 
 	const checksumSha256 = getNodeChecksum(nodeVersion, platform, arch);
 
@@ -205,14 +206,14 @@ function nodejs(platform, arch) {
 
 	switch (platform) {
 		case 'win32':
-			return (product.nodejs.repository !== 'https://nodejs.org' ?
-				fetchGithub(product.nodejs.repository, { version: product.nodejs.version, name: `win-${arch}-node.exe`, checksumSha256 }) :
+			return (product.nodejsRepository !== 'https://nodejs.org' ?
+				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `win-${arch}-node.exe`, checksumSha256 }) :
 				fetchUrls(`/dist/v${nodeVersion}/win-${arch}/node.exe`, { base: 'https://nodejs.org', checksumSha256 }))
 				.pipe(rename('node.exe'));
 		case 'darwin':
 		case 'linux':
-			return (product.nodejs.repository !== 'https://nodejs.org' ?
-				fetchGithub(product.nodejs.repository, { version: product.nodejs.version, name: `node-v${nodeVersion}-${platform}-${arch}.tar.gz`, checksumSha256 }) :
+			return (product.nodejsRepository !== 'https://nodejs.org' ?
+				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `node-v${nodeVersion}-${platform}-${arch}.tar.gz`, checksumSha256 }) :
 				fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 })
 			).pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
 				.pipe(filter('**/node'))

extensions/git/src/model.ts

@@ -95,7 +95,9 @@ class ParentRepositoriesManager {
 		return [...this._repositories.values()];
 	}
 
-	constructor(private readonly globalState: Memento) { }
+	constructor(private readonly globalState: Memento) {
+		this.onDidChangeRepositories();
+	}
 
 	addRepository(repository: string): void {
 		this._repositories.add(repository);
@@ -137,6 +139,10 @@ class UnsafeRepositoriesManager {
 		return [...this._repositories.keys()];
 	}
 
+	constructor() {
+		this.onDidChangeRepositories();
+	}
+
 	addRepository(repository: string, path: string): void {
 		this._repositories.set(repository, path);
 		this.onDidChangeRepositories();

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.80.0",
-  "distro": "a44605dbeeed7ad5c41513260004329c4f502793",
+  "distro": "94a4bd29af2fe03e39c7867fdca1b2e27fed3a39",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -71,7 +71,7 @@
     "@vscode/proxy-agent": "^0.13.2",
     "@vscode/ripgrep": "^1.15.4",
     "@vscode/spdlog": "^0.13.10",
-    "@vscode/sqlite3": "5.1.4-vscode",
+    "@vscode/sqlite3": "5.1.5-vscode",
     "@vscode/sudo-prompt": "9.3.1",
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-mutex": "^0.4.4",
@@ -86,7 +86,7 @@
     "native-is-elevated": "0.6.0",
     "native-keymap": "^3.3.2",
     "native-watchdog": "^1.4.1",
-    "node-pty": "1.0",
+    "node-pty": "1.1.0-beta1",
     "tas-client-umd": "0.1.8",
     "v8-inspect-profiler": "^0.1.0",
     "vscode-oniguruma": "1.7.0",
@@ -230,4 +230,4 @@
   "optionalDependencies": {
     "windows-foreground-love": "0.5.0"
   }
-}
+}

product.json

@@ -30,6 +30,7 @@
 	"linuxIconName": "code-oss",
 	"licenseFileName": "LICENSE.txt",
 	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
+	"nodejsRepository": "https://nodejs.org",
 	"urlProtocol": "code-oss",
 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
 	"builtInExtensions": [
@@ -81,9 +82,5 @@
 				"publisherDisplayName": "Microsoft"
 			}
 		}
-	],
-	"nodejs": {
-		"repository": "https://nodejs.org",
-		"version": "16.17.1"
-	}
+	]
 }

remote/.yarnrc

@@ -1,4 +1,5 @@
 disturl "http://nodejs.org/dist"
 target "16.17.1"
+ms_build_id "20230714"
 runtime "node"
 build_from_source "true"

remote/package.json

@@ -21,7 +21,7 @@
     "keytar": "7.9.0",
     "minimist": "^1.2.6",
     "native-watchdog": "^1.4.1",
-    "node-pty": "1.0",
+    "node-pty": "1.1.0-beta1",
     "tas-client-umd": "0.1.8",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",

remote/yarn.lock

@@ -537,10 +537,10 @@ node-gyp-build@^4.3.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
   integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
 
-node-pty@1.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.0.0.tgz#7daafc0aca1c4ca3de15c61330373af4af5861fd"
-  integrity sha512-wtBMWWS7dFZm/VgqElrTvtfMq4GzJ6+edFI0Y0zyzygUSZMgZdraDUMUhCIvkjhJjme15qWmbyJbtAx4ot4uZA==
+node-pty@1.1.0-beta1:
+  version "1.1.0-beta1"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta1.tgz#95d4baf406c043b78042f951b325e9713df2beac"
+  integrity sha512-h+1E/gX/brFqsp3yZKGERHOhdo1POG1rrsI+8tEuocqdEddHd029471gq8KOuiHKicd52h2pSU8Gtqb3Vo2PfQ==
   dependencies:
     nan "^2.17.0"
 

src/vs/base/browser/ui/scrollbar/scrollableElement.ts

@@ -373,6 +373,9 @@ export abstract class AbstractScrollableElement extends Widget {
 	}
 
 	private _onMouseWheel(e: StandardWheelEvent): void {
+		if (e.browserEvent?.defaultPrevented) {
+			return;
+		}
 
 		const classifier = MouseWheelClassifier.INSTANCE;
 		if (SCROLL_WHEEL_SMOOTH_SCROLL_ENABLED) {

src/vs/base/test/node/pfs/fixtures/index.html

@@ -41,22 +41,22 @@
     }
     </script>
     <script type="text/javascript">
-	
+
         var libText = "";
         $.get("../compiler/lib.ts", function(newLibText) {
             libText = newLibText;
-        });	
-        
+        });
+
 
         // execute the javascript in the compiledOutput pane
         function execute() {
           $('#compilation').text("Running...");
           var txt = $('#compiledOutput').val();
           var res;
           try {
-             var ret = eval(txt);
+             var ret = eval(txt); // CodeQL [SM01632] This code is only used for tests
              res = "Ran successfully!";
-          } catch(e) { 
+          } catch(e) {
              res = "Exception thrown: " + e;
           }
           $('#compilation').text(String(res));
@@ -70,7 +70,7 @@
                 compiledSource = compile(newText, libText);
             } catch (e) {
                 compiledSource = "//Parse error"
-                for(var i in e) 
+                for(var i in e)
                   compiledSource += "\r// " + e[i];
             }
             $('#compiledOutput').val(compiledSource);
@@ -111,7 +111,7 @@ <h1>TypeScript</h1>
 //Compiled code will show up here...
       </textarea>
       <br />
-      <button onclick='execute()'/>Run</button> 
+      <button onclick='execute()'/>Run</button>
       <div id='compilation'>Press 'run' to execute code...</div>
       <div id='results'>...write your results into #results...</div>
     </div>