Merge pull request #56146 from dotnet/merges/release/dev17.0-to-main

Merge release/dev17.0 to main

Author: dotnet-bot

src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorFactory.cs

@@ -63,7 +63,7 @@ public void Dispose()
         }
 
         public int CreateEditorInstance(uint grfCreateDoc,
-                                        string pszMkDocument,
+                                        string filePath,
                                         string pszPhysicalView,
                                         IVsHierarchy pvHier,
                                         uint itemid,
@@ -88,6 +88,12 @@ public int CreateEditorInstance(uint grfCreateDoc,
                 return VSConstants.VS_E_UNSUPPORTEDFORMAT;
             }
 
+            if (!_workspace.CurrentSolution.Projects.Any(p => p.AnalyzerConfigDocuments.Any(editorconfig => StringComparer.OrdinalIgnoreCase.Equals(editorconfig.FilePath, filePath))))
+            {
+                // If the user is simply opening an editorconfig file that does not apply to the current solution we just want to show the text view
+                return VSConstants.VS_E_UNSUPPORTEDFORMAT;
+            }
+
             // Validate inputs
             if ((grfCreateDoc & (VSConstants.CEF_OPENFILE | VSConstants.CEF_SILENT)) == 0)
             {
@@ -138,7 +144,7 @@ public int CreateEditorInstance(uint grfCreateDoc,
                                                    _settingsDataProviderFactory,
                                                    _controlProvider,
                                                    _tableMangerProvider,
-                                                   pszMkDocument,
+                                                   filePath,
                                                    textBuffer,
                                                    _workspace);
             ppunkDocView = Marshal.GetIUnknownForObject(newEditor);

src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.cs

@@ -5,11 +5,13 @@
 using System;
 using System.ComponentModel.Design;
 using System.Runtime.InteropServices;
+using System.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings;
 using Microsoft.CodeAnalysis.Editor.EditorConfigSettings.Data;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.CodeAnalysis.Host;
 using Microsoft.Internal.VisualStudio.PlatformUI;
 using Microsoft.Internal.VisualStudio.Shell.TableControl;
 using Microsoft.VisualStudio.Editor;
@@ -94,6 +96,19 @@ protected override void Initialize()
                 }
             }
 
+            var statusService = _workspace.Services.GetService<IWorkspaceStatusService>();
+            if (statusService is not null)
+            {
+                // This will show the 'Waiting for Intellisense to initalize' message until the workspace is loaded.
+                _threadingContext.JoinableTaskFactory.Run(async () =>
+                {
+                    if (!await statusService.IsFullyLoadedAsync(CancellationToken.None).ConfigureAwait(false))
+                    {
+                        await statusService.WaitUntilFullyLoadedAsync(CancellationToken.None).ConfigureAwait(false);
+                    }
+                });
+            }
+
             // hook up our panel
             _control = new SettingsEditorControl(
                 GetWhitespaceView(),