[automated] Merge branch 'main' => 'prerelease' (#7917)

Author: dibarbet

CHANGELOG.md

@@ -3,6 +3,16 @@
 - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
+# 2.62.x
+* Update Roslyn to 4.14.0-1.25060.2 (PR: [#7916](https://github.com/dotnet/vscode-csharp/pull/7916))
+  * Support Extracting method with complex flow control cosntructs in them. (PR: [#76686](https://github.com/dotnet/roslyn/pull/76686))
+  * Classify the langword attribute value in DocComments (PR: [#76678](https://github.com/dotnet/roslyn/pull/76678))
+  * Fix FAR/rename with method type parameters (PR: [#76652](https://github.com/dotnet/roslyn/pull/76652))
+  * Fix assembly load when file path contains URI reserved chars (PR: [#76617](https://github.com/dotnet/roslyn/pull/76617))
+  * Reduce allocations during checksum creation. (PR: [#76524](https://github.com/dotnet/roslyn/pull/76524))
+* Bump xamlTools to 17.13.35709.178 (PR: [#7914](https://github.com/dotnet/vscode-csharp/pull/7914))
+
+
 # 2.61.x
 * Update Razor to 9.0.0-preview.25052.3 (PR: [#7904](https://github.com/dotnet/vscode-csharp/pull/7904))
   * Offer generate handler for `@bind-XX:after` and `:set` (#11350) (PR: [#11350](https://github.com/dotnet/razor/pull/11350))

CONTRIBUTING.md

@@ -35,8 +35,8 @@ Follow these steps to build, run, and test the repository:
 
 #### Building
 
-1. Run `npm i` - This command installs the project dependencies.
-2. Run `vsts-npm-auth -config .npmrc` - This command will configure your credentials for the next command.
+1. Run `npm install -g vsts-npm-auth`, then run `vsts-npm-auth -config .npmrc` - This command will configure your credentials for the next command.
+2. Run `npm i` - This command installs the project dependencies.
 3. Run `npm i -g gulp` - This command installs Gulp globally.
 4. Run `gulp installDependencies` - This command downloads the various dependencies as specified by the version in the [package.json](package.json) file.
 5. Run `code .` - This command opens the project in Visual Studio Code.

azure-pipelines/test-matrix.yml

@@ -17,7 +17,7 @@ jobs:
   strategy:
     matrix:
       CSharpTests:
-        npmCommand: 'test:unit' # Restore when integration test are stable: 'test:withoutDevKit'
+        npmCommand: test:withoutDevKit
       DevKitTests:
         npmCommand: test:integration:devkit
   pool: ${{ parameters.pool }}

package-lock.json

@@ -37,11 +37,11 @@
     }
   },
   "defaults": {
-    "roslyn": "4.13.0-3.25051.1",
+    "roslyn": "4.14.0-1.25060.2",
     "omniSharp": "1.39.12",
     "razor": "9.0.0-preview.25052.3",
     "razorOmnisharp": "7.0.0-preview.23363.1",
-    "xamlTools": "17.13.35703.12"
+    "xamlTools": "17.13.35709.178"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",
@@ -96,7 +96,7 @@
     "@vscode/extension-telemetry": "^0.9.0",
     "@vscode/js-debug-browsers": "^1.1.0",
     "async-file": "2.0.2",
-    "cross-spawn": "6.0.5",
+    "cross-spawn": "6.0.6",
     "execa": "4.0.0",
     "fs-extra": "9.1.0",
     "http-proxy-agent": "7.0.0",
@@ -136,8 +136,8 @@
     "@types/uuid": "^9.0.1",
     "@types/vscode": "1.93.0",
     "@types/yauzl": "2.10.0",
-    "@typescript-eslint/eslint-plugin": "^8.5.0",
-    "@typescript-eslint/parser": "^8.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.19.0",
+    "@typescript-eslint/parser": "^8.19.0",
     "@vscode/l10n-dev": "^0.0.35",
     "@vscode/test-electron": "2.3.8",
     "@vscode/vsce": "3.0.0",

package.json

@@ -22,7 +22,7 @@ import {
 } from 'vscode-languageserver-protocol';
 
 import * as RoslynProtocol from './roslynProtocol';
-import * as UUID from 'vscode-languageclient/lib/common/utils/uuid';
+import { generateUuid } from 'vscode-languageclient/lib/common/utils/uuid';
 
 export class OnAutoInsertFeature implements DynamicFeature<RoslynProtocol.OnAutoInsertRegistrationOptions> {
     private readonly _client: LanguageClient;
@@ -92,7 +92,7 @@ export class OnAutoInsertFeature implements DynamicFeature<RoslynProtocol.OnAuto
             return;
         }
         this.register({
-            id: UUID.generateUuid(),
+            id: generateUuid(),
             registerOptions: options,
         });
     }

src/lsptoolshost/onAutoInsertFeature.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import assert = require('node:assert');
+import assert from 'node:assert';
 
 export function convertServerOptionNameToClientConfigurationName(section: string): string | null {
     // Server name would be in format {languageName}|{grouping}.{name} or

src/lsptoolshost/optionNameConverter.ts

@@ -12,7 +12,7 @@ import {
     RestoreRequest,
     ProjectNeedsRestoreRequest,
 } from './roslynProtocol';
-import path = require('path');
+import path from 'path';
 import { showErrorMessage } from '../shared/observers/utils/showMessage';
 import { getCSharpDevKit } from '../utils/getCSharpDevKit';
 

src/lsptoolshost/restore.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Url } from 'url';
-import HttpProxyAgent = require('http-proxy-agent');
-import HttpsProxyAgent = require('https-proxy-agent');
+import HttpProxyAgent from 'http-proxy-agent';
+import HttpsProxyAgent from 'https-proxy-agent';
 import { Agent } from 'http';
 
 function getSystemProxyURL(requestURL: Url): string | undefined {

src/packageManager/proxy.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import execa = require('execa');
+import execa from 'execa';
 import { promises, readFileSync } from 'fs';
 import { join } from 'path';
 import { fileURLToPath } from 'url';

src/razor/src/blazorDebug/blazorDebugConfigurationProvider.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as psList from 'ps-list';
+import psList from 'ps-list';
 import { DebugSession } from 'vscode';
 import { RazorLogger } from '../razorLogger';
 import { JS_DEBUG_NAME, SERVER_APP_NAME } from './constants';

src/razor/src/blazorDebug/terminateDebugHandler.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import removeBomBuffer = require('strip-bom-buf');
+import removeBomBuffer from 'strip-bom-buf';
 import removeBomString from 'strip-bom';
 
 export function removeBOMFromBuffer(buffer: Buffer): Buffer {

src/utils/removeBom.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as minimist from 'minimist';
+import minimist from 'minimist';
 import * as path from 'path';
 
 const argv = minimist(process.argv.slice(2));

tasks/commandLineArguments.ts

@@ -5,7 +5,7 @@
 
 import * as gulp from 'gulp';
 import * as fs from 'fs';
-import * as minimist from 'minimist';
+import minimist from 'minimist';
 import { Octokit } from '@octokit/rest';
 
 interface Options {

tasks/createTagsTasks.ts

@@ -5,7 +5,7 @@
 
 import * as gulp from 'gulp';
 import * as process from 'node:process';
-import * as minimist from 'minimist';
+import minimist from 'minimist';
 import { spawnSync } from 'node:child_process';
 import * as path from 'path';
 import * as util from 'node:util';

tasks/localizationTasks.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as cp from 'child_process';
-import * as del from 'del';
+import del from 'del';
 import * as fs from 'fs';
 import * as fsextra from 'fs-extra';
 import * as gulp from 'gulp';
@@ -31,7 +31,7 @@ import {
 import { getPackageJSON } from '../tasks/packageJson';
 import { createPackageAsync, generateVsixManifest } from '../tasks/vsceTasks';
 import { isValidDownload } from '../src/packageManager/isValidDownload';
-import path = require('path');
+import path from 'path';
 import { CancellationToken } from 'vscode';
 // There are no typings for this library.
 // eslint-disable-next-line @typescript-eslint/no-var-requires

tasks/offlinePackagingTasks.ts

@@ -7,7 +7,7 @@ import * as cp from 'child_process';
 import * as fs from 'fs';
 import * as gulp from 'gulp';
 import { rootPath } from './projectPaths';
-import path = require('path');
+import path from 'path';
 // There are no typings for this library.
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 //const argv = require('yargs').argv;

tasks/signingTasks.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as fs from 'fs';
+import fs from 'fs';
 import * as gulp from 'gulp';
 import * as path from 'path';
 import { codeExtensionPath, rootPath, outPath } from './projectPaths';

tasks/testTasks.ts

@@ -8,7 +8,7 @@ import { describe, test, expect, beforeAll, afterAll, beforeEach, afterEach } fr
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
 import { AnalysisSetting, BuildDiagnosticsService } from '../../../src/lsptoolshost/buildDiagnosticsService';
 import * as integrationHelpers from './integrationHelpers';
-import path = require('path');
+import path from 'path';
 describe(`Build and live diagnostics dedupe`, () => {
     beforeAll(async () => {
         await integrationHelpers.activateCSharpExtension();

test/lsptoolshost/integrationTests/buildDiagnostics.integration.test.ts

@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import { describe, test, beforeAll, afterAll, expect, beforeEach, afterEach } from '@jest/globals';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
 import { AnalysisSetting } from '../../../src/lsptoolshost/buildDiagnosticsService';
-import path = require('path');
+import path from 'path';
 import { getCode, setBackgroundAnalysisScopes, waitForExpectedDiagnostics } from './diagnosticsHelpers';
 import {
     activateCSharpExtension,

test/lsptoolshost/integrationTests/documentDiagnostics.integration.test.ts

@@ -118,6 +118,35 @@ export async function getCodeLensesAsync(): Promise<vscode.CodeLens[]> {
     // The number of code lens items to resolve.  Set to a high number so we get pretty much everything in the document.
     const resolvedItemCount = 100;
 
+    let tryCount = 0;
+    const maxRetryCount = 3;
+    do {
+        try {
+            const result = await executeCodeLensProviderAsync(activeEditor, resolvedItemCount);
+            return result;
+        } catch (e) {
+            tryCount++;
+            // It is totally possible that the code lens request is cancelled due to the server returning a content modified error.
+            // This is not an error condition - it just means that the server snapshot has moved on and we need to retry the request.
+            //
+            // This error is not thrown as an error type that matches ours, so we'll check the name of the error to determine if it was a cancellation.
+            if (Object.prototype.hasOwnProperty.call(e, 'name') && (e as any).name === 'Canceled') {
+                console.log('CodeLens provider was cancelled, retrying in 1 second');
+                await sleep(1000);
+            } else {
+                console.log('CodeLens provider encountered unexpected error');
+                console.log(JSON.stringify(e));
+                throw e;
+            }
+        }
+    } while (tryCount < maxRetryCount);
+    throw new Error(`Failed to get code lenses after ${maxRetryCount} retries`);
+}
+
+async function executeCodeLensProviderAsync(
+    activeEditor: vscode.TextEditor,
+    resolvedItemCount: number
+): Promise<vscode.CodeLens[]> {
     const codeLenses = <vscode.CodeLens[]>(
         await vscode.commands.executeCommand(
             'vscode.executeCodeLensProvider',
@@ -130,7 +159,6 @@ export async function getCodeLensesAsync(): Promise<vscode.CodeLens[]> {
         if (rangeCompare !== 0) {
             return rangeCompare;
         }
-
         return a.command!.title.localeCompare(b.command!.command);
     });
 }

test/lsptoolshost/integrationTests/integrationHelpers.ts

@@ -18,6 +18,9 @@ import { getVSCodeWithConfig } from '../../fakes';
 import { CSharpExtensionId } from '../../../src/constants/csharpExtensionId';
 import { ConfigurationTarget } from '../../../src/vscodeAdapter';
 
+// Necessary when spying on module members.
+jest.mock('fs', () => ({ __esModule: true, ...(<any>jest.requireActual('fs')) }));
+
 describe('Migrate configurations', () => {
     const packageJson = JSON.parse(fs.readFileSync('package.json').toString());
     const configuration = packageJson.contributes.configuration;

test/lsptoolshost/unitTests/migrateOptions.test.ts

@@ -62,11 +62,7 @@ describe(`${reportIssue.name}`, () => {
             issueBody = rest[0].issueBody;
             return {} as any;
         });
-        jest.replaceProperty(vscode, 'extensions', {
-            all: [extension1, extension2],
-            getExtension: jest.fn(),
-            onDidChange: jest.fn(),
-        } as typeof vscode.extensions);
+        jest.replaceProperty(vscode.extensions, 'all', [extension1, extension2] as readonly vscode.Extension<any>[]);
 
         fakeMonoResolver = new FakeMonoResolver();
         fakeDotnetResolver = new FakeDotnetResolver();

test/omnisharp/omnisharpUnitTests/features/reportIssue.test.ts

@@ -11,6 +11,9 @@ import { MockedFunction } from 'jest-mock';
 import * as fs from 'fs';
 import { join } from 'path';
 
+// Necessary when spying on module members.
+jest.mock('fs', () => ({ __esModule: true, ...(<any>jest.requireActual('fs')) }));
+
 describe(`${getNotInstalledPackagesForPlatform.name}`, () => {
     let absolutePathPackages: AbsolutePathPackage[];
     const extensionPath = '/ExtensionPath';

test/omnisharp/omnisharpUnitTests/packages/packageFilterer.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'async-file';
-import * as getPort from 'get-port';
+import getPort from 'get-port';
 
 // There are no typings for this library.
 // eslint-disable-next-line @typescript-eslint/no-var-requires

test/omnisharp/omnisharpUnitTests/testAssets/mockHttpsServer.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as archiver from 'archiver';
+import archiver from 'archiver';
 import { TestFile } from './testFile';
 
 export default class TestZip {

test/omnisharp/omnisharpUnitTests/testAssets/testZip.ts

@@ -1,7 +1,8 @@
 {
     "compilerOptions": {
-        "target": "es6",
-        "module": "commonjs",
+        "esModuleInterop": true,
+        "target": "ES2022",
+        "module": "CommonJS",
         "outDir": "out",
         "lib": [
             "ES2021"
@@ -20,7 +21,6 @@
         "src",
         "tasks",
         "test",
-        "omnisharptest",
         "typings",
         "__mocks__",
         "jest.config.ts",

tsconfig.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "2.61",
+    "version": "2.62",
     "publicReleaseRefSpec": [
         "^refs/heads/release$",
         "^refs/heads/prerelease$",