Merge pull request #7628 from dotnet/dev/jorobich/warn-misc-files

Warn in the statusbar when the active file is not part of the open workspace.
dotnet · Oct 10, 2024 · 8c32259 · 8c32259
2 parents 8dd4dfc + 3562921
commit 8c32259
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # Latest
+* Warn when the active file is not part of the open workspace (PR: [#7628](https://github.com/dotnet/vscode-csharp/pull/7628))
+* Update Roslyn to 4.13.0-1.24509.4 (PR: [#7628](https://github.com/dotnet/vscode-csharp/pull/7628))
+  * Add a WorkspaceKind property to ProjectContext. (PR: [#75384](https://github.com/dotnet/roslyn/pull/75384))
+  * Convert more lambda rude edits to runtime rude edits (PR: [#75285](https://github.com/dotnet/roslyn/pull/75285))
+
+# 2.51.x
 * Bumped xamltools to 17.12.35403.211 (PR: [#7629](https://github.com/dotnet/vscode-csharp/pull/7629))
 * Update Roslyn to 4.13.0-1.24503.11 (PR: [#7618](https://github.com/dotnet/vscode-csharp/pull/7618))
   * LSP hover responses escape backticks within inline code (PR: [#75364](https://github.com/dotnet/roslyn/pull/75364))

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     }
   },
   "defaults": {
-    "roslyn": "4.13.0-1.24503.11",
+    "roslyn": "4.13.0-1.24509.4",
     "omniSharp": "1.39.11",
     "razor": "9.0.0-preview.24480.1",
     "razorOmnisharp": "7.0.0-preview.23363.1",
@@ -5597,4 +5597,4 @@
       }
     }
   }
-}
+}
diff --git a/src/lsptoolshost/languageStatusBar.ts b/src/lsptoolshost/languageStatusBar.ts
@@ -11,11 +11,18 @@ import { ServerState } from './serverStateChange';
 import { getCSharpDevKit } from '../utils/getCSharpDevKit';
 import { RazorLanguage } from '../razor/src/razorLanguage';
 
+let currentServerState: ServerState = ServerState.Stopped;
+
 export function registerLanguageStatusItems(
     context: vscode.ExtensionContext,
     languageServer: RoslynLanguageServer,
     languageServerEvents: RoslynLanguageServerEvents
 ) {
+    // Track the current server state.
+    languageServerEvents.onServerStateChange((e) => {
+        currentServerState = e.state;
+    });
+
     // DevKit will provide an equivalent workspace status item.
     if (!getCSharpDevKit()) {
         WorkspaceStatus.createStatusItem(context, languageServerEvents);
@@ -44,14 +51,16 @@ class WorkspaceStatus {
 
         const item = vscode.languages.createLanguageStatusItem('csharp.workspaceStatus', documentSelector);
         item.name = vscode.l10n.t('C# Workspace Status');
+        item.severity = vscode.LanguageStatusSeverity.Error;
+        item.command = openSolutionCommand;
         context.subscriptions.push(item);
 
         languageServerEvents.onServerStateChange((e) => {
             item.text = e.workspaceLabel;
             item.busy = e.state === ServerState.ProjectInitializationStarted;
             item.severity =
                 e.state === ServerState.Stopped
-                    ? vscode.LanguageStatusSeverity.Warning
+                    ? vscode.LanguageStatusSeverity.Error
                     : vscode.LanguageStatusSeverity.Information;
             item.command = e.state === ServerState.Stopped ? restartServerCommand : openSolutionCommand;
         });
@@ -73,6 +82,16 @@ class ProjectContextStatus {
 
         projectContextService.onActiveFileContextChanged((e) => {
             item.text = e.context._vs_label;
+
+            // Show a warning when the active file is part of the Miscellaneous File workspace and
+            // project initialization is complete.
+            if (currentServerState === ServerState.ProjectInitializationComplete) {
+                item.severity = e.context._vs_is_miscellaneous
+                    ? vscode.LanguageStatusSeverity.Warning
+                    : vscode.LanguageStatusSeverity.Information;
+            } else {
+                item.severity = vscode.LanguageStatusSeverity.Information;
+            }
         });
 
         // Trigger a refresh, but don't block creation on the refresh completing.

diff --git a/src/lsptoolshost/roslynProtocol.ts b/src/lsptoolshost/roslynProtocol.ts
@@ -17,6 +17,7 @@ export interface VSProjectContext {
     _vs_label: string;
     _vs_id: string;
     _vs_kind: string;
+    _vs_is_miscellaneous: boolean;
 }
 
 export interface VSTextDocumentIdentifier extends lsp.TextDocumentIdentifier {

diff --git a/src/lsptoolshost/services/projectContextService.ts b/src/lsptoolshost/services/projectContextService.ts
@@ -26,6 +26,7 @@ export class ProjectContextService {
         _vs_id: '',
         _vs_kind: '',
         _vs_label: '',
+        _vs_is_miscellaneous: false,
     };
 
     constructor(private _languageServer: RoslynLanguageServer, _languageServerEvents: LanguageServerEvents) {