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

Author: dibarbet

.eslintrc.js

@@ -58,8 +58,8 @@ module.exports = {
         "out/",
         "dist/",
         "wallaby.js",
-        "webpack.config.js",
         ".eslintrc.js",
+        "esbuild.js",
         "**/*.d.ts"
     ],
 };

.github/ISSUE_TEMPLATE/bug_report.md

@@ -20,8 +20,10 @@ If the `CSharp: Report an issue` command doesn't appear, make sure that you have
 VS Code version:
 C# Extension version:
 
-## OmniSharp log
+## C# logs
+C# output window contents:
 
+See [this page](https://github.com/dotnet/vscode-csharp/blob/main/SUPPORT.md#collecting-general-logs) for collecting more detailed logs
 
 ## Steps to reproduce
 

.github/workflows/backport.yml

@@ -0,0 +1,40 @@
+name: Backport PR to branch
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # once a day at 13:00 UTC to cleanup old runs
+    - cron: '0 13 * * *'
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  actions: write
+
+jobs:
+  backport:
+    if: ${{ contains(github.event.comment.body, '/backport to') || github.event_name == 'schedule' }}
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@main
+    with:
+      pr_description_template: |
+        Backport of #%source_pr_number% to %target_branch%
+
+        /cc %cc_users%
+
+        ## Customer Impact
+
+        ## Regression
+
+        - [ ] Yes
+        - [ ] No
+
+        [If yes, specify when the regression was introduced. Provide the PR or commit if known.]
+
+        ## Testing
+
+        [How was the fix verified? How was the issue missed previously? What tests were added?]
+
+        ## Risk
+
+        [High/Medium/Low. Justify the indication by mentioning how risks were measured and addressed.]

.vscode/launch.json

@@ -9,7 +9,7 @@
             "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js"],
-            "preLaunchTask": "buildDev"
+            "preLaunchTask": "packageDev"
         },
         {
             "name": "[Roslyn] Run Current File Integration Tests",
@@ -35,7 +35,7 @@
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
             "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
-            "preLaunchTask": "buildDev",
+            "preLaunchTask": "packageDev",
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
@@ -62,7 +62,7 @@
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
             "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
-            "preLaunchTask": "buildDev",
+            "preLaunchTask": "packageDev",
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
@@ -89,7 +89,7 @@
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
             "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
-            "preLaunchTask": "buildTest",
+            "preLaunchTask": "packageDev",
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
@@ -115,7 +115,7 @@
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
             "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
-            "preLaunchTask": "buildTest"
+            "preLaunchTask": "packageDev"
         },
         {
             "name": "[O# LSP] Run Current File Integration Tests",
@@ -140,7 +140,7 @@
             "sourceMaps": true,
             "outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
             "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
-            "preLaunchTask": "buildTest"
+            "preLaunchTask": "packageDev"
         },
         {
             "type": "node",
@@ -195,7 +195,7 @@
             "name": "Razor integration tests",
             "preLaunchTask": "build",
             "program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
-            "args": ["test:razorintegration"],
+            "args": ["test:integration:razor"],
             "cwd": "${workspaceFolder}"
         }
     ],

.vscode/tasks.json

@@ -28,10 +28,20 @@
             }
         },
         {
-            "label": "buildTest",
+            "label": "package",
             "command": "npm",
             "type": "shell",
-            "args": ["run", "compileTest"],
+            "args": ["run", "package"],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "packageDev",
+            "command": "npm",
+            "type": "shell",
+            "args": ["run", "packageDev"],
             "group": {
                 "kind": "build",
                 "isDefault": true

.vscodeignore

@@ -9,6 +9,7 @@
 !.razoromnisharp/**
 .rpt2_cache/**
 .config/**
+.devcontainer/**
 .github/**
 .vscode/**
 .vscode-test/**
@@ -51,8 +52,7 @@ package.json
 tsconfig.json
 version.json
 wallaby.js
-webpack.config.js
-
+esbuild.js
 !src/razor/language-configuration.json
 !src/razor/syntaxes/*
 

CHANGELOG.md

@@ -3,6 +3,14 @@
 - 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.68.x
+* Update Razor to 9.0.0-preview.25125.9 (PR: [#8027](https://github.com/dotnet/vscode-csharp/pull/8027))
+  * Don't send invalid ranges for diagnostics if they do not map (#11555) (PR: [#11555](https://github.com/dotnet/razor/pull/11555))
+  * Fix file path service, and integration tests (#11556) (PR: [#11556](https://github.com/dotnet/razor/pull/11556))
+  * Add ParserOptions and CodeGenerationOptions properties to RazorCodeDocument and rationalize options configuration (#11526) (PR: [#11526](https://github.com/dotnet/razor/pull/11526))
+  * Fix parsing of quotes in attribute names (#11543) (PR: [#11543](https://github.com/dotnet/razor/pull/11543))
+  * Bump xamlTools to 17.14.35828.13 (PR: [#8032](https://github.com/dotnet/vscode-csharp/pull/8032))
+
 # 2.67.x
 * Update Razor to 9.0.0-preview.25125.9 (PR: [#8027](https://github.com/dotnet/vscode-csharp/pull/8027))
   * Don't send invalid ranges for diagnostics if they do not map (#11555) (PR: [#11555](https://github.com/dotnet/razor/pull/11555))

CONTRIBUTING.md

@@ -36,6 +36,7 @@ Follow these steps to build, run, and test the repository:
 #### Building
 
 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.
+   a.  If you have already authenticated before, but the token expired, you may need to run `vsts-npm-auth -config .npmrc -f` instead.
 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.
@@ -51,7 +52,8 @@ After completing the build steps:
 
 #### Testing
 
-To run all tests, execute `npm run test`.
+To run all unit tests, execute `npm run test:unit`.
+To run all integration tests execute `npm run test:integration`
 
 To debug unit tests locally, press <kbd>F5</kbd> in VS Code with the "Launch Tests" debug configuration selected.
 

azure-pipelines/prereqs.yml

@@ -40,6 +40,3 @@ steps:
     npm ci
     npm i -g gulp
   displayName: 'Install dependencies'
-
-- script: npm run compile
-  displayName: 'Compile'

azure-pipelines/profiling.yml

@@ -56,4 +56,5 @@ extends:
           parameters:
             dotnetVersion: $(defaultDotnetVersion)
             npmCommand: profiling
-            testVSCodeVersion: stable
+            testVSCodeVersion: stable
+            isIntegration: true

azure-pipelines/test-matrix.yml

@@ -16,17 +16,26 @@ jobs:
 - job:
   strategy:
     matrix:
-      CSharpTests:
-        npmCommand: test:withoutDevKit
+      UnitTests:
+        npmCommand: test:unit
+        isIntegration: false
+      CSharpIntegrationTests:
+        npmCommand: test:integration:csharp
+        isIntegration: true
       DevKitTests:
         npmCommand: test:integration:devkit
+        isIntegration: true
+      RazorTests:
+        npmCommand: test:integration:razor
+        isIntegration: true
   pool: ${{ parameters.pool }}
   ${{ if parameters.containerName }}:
     container: ${{ parameters.containerName }}
   steps:
   - template: /azure-pipelines/test.yml@self
     parameters:
       dotnetVersion: ${{ parameters.dotnetVersion }}
-      installAdditionalLinuxDependencies: true
+      installAdditionalLinuxDependencies: ${{ parameters.installAdditionalLinuxDependencies }}
       npmCommand: $(npmCommand)
-      testVSCodeVersion: ${{ parameters.testVSCodeVersion }}
+      testVSCodeVersion: ${{ parameters.testVSCodeVersion }}
+      isIntegration: $(isIntegration)

azure-pipelines/test-prereqs.yml

@@ -1,8 +1,5 @@
 steps:
 
-- script: npm run vscode:prepublish
-  displayName: 'Prepublish VSIXs'
-
 # We need to download the roslyn language server for the current platform to run integration tests against it.
 - script: gulp installDependencies
   displayName: 'Install Roslyn Language Server'

azure-pipelines/test.yml

@@ -8,6 +8,8 @@ parameters:
     type: string
   - name: testVSCodeVersion
     type: string
+  - name: isIntegration
+    type: string
 
 steps:
 - checkout: self
@@ -44,16 +46,28 @@ steps:
     mergeTestResults: true
     testRunTitle: $(System.StageDisplayName) $(Agent.JobName) (Attempt $(System.JobAttempt))
 
+- powershell: |
+    Write-Host "##vso[task.setvariable variable=isIntegrationVar;]${{ parameters.isIntegration }}"
+  displayName: 'Set IsIntegration Variable'
+  condition: succeededOrFailed()
+    
+- powershell: |
+    $tempPath = [System.IO.Path]::GetTempPath()
+    echo "Temp Path: $tempPath"
+    Get-ChildItem -Path $tempPath -Filter *.cpuprofile | Copy-Item -Destination "$(Build.SourcesDirectory)/out/logs"
+  displayName: 'Copy .cpuprofile files to out/logs'
+  condition: eq(variables.isIntegrationVar, true)
+
 - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
   - task: 1ES.PublishPipelineArtifact@1
-    condition: failed()
+    condition: eq(variables.isIntegrationVar, true)
     displayName: 'Upload integration test logs'
     inputs:
       path: '$(Build.SourcesDirectory)/out/logs'
       artifact: 'Test Logs ($(System.StageDisplayName)-$(Agent.JobName)-$(System.JobAttempt))'
 - ${{ else }}: 
   - task: PublishPipelineArtifact@1
-    condition: failed()
+    condition: eq(variables.isIntegrationVar, true)
     displayName: 'Upload integration test logs'
     inputs:
       targetPath: '$(Build.SourcesDirectory)/out/logs'

esbuild.js

@@ -0,0 +1,76 @@
+const esbuild = require("esbuild");
+const fs = require('fs/promises');
+
+const production = process.argv.includes('--production');
+const watch = process.argv.includes('--watch');
+
+/**
+ * @type {import('esbuild').Plugin}
+ */
+const esbuildProblemMatcherPlugin = {
+    name: 'esbuild-problem-matcher',
+
+    setup(build) {
+        build.onStart(() => {
+            console.log('[watch] build started');
+        });
+        build.onEnd((result) => {
+            result.errors.forEach(({ text, location }) => {
+                console.error(`✘ [ERROR] ${text}`);
+                console.error(`    ${location.file}:${location.line}:${location.column}:`);
+            });
+            console.log('[watch] build finished');
+        });
+    },
+};
+
+/**
+ * Some VSCode libraries include UMD versions that are not esbuild compatible, and also have broken ESM packages.
+ * This plugin replaces the UMD imports with the ESM imports.
+ * See https://github.com/microsoft/vscode/issues/192144
+ */
+const umdEsmLoaderPlugin = {
+    name: 'umdEsmLoaderPlugin',
+
+    setup(build) {
+        build.onLoad({ filter: /(vscode-html-languageservice|jsonc-parser).*lib[\/\\]umd/ }, async (moduleArgs) => {
+            // replace the umd path with the esm path from the package.
+            const newPath = moduleArgs.path.replace(/(.*)lib([\/\\])umd(.*)/, '$1lib$2esm$3');
+            const contents = await fs.readFile(newPath, 'utf8');
+            return { contents: contents };
+        });
+    },
+};
+
+async function main() {
+    const ctx = await esbuild.context({
+        entryPoints: [
+            'src/main.ts'
+        ],
+        bundle: true,
+        format: 'cjs',
+        minify: production,
+        sourcemap: !production,
+        sourcesContent: false,
+        platform: 'node',
+        outfile: 'dist/extension.js',
+        external: ['vscode', 'applicationinsights-native-metrics', '@opentelemetry/tracing'],
+        logLevel: 'info',
+        plugins: [
+            umdEsmLoaderPlugin,
+            /* add to the end of plugins array */
+            esbuildProblemMatcherPlugin,
+        ],
+    });
+    if (watch) {
+        await ctx.watch();
+    } else {
+        await ctx.rebuild();
+        await ctx.dispose();
+    }
+}
+
+main().catch(e => {
+    console.error(e);
+    process.exit(1);
+});

l10n/bundle.l10n.json

@@ -1,12 +1,12 @@
 {
+  "How to setup Remote Debugging": "How to setup Remote Debugging",
+  "The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.": "The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.",
+  "The C# extension for Visual Studio Code is incompatible on {0} {1}.": "The C# extension for Visual Studio Code is incompatible on {0} {1}.",
   "Update and reload": "Update and reload",
   "The {0} extension requires at least {1} of the .NET Install Tool ({2}) extension. Please update to continue": "The {0} extension requires at least {1} of the .NET Install Tool ({2}) extension. Please update to continue",
   "Version {0} of the .NET Install Tool ({1}) was not found, {2} will not activate.": "Version {0} of the .NET Install Tool ({1}) was not found, {2} will not activate.",
   ".NET Test Log": ".NET Test Log",
   ".NET NuGet Restore": ".NET NuGet Restore",
-  "How to setup Remote Debugging": "How to setup Remote Debugging",
-  "The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.": "The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.",
-  "The C# extension for Visual Studio Code is incompatible on {0} {1}.": "The C# extension for Visual Studio Code is incompatible on {0} {1}.",
   "Cannot create .NET debug configurations. No workspace folder was selected.": "Cannot create .NET debug configurations. No workspace folder was selected.",
   "Cannot create .NET debug configurations. The server is still initializing or has exited unexpectedly.": "Cannot create .NET debug configurations. The server is still initializing or has exited unexpectedly.",
   "Cannot create .NET debug configurations. The active C# project is not within folder '{0}'.": "Cannot create .NET debug configurations. The active C# project is not within folder '{0}'.",