[pull] main from microsoft:main

.eslint-plugin-local/code-no-http-import.ts

@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TSESTree } from '@typescript-eslint/typescript-estree';
+import * as eslint from 'eslint';
+import { normalize } from 'path';
+import minimatch from 'minimatch';
+import { createImportRuleListener } from './utils.ts';
+
+const restrictedModules = new Set(['http', 'https']);
+
+const REPO_ROOT = normalize(`${import.meta.dirname}/..`);
+
+export default new class implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			notAllowed: 'Importing \'{{module}}\' is only allowed as a type import (`import type ...`) to prevent startup performance regressions as these modules are slow to load. Use dynamic `import(\'{{module}}\')` for runtime access.'
+		},
+		schema: {
+			type: 'array',
+			items: {
+				type: 'object',
+				properties: {
+					target: {
+						type: 'string',
+						description: 'A glob pattern for files to check'
+					}
+				},
+				additionalProperties: false,
+				required: ['target']
+			}
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		const targets = (context.options as { target: string }[]).map(o => o.target);
+		if (targets.length > 0) {
+			const relativeFilename = normalize(context.getFilename()).substring(REPO_ROOT.length + 1).replace(/\\/g, '/');
+			const matched = targets.some(pattern => minimatch(relativeFilename, pattern));
+			if (!matched) {
+				return {}; // file is not covered by any target pattern
+			}
+		}
+
+		return createImportRuleListener((node, path) => {
+			if (!restrictedModules.has(path)) {
+				return;
+			}
+
+			const parent = node.parent;
+			if (!parent) {
+				return;
+			}
+
+			// Allow: import type { ... } from 'http'
+			// Allow: import type * as http from 'http'
+			if (parent.type === TSESTree.AST_NODE_TYPES.ImportDeclaration && parent.importKind === 'type') {
+				return;
+			}
+
+			// Allow: export type { ... } from 'http'
+			if ('exportKind' in parent && parent.exportKind === 'type') {
+				return;
+			}
+
+			context.report({
+				loc: parent.loc,
+				messageId: 'notAllowed',
+				data: {
+					module: path
+				}
+			});
+		});
+	}
+};

build/azure-pipelines/alpine/product-build-alpine-cli.yml

@@ -9,7 +9,7 @@ parameters:
 
 jobs:
 - job: AlpineCLI_${{ parameters.VSCODE_ARCH }}
-  displayName: Alpine (${{ upper(parameters.VSCODE_ARCH) }})
+  displayName: Alpine CLI (${{ upper(parameters.VSCODE_ARCH) }})
   timeoutInMinutes: 60
   pool:
     name: 1es-ubuntu-22.04-x64

build/azure-pipelines/common/publish.ts

@@ -974,7 +974,6 @@ async function main() {
 
 	if (
 		e('VSCODE_BUILD_STAGE_LINUX') === 'True' ||
-		e('VSCODE_BUILD_STAGE_ALPINE') === 'True' ||
 		e('VSCODE_BUILD_STAGE_MACOS') === 'True' ||
 		e('VSCODE_BUILD_STAGE_WINDOWS') === 'True'
 	) {

build/azure-pipelines/product-build.yml

@@ -208,7 +208,7 @@ extends:
           jobs:
             - template: build/azure-pipelines/product-validation-checks.yml@self
 
-      - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+      - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
         - stage: CompileCLI
           dependsOn: []
           jobs:
@@ -244,18 +244,6 @@ extends:
                   VSCODE_ARCH: armhf
                   VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
 
-            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
-              - template: build/azure-pipelines/alpine/product-build-alpine-cli.yml@self
-                parameters:
-                  VSCODE_ARCH: x64
-                  VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-
-            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}:
-              - template: build/azure-pipelines/alpine/product-build-alpine-cli.yml@self
-                parameters:
-                  VSCODE_ARCH: arm64
-                  VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-
             - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
               - template: build/azure-pipelines/darwin/product-build-darwin-cli.yml@self
                 parameters:
@@ -313,7 +301,7 @@ extends:
         - stage: Windows
           dependsOn:
             - Compile
-            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
               - CompileCLI
           pool:
             name: 1es-windows-2022-x64
@@ -363,7 +351,7 @@ extends:
         - stage: Linux
           dependsOn:
             - Compile
-            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
               - CompileCLI
           pool:
             name: 1es-ubuntu-22.04-x64
@@ -418,23 +406,29 @@ extends:
         - stage: Alpine
           dependsOn:
             - Compile
-            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
-              - CompileCLI
           jobs:
             - ${{ if eq(parameters.VSCODE_BUILD_ALPINE, true) }}:
               - template: build/azure-pipelines/alpine/product-build-alpine.yml@self
                 parameters:
                   VSCODE_ARCH: x64
+              - template: build/azure-pipelines/alpine/product-build-alpine-cli.yml@self
+                parameters:
+                  VSCODE_ARCH: x64
+                  VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
             - ${{ if eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true) }}:
               - template: build/azure-pipelines/alpine/product-build-alpine.yml@self
                 parameters:
                   VSCODE_ARCH: arm64
+              - template: build/azure-pipelines/alpine/product-build-alpine-cli.yml@self
+                parameters:
+                  VSCODE_ARCH: arm64
+                  VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
 
       - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_MACOS'], true)) }}:
         - stage: macOS
           dependsOn:
             - Compile
-            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
+            - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
               - CompileCLI
           pool:
             name: AcesShared

build/lib/stylelint/vscode-known-variables.json

@@ -903,6 +903,9 @@
 		"--vscode-window-inactiveBorder"
 	],
 	"others": [
+		"--activity-bar-action-height",
+		"--activity-bar-icon-size",
+		"--activity-bar-width",
 		"--editor-font-size",
 		"--background-dark",
 		"--background-light",

build/next/index.ts

@@ -699,11 +699,11 @@ const transformOptions: esbuild.TransformOptions = {
 	}),
 };
 
-async function transpileFile(srcPath: string, destPath: string, relativePath: string): Promise<void> {
+async function transpileFile(srcPath: string, destPath: string): Promise<void> {
 	const source = await fs.promises.readFile(srcPath, 'utf-8');
 	const result = await esbuild.transform(source, {
 		...transformOptions,
-		sourcefile: relativePath,
+		sourcefile: srcPath,
 	});
 
 	await fs.promises.mkdir(path.dirname(destPath), { recursive: true });
@@ -728,7 +728,7 @@ async function transpile(outDir: string, excludeTests: boolean): Promise<void> {
 	await Promise.all(files.map(file => {
 		const srcPath = path.join(REPO_ROOT, SRC_DIR, file);
 		const destPath = path.join(REPO_ROOT, outDir, file.replace(/\.ts$/, '.js'));
-		return transpileFile(srcPath, destPath, file);
+		return transpileFile(srcPath, destPath);
 	}));
 }
 
@@ -996,7 +996,7 @@ async function watch(): Promise<void> {
 				await Promise.all(tsFiles.map(srcPath => {
 					const relativePath = path.relative(path.join(REPO_ROOT, SRC_DIR), srcPath);
 					const destPath = path.join(REPO_ROOT, outDir, relativePath.replace(/\.ts$/, '.js'));
-					return transpileFile(srcPath, destPath, relativePath);
+					return transpileFile(srcPath, destPath);
 				}));
 			}
 

build/win32/code.iss

@@ -1365,6 +1365,36 @@ end;
 
 // Updates
 
+function GetUpdateProgressFilePath(): String;
+begin
+  Result := ExpandConstant('{param:progress}');
+end;
+
+var
+  LastReportedProgressPct: Integer;
+
+procedure CurInstallProgressChanged(CurProgress, MaxProgress: Integer);
+var
+  ProgressFilePath: String;
+  ProgressContent: String;
+  CurrentPct: Integer;
+begin
+  if IsBackgroundUpdate() then begin
+    ProgressFilePath := GetUpdateProgressFilePath();
+    if ProgressFilePath <> '' then begin
+      if MaxProgress > 0 then
+        CurrentPct := (CurProgress * 100) div MaxProgress
+      else
+        CurrentPct := 0;
+      if CurrentPct <> LastReportedProgressPct then begin
+        LastReportedProgressPct := CurrentPct;
+        ProgressContent := IntToStr(CurProgress) + ',' + IntToStr(MaxProgress);
+        SaveStringToFile(ProgressFilePath, ProgressContent, False);
+      end;
+    end;
+  end;
+end;
+
 var
 	ShouldRestartTunnelService: Boolean;
 
@@ -1658,6 +1688,7 @@ begin
     begin
       SaveStringToFile(ExpandConstant('{app}\updating_version'), '{#Commit}', False);
       CreateMutex('{#AppMutex}-ready');
+      DeleteFile(GetUpdateProgressFilePath());
 
       Log('Checking whether application is still running...');
       while (CheckForMutexes('{#AppMutex}')) do

eslint.config.js

@@ -92,6 +92,7 @@ export default tseslint.config(
 			'local/code-no-localized-model-description': 'warn',
 			'local/code-policy-localization-key-match': 'warn',
 			'local/code-no-localization-template-literals': 'error',
+			'local/code-no-http-import': ['warn', { target: 'src/vs/**' }],
 			'local/code-no-deep-import-of-internal': ['error', { '.*Internal': true, 'searchExtTypesInternal': false }],
 			'local/code-layering': [
 				'warn',

extensions/git/src/repositoryCache.ts

@@ -9,6 +9,7 @@ import { Remote, RepositoryAccessDetails } from './api/git';
 import { isDescendant } from './util';
 
 export interface RepositoryCacheInfo {
+	repositoryPath: string; // path of the local repository clone
 	workspacePath: string; // path of the workspace folder or workspace file
 	lastTouchedTime?: number; // timestamp when the repository was last touched
 }
@@ -18,8 +19,8 @@ function isRepositoryCacheInfo(obj: unknown): obj is RepositoryCacheInfo {
 		return false;
 	}
 	const rec = obj as Record<string, unknown>;
-	return typeof rec.workspacePath === 'string' &&
-		(rec.lastOpenedTime === undefined || typeof rec.lastOpenedTime === 'number');
+	return typeof rec.workspacePath === 'string' && typeof rec.repositoryPath === 'string' &&
+		(rec.lastTouchedTime === undefined || typeof rec.lastTouchedTime === 'number');
 }
 
 export class RepositoryCache {
@@ -47,18 +48,18 @@ export class RepositoryCache {
 			this._recentRepositories = new Map<string, number>();
 
 			for (const [_, inner] of this.lru) {
-				for (const [repositoryPath, repositoryDetails] of inner) {
-					if (!repositoryDetails.lastTouchedTime) {
+				for (const [, repositoryDetails] of inner) {
+					if (!repositoryDetails.repositoryPath || !repositoryDetails.lastTouchedTime) {
 						continue;
 					}
 
 					// Check whether the repository exists with a more recent access time
-					const repositoryLastAccessTime = this._recentRepositories.get(repositoryPath);
+					const repositoryLastAccessTime = this._recentRepositories.get(repositoryDetails.repositoryPath);
 					if (repositoryLastAccessTime && repositoryDetails.lastTouchedTime <= repositoryLastAccessTime) {
 						continue;
 					}
 
-					this._recentRepositories.set(repositoryPath, repositoryDetails.lastTouchedTime);
+					this._recentRepositories.set(repositoryDetails.repositoryPath, repositoryDetails.lastTouchedTime);
 				}
 			}
 		}
@@ -99,6 +100,7 @@ export class RepositoryCache {
 		}
 
 		foldersLru.set(folderPathOrWorkspaceFile, {
+			repositoryPath: rootPath,
 			workspacePath: folderPathOrWorkspaceFile,
 			lastTouchedTime: Date.now()
 		}); // touch entry
@@ -110,7 +112,7 @@ export class RepositoryCache {
 		// If the current workspace is a workspace file, use that. Otherwise, find the workspace folder that contains the rootUri
 		let folderPathOrWorkspaceFile: string | undefined;
 		try {
-			if (this._workspaceFile) {
+			if (this._workspaceFile && this._workspaceFile.scheme === 'file') {
 				folderPathOrWorkspaceFile = this._workspaceFile.fsPath;
 			} else if (this._workspaceFolders && this._workspaceFolders.length) {
 				const sorted = [...this._workspaceFolders].sort((a, b) => b.uri.fsPath.length - a.uri.fsPath.length);
@@ -126,7 +128,6 @@ export class RepositoryCache {
 		} catch {
 			return;
 		}
-
 	}
 
 	update(addedRemotes: Remote[], removedRemotes: Remote[], rootPath: string): void {
@@ -203,7 +204,6 @@ export class RepositoryCache {
 					this.lru.set(repo, inner);
 				}
 			}
-
 		} catch {
 			this._logger.warn('[CachedRepositories][load] Failed to load cached repositories from global state.');
 		}

extensions/theme-2026/themes/styles.css

@@ -559,10 +559,6 @@
 }
 
 /* Minimap */
-.monaco-workbench .monaco-editor .minimap {
-	backdrop-filter: var(--backdrop-blur-lg) !important;
-	-webkit-backdrop-filter: var(--backdrop-blur-lg) !important;
-}
 
 .monaco-workbench .monaco-editor .minimap canvas {
 	opacity: 0.85;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.110.0",
-  "distro": "cdc946932deac5be9ae3710cf6d33ae8c45afe88",
+  "distro": "27cdb9e676748a9750bb217592c993ff5076ee6c",
   "author": {
     "name": "Microsoft Corporation"
   },

src/vs/base/common/defaultAccount.ts

@@ -56,6 +56,7 @@ export interface IDefaultAccountAuthenticationProvider {
 
 export interface IDefaultAccount {
 	readonly authenticationProvider: IDefaultAccountAuthenticationProvider;
+	readonly accountName: string;
 	readonly sessionId: string;
 	readonly enterprise: boolean;
 	readonly entitlementsData?: IEntitlementsData | null;

src/vs/base/parts/request/test/electron-main/request.test.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as http from 'http';
+import type * as http from 'http';
 import { AddressInfo } from 'net';
 import assert from 'assert';
 import { CancellationToken, CancellationTokenSource } from '../../../../common/cancellation.js';
@@ -19,6 +19,7 @@ suite('Request', () => {
 	let server: http.Server;
 
 	setup(async () => {
+		const http = await import('http');
 		port = await new Promise<number>((resolvePort, rejectPort) => {
 			server = http.createServer((req, res) => {
 				if (req.url === '/noreply') {

src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BrowserWindow } from 'electron';
-import { Server } from 'http';
+import type { Server } from 'http';
 import { Socket } from 'net';
 import { VSBuffer } from '../../../base/common/buffer.js';
 import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';