Merge branch 'main' into update_changelog_in_snap

Author: dibarbet

CHANGELOG.md

@@ -4,7 +4,23 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # 2.54.x
+* Update Roslyn to 4.13.0-1.24525.2 (PR: [#7694](https://github.com/dotnet/vscode-csharp/pull/7694))
+  * Fix error message spelling (PR: [#75601](https://github.com/dotnet/roslyn/pull/75601))
+  * Improve diagnostic performance by re-using results if diagnostic data is the same (PR: [#75587](https://github.com/dotnet/roslyn/pull/75587))
+  * Improve performance in checksum computation (PR: [#75479](https://github.com/dotnet/roslyn/pull/75479))
 * Bumped xamlTools to 17.13.35422.31 (PR: [#7685](https://github.com/dotnet/vscode-csharp/pull/7685))
+* Update Razor to 9.0.0-preview.24524.4 (PR: [#7692](https://github.com/dotnet/vscode-csharp/pull/7692))
+  * Roslyn Tokenizer (#11086) (PR: [#11086](https://github.com/dotnet/razor/pull/11086))
+    * **Experimental feature**
+  * Add flush method and make it implementation detail on how that happens (#11087) (PR: [#11087](https://github.com/dotnet/razor/pull/11087))
+  * Do not extract component into code block (#11069) (PR: [#11069](https://github.com/dotnet/razor/pull/11069))
+    * **New code action to handle extracting razor code into a new razor component**
+  * Handle EditorRequired *Changed/*Expression parameters (#11043) (PR: [#11043](https://github.com/dotnet/razor/pull/11043))
+  * Avoid ambiguous `object` reference in generic component recovery (#11053) (PR: [#11053](https://github.com/dotnet/razor/pull/11053))
+  * Move culture info check (#11057) (PR: [#11057](https://github.com/dotnet/razor/pull/11057))
+  * Report a better error for void components (#11041) (PR: [#11041](https://github.com/dotnet/razor/pull/11041))
+  * Ensure model directives are mapped at runtime (#11007) (PR: [#11007](https://github.com/dotnet/razor/pull/11007))
+  * Including @using for Out-of-Scope Razor Component References (#10651) (PR: [#10651](https://github.com/dotnet/razor/pull/10651))
 
 # 2.53.x
 * Update Roslyn to 4.13.0-1.24518.1 (PR: [#7670](https://github.com/dotnet/vscode-csharp/pull/7670))

package.json

@@ -37,9 +37,9 @@
     }
   },
   "defaults": {
-    "roslyn": "4.13.0-1.24518.1",
+    "roslyn": "4.13.0-1.24525.2",
     "omniSharp": "1.39.11",
-    "razor": "9.0.0-preview.24516.1",
+    "razor": "9.0.0-preview.24524.4",
     "razorOmnisharp": "7.0.0-preview.23363.1",
     "xamlTools": "17.13.35422.31"
   },

src/lsptoolshost/languageStatusBar.ts

@@ -29,10 +29,7 @@ function combineDocumentSelectors(...selectors: vscode.DocumentSelector[]): vsco
 
 class WorkspaceStatus {
     static createStatusItem(context: vscode.ExtensionContext, languageServerEvents: RoslynLanguageServerEvents) {
-        const documentSelector = combineDocumentSelectors(
-            languageServerOptions.documentSelector,
-            RazorLanguage.documentSelector
-        );
+        const documentSelector = combineDocumentSelectors(languageServerOptions.documentSelector);
         const openSolutionCommand = {
             command: 'dotnet.openSolution',
             title: vscode.l10n.t('Open solution'),
@@ -79,9 +76,10 @@ class ProjectContextStatus {
             // Show a warning when the active file is part of the Miscellaneous File workspace and
             // project initialization is complete.
             if (languageServer.state === ServerState.ProjectInitializationComplete) {
-                item.severity = e.context._vs_is_miscellaneous
-                    ? vscode.LanguageStatusSeverity.Warning
-                    : vscode.LanguageStatusSeverity.Information;
+                item.severity =
+                    e.context._vs_is_miscellaneous && e.isVerified
+                        ? vscode.LanguageStatusSeverity.Warning
+                        : vscode.LanguageStatusSeverity.Information;
             } else {
                 item.severity = vscode.LanguageStatusSeverity.Information;
             }

src/lsptoolshost/miscellaneousFileNotifier.ts

@@ -21,6 +21,7 @@ export function registerMiscellaneousFileNotifier(
         // Only warn for C# miscellaneous files when the workspace is fully initialized.
         if (
             e.languageId !== 'csharp' ||
+            !e.isVerified ||
             !e.context._vs_is_miscellaneous ||
             languageServer.state !== ServerState.ProjectInitializationComplete
         ) {
@@ -39,10 +40,10 @@ export function registerMiscellaneousFileNotifier(
         const hash = createHash(e.uri.toString(/*skipEncoding:*/ true));
         if (NotifiedDocuments.has(hash)) {
             return;
-        } else {
-            NotifiedDocuments.add(hash);
         }
 
+        NotifiedDocuments.add(hash);
+
         const message = vscode.l10n.t(
             'The active document is not part of the open workspace. Not all language features will be available.'
         );

src/lsptoolshost/services/projectContextService.ts

@@ -15,8 +15,14 @@ export interface ProjectContextChangeEvent {
     languageId: string;
     uri: vscode.Uri;
     context: VSProjectContext;
+    isVerified: boolean;
 }
 
+const VerificationDelay = 2 * 1000;
+
+let _verifyTimeout: NodeJS.Timeout | undefined;
+let _documentUriToVerify: vscode.Uri | undefined;
+
 export class ProjectContextService {
     private readonly _contextChangeEmitter = new vscode.EventEmitter<ProjectContextChangeEvent>();
     private _source = new vscode.CancellationTokenSource();
@@ -47,7 +53,7 @@ export class ProjectContextService {
     public async refresh() {
         const textEditor = vscode.window.activeTextEditor;
         const languageId = textEditor?.document?.languageId;
-        if (languageId !== 'csharp' && languageId !== 'aspnetcorerazor') {
+        if (languageId !== 'csharp') {
             return;
         }
 
@@ -57,19 +63,55 @@ export class ProjectContextService {
 
         const uri = textEditor!.document.uri;
 
+        // Whether we have refreshed the active document's project context.
+        let isVerifyPass = false;
+
+        if (_verifyTimeout) {
+            // If we have changed active document then do not verify the previous one.
+            clearTimeout(_verifyTimeout);
+            _verifyTimeout = undefined;
+        }
+
+        if (_documentUriToVerify) {
+            if (uri.toString() === _documentUriToVerify.toString()) {
+                // We have rerequested project contexts for the active document
+                // and we can now notify if the document isn't part of the workspace.
+                isVerifyPass = true;
+            }
+
+            _documentUriToVerify = undefined;
+        }
+
         if (!this._languageServer.isRunning()) {
-            this._contextChangeEmitter.fire({ languageId, uri, context: this._emptyProjectContext });
+            this._contextChangeEmitter.fire({ languageId, uri, context: this._emptyProjectContext, isVerified: false });
             return;
         }
 
         const contextList = await this.getProjectContexts(uri, this._source.token);
         if (!contextList) {
-            this._contextChangeEmitter.fire({ languageId, uri, context: this._emptyProjectContext });
+            this._contextChangeEmitter.fire({ languageId, uri, context: this._emptyProjectContext, isVerified: false });
             return;
         }
 
         const context = contextList._vs_projectContexts[contextList._vs_defaultIndex];
-        this._contextChangeEmitter.fire({ languageId, uri, context });
+        const isVerified = !context._vs_is_miscellaneous || isVerifyPass;
+        this._contextChangeEmitter.fire({ languageId, uri, context, isVerified });
+
+        if (context._vs_is_miscellaneous && !isVerifyPass) {
+            // Request the active project context be refreshed but delay the request to give
+            // time for the project system to update with new files.
+            _verifyTimeout = setTimeout(() => {
+                _verifyTimeout = undefined;
+                _documentUriToVerify = uri;
+
+                // Trigger a refresh, but don't block on refresh completing.
+                this.refresh().catch((e) => {
+                    throw new Error(`Error refreshing project context status ${e}`);
+                });
+            }, VerificationDelay);
+
+            return;
+        }
     }
 
     private async getProjectContexts(