Merge branch 'main' into RazorTelemetryVersion

Author: davidwengier

.vscode/launch.json

@@ -16,7 +16,6 @@
     },
     "csharp.suppressDotnetRestoreNotification": true,
     "typescript.tsdk": "./node_modules/typescript/lib",
-    "mocha.enabled": true,
     "omnisharp.autoStart": false,
     "editor.formatOnSave": false,
     "eslint.lintTask.enable": true,

.vscode/settings.json

@@ -35,7 +35,6 @@ CODEOWNERS
 gulpfile.ts
 !install.Lock
 ISSUE_TEMPLATE
-.mocharc.jsonc
 !README.md
 !CHANGELOG.md
 *.md

.vscodeignore

@@ -6,6 +6,10 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
+* Update Razor to 7.0.0-preview.23516.2 (PR: [#6550](https://github.com/dotnet/vscode-csharp/pull/6550))
+  * Make sure correct info is passed in code action resolve (PR: [razor#9420](https://github.com/dotnet/razor/pull/9420))
+
+## 2.7.?
 * Update Razor to 7.0.0-preview.23513.5 (PR: [#6551](https://github.com/dotnet/vscode-csharp/pull/6551))
   * Reduce noisy errors when viewing git diff (PR: [razor#9407](https://github.com/dotnet/razor/pull/9407))
 * Update Roslyn to 4.9.0-1.23513.7 (PR: [#6548](https://github.com/dotnet/vscode-csharp/pull/6548))

CHANGELOG.md

@@ -31,7 +31,7 @@ stages:
         targetPath: '$(Build.SourcesDirectory)/vsix'
         artifactName: 'VSIX_Prerelease_$(System.JobAttempt)'
 
-    - script: npm run omnisharptest:artifacts
+    - script: npm run test:artifacts
       displayName: 'Run artifacts tests'
 
   - job:
@@ -58,6 +58,6 @@ stages:
         targetPath: '$(Build.SourcesDirectory)/vsix'
         artifactName: 'VSIX_Release_$(System.JobAttempt)'
 
-    - script: npm run omnisharptest:artifacts
+    - script: npm run test:artifacts
       displayName: 'Run artifacts tests'
 

azure-pipelines/build.yml

@@ -10,7 +10,9 @@ const config: Config = {
         '<rootDir>/test/integrationTests/jest.config.ts',
         '<rootDir>/test/razorIntegrationTests/jest.config.ts',
         '<rootDir>/test/razorTests/jest.config.ts',
+        '<rootDir>/test/artifactTests/jest.config.ts',
         '<rootDir>/omnisharptest/omnisharpUnitTests/jest.config.ts',
+        '<rootDir>/omnisharptest/omnisharpIntegrationTests/jest.config.ts',
     ],
 };
 

jest.config.ts

@@ -3,11 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
-
-import { expect, should } from 'chai';
+import { expect, test, beforeAll, afterAll } from '@jest/globals';
 import * as path from 'path';
-import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
+import * as vscode from 'vscode';
+import { activateCSharpExtension, describeIfNotRazorOrGenerator } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 
 import { Advisor } from '../../src/features/diagnosticsProvider';
@@ -17,16 +16,10 @@ function setLimit(to: number | null) {
     return csharpConfig.update('maxProjectFileCountForDiagnosticAnalysis', to);
 }
 
-suite(`Advisor ${testAssetWorkspace.description}`, function () {
+describeIfNotRazorOrGenerator(`Advisor ${testAssetWorkspace.description}`, function () {
     let advisor: Advisor;
 
-    suiteSetup(async function () {
-        should();
-
-        if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
-            this.skip();
-        }
-
+    beforeAll(async function () {
         const activation = await activateCSharpExtension();
         await testAssetWorkspace.restore();
 
@@ -40,43 +33,43 @@ suite(`Advisor ${testAssetWorkspace.description}`, function () {
         await testAssetWorkspace.waitForIdle(activation.eventStream);
     });
 
-    suiteTeardown(async () => {
+    afterAll(async () => {
         await testAssetWorkspace.cleanupWorkspace();
     });
 
     test('Advisor.shouldValidateAll returns true when maxProjectFileCountForDiagnosticAnalysis is higher than the file count', async () => {
         await setLimit(1000);
 
-        expect(advisor.shouldValidateAll()).to.be.true;
+        expect(advisor.shouldValidateAll()).toBe(true);
     });
 
     test('Advisor.shouldValidateFiles returns true when maxProjectFileCountForDiagnosticAnalysis is higher than the file count', async () => {
         await setLimit(1000);
 
-        expect(advisor.shouldValidateFiles()).to.be.true;
+        expect(advisor.shouldValidateFiles()).toBe(true);
     });
 
     test('Advisor.shouldValidateAll returns false when maxProjectFileCountForDiagnosticAnalysis is lower than the file count', async () => {
         await setLimit(1);
 
-        expect(advisor.shouldValidateAll()).to.be.false;
+        expect(advisor.shouldValidateAll()).toBe(false);
     });
 
     test('Advisor.shouldValidateFiles returns true when maxProjectFileCountForDiagnosticAnalysis is lower than the file count', async () => {
         await setLimit(1);
 
-        expect(advisor.shouldValidateFiles()).to.be.true;
+        expect(advisor.shouldValidateFiles()).toBe(true);
     });
 
     test('Advisor.shouldValidateAll returns true when maxProjectFileCountForDiagnosticAnalysis is null', async () => {
         await setLimit(null);
 
-        expect(advisor.shouldValidateAll()).to.be.true;
+        expect(advisor.shouldValidateAll()).toBe(true);
     });
 
     test('Advisor.shouldValidateFiles returns true when maxProjectFileCountForDiagnosticAnalysis is null', async () => {
         await setLimit(null);
 
-        expect(advisor.shouldValidateFiles()).to.be.true;
+        expect(advisor.shouldValidateFiles()).toBe(true);
     });
 });

omnisharptest/omnisharpFeatureTests/index.ts

@@ -3,25 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { expect, test, beforeAll, afterAll, describe } from '@jest/globals';
 import * as vscode from 'vscode';
-
-import { should, expect } from 'chai';
-import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
+import { activateCSharpExtension } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import * as path from 'path';
 import { assertWithPoll } from './poll';
 import { isNotNull } from '../testUtil';
 
-suite(`Code Action Rename ${testAssetWorkspace.description}`, function () {
+describe.skip(`Code Action Rename ${testAssetWorkspace.description}`, function () {
     let fileUri: vscode.Uri;
 
-    suiteSetup(async function () {
-        should();
-
-        if (isRazorWorkspace(vscode.workspace) || isSlnWithGenerator(vscode.workspace)) {
-            this.skip();
-        }
-
+    beforeAll(async function () {
         const activation = await activateCSharpExtension();
         await testAssetWorkspace.restoreAndWait(activation);
 
@@ -31,7 +24,7 @@ suite(`Code Action Rename ${testAssetWorkspace.description}`, function () {
         fileUri = vscode.Uri.file(filePath);
     });
 
-    suiteTeardown(async () => {
+    afterAll(async () => {
         await testAssetWorkspace.cleanupWorkspace();
     });
 
@@ -43,7 +36,7 @@ suite(`Code Action Rename ${testAssetWorkspace.description}`, function () {
             new vscode.Range(0, 7, 0, 7)
         );
         const codeAction = codeActions.find((codeAction) => codeAction.title == 'Rename file to C.cs');
-        expect(codeAction, "Didn't find rename class code action");
+        expect(codeAction).toBeDefined();
         isNotNull(codeAction?.command?.command);
         isNotNull(codeAction?.command?.arguments);
 
@@ -55,7 +48,7 @@ suite(`Code Action Rename ${testAssetWorkspace.description}`, function () {
             },
             15 * 1000,
             500,
-            (_) => expect(vscode.window.activeTextEditor!.document.fileName).contains('C.cs')
+            (_) => expect(vscode.window.activeTextEditor!.document.fileName).toContain('C.cs')
         );
     });
 });

omnisharptest/omnisharpIntegrationTests/advisor.integration.test.ts

@@ -3,23 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { expect, test, beforeAll, afterAll } from '@jest/globals';
 import * as vscode from 'vscode';
 import * as path from 'path';
-
-import { should, expect } from 'chai';
-import { activateCSharpExtension, isSlnWithCsproj, isSlnWithGenerator } from './integrationHelpers';
+import { activateCSharpExtension, describeIfSlnWithCsProj, describeIfNotGenerator } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
 import { isNotNull } from '../testUtil';
 
-suite(`CodeLensProvider: ${testAssetWorkspace.description}`, function () {
+describeIfNotGenerator(`CodeLensProvider: ${testAssetWorkspace.description}`, function () {
     let fileUri: vscode.Uri;
 
-    suiteSetup(async function () {
-        if (isSlnWithGenerator(vscode.workspace)) {
-            this.skip();
-        }
-
-        should();
+    beforeAll(async function () {
         const activation = await activateCSharpExtension();
         await testAssetWorkspace.restore();
 
@@ -37,55 +31,49 @@ suite(`CodeLensProvider: ${testAssetWorkspace.description}`, function () {
         await testAssetWorkspace.waitForIdle(activation.eventStream);
     });
 
-    suiteTeardown(async () => {
+    afterAll(async () => {
         await testAssetWorkspace.cleanupWorkspace();
     });
 
     test('Returns all code lenses', async function () {
         const codeLenses = await GetCodeLenses(fileUri);
-        expect(codeLenses.length).to.equal(2);
+        expect(codeLenses.length).toEqual(2);
 
         for (const codeLens of codeLenses) {
-            expect(codeLens.isResolved).to.be.false;
-            expect(codeLens.command).to.be.undefined;
+            expect(codeLens.isResolved).toBe(false);
+            expect(codeLens.command).toBe(undefined);
         }
     });
 
     test('Returns all resolved code lenses', async function () {
         const codeLenses = await GetCodeLenses(fileUri, 100);
-        expect(codeLenses.length).to.equal(2);
+        expect(codeLenses.length).toEqual(2);
 
         for (const codeLens of codeLenses) {
-            expect(codeLens.isResolved).to.be.true;
+            expect(codeLens.isResolved).toBe(true);
             isNotNull(codeLens.command);
-            expect(codeLens.command.title).to.equal('0 references');
+            expect(codeLens.command.title).toEqual('0 references');
         }
     });
 });
 
-suite(`CodeLensProvider options: ${testAssetWorkspace.description}`, function () {
+// These tests only run on the slnWithCsproj solution
+describeIfSlnWithCsProj(`CodeLensProvider options: ${testAssetWorkspace.description}`, function () {
     let fileUri: vscode.Uri;
 
-    suiteSetup(async function () {
-        should();
-
-        // These tests only run on the slnWithCsproj solution
-        if (!isSlnWithCsproj(vscode.workspace)) {
-            this.skip();
-        } else {
-            const activation = await activateCSharpExtension();
-            await testAssetWorkspace.restoreAndWait(activation);
+    beforeAll(async function () {
+        const activation = await activateCSharpExtension();
+        await testAssetWorkspace.restoreAndWait(activation);
 
-            const fileName = 'UnitTest1.cs';
-            const projectDirectory = testAssetWorkspace.projects[2].projectDirectoryPath;
-            const filePath = path.join(projectDirectory, fileName);
-            fileUri = vscode.Uri.file(filePath);
+        const fileName = 'UnitTest1.cs';
+        const projectDirectory = testAssetWorkspace.projects[2].projectDirectoryPath;
+        const filePath = path.join(projectDirectory, fileName);
+        fileUri = vscode.Uri.file(filePath);
 
-            await vscode.commands.executeCommand('vscode.open', fileUri);
-        }
+        await vscode.commands.executeCommand('vscode.open', fileUri);
     });
 
-    suiteTeardown(async () => {
+    afterAll(async () => {
         await testAssetWorkspace.cleanupWorkspace();
     });
 
@@ -96,18 +84,18 @@ suite(`CodeLensProvider options: ${testAssetWorkspace.description}`, function ()
         await csharpConfig.update('codeLens.enableTestsCodeLens', true);
 
         const codeLenses = await GetCodeLenses(fileUri, 100);
-        expect(codeLenses.length).to.equal(4);
+        expect(codeLenses.length).toEqual(4);
 
         for (const codeLens of codeLenses) {
-            expect(codeLens.isResolved).to.be.true;
+            expect(codeLens.isResolved).toBe(true);
             isNotNull(codeLens.command);
-            expect(codeLens.command.command).to.be.oneOf([
+            expect([
                 'dotnet.test.run',
                 'dotnet.classTests.run',
                 'dotnet.test.debug',
                 'dotnet.classTests.debug',
-            ]);
-            expect(codeLens.command.title).to.be.oneOf(['Run Test', 'Run All Tests', 'Debug Test', 'Debug All Tests']);
+            ]).toContain(codeLens.command.command);
+            expect(['Run Test', 'Run All Tests', 'Debug Test', 'Debug All Tests']).toContain(codeLens.command.title);
         }
     });
 
@@ -117,13 +105,13 @@ suite(`CodeLensProvider options: ${testAssetWorkspace.description}`, function ()
         await csharpConfig.update('codeLens.enableTestsCodeLens', false);
 
         const codeLenses = await GetCodeLenses(fileUri, 100);
-        expect(codeLenses.length).to.equal(3);
+        expect(codeLenses.length).toEqual(3);
 
         for (const codeLens of codeLenses) {
-            expect(codeLens.isResolved).to.be.true;
+            expect(codeLens.isResolved).toBe(true);
             isNotNull(codeLens.command);
-            expect(codeLens.command.command).to.be.equal('editor.action.showReferences');
-            expect(codeLens.command.title).to.equal('0 references');
+            expect(codeLens.command.command).toEqual('editor.action.showReferences');
+            expect(codeLens.command.title).toEqual('0 references');
         }
     });
 
@@ -133,7 +121,7 @@ suite(`CodeLensProvider options: ${testAssetWorkspace.description}`, function ()
         await csharpConfig.update('codeLens.enableTestsCodeLens', false);
 
         const codeLenses = await GetCodeLenses(fileUri, 100);
-        expect(codeLenses.length).to.equal(0);
+        expect(codeLenses.length).toEqual(0);
     });
 });