Skip to content

Only attempt to show the settings from the workspace if the editorcon… #56128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2021
Merged

Only attempt to show the settings from the workspace if the editorcon… #56128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void Dispose()
}

public int CreateEditorInstance(uint grfCreateDoc,
string pszMkDocument,
string filePath,
string pszPhysicalView,
IVsHierarchy pvHier,
uint itemid,
Expand All @@ -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)
{
Expand Down Expand Up @@ -138,7 +144,7 @@ public int CreateEditorInstance(uint grfCreateDoc,
_settingsDataProviderFactory,
_controlProvider,
_tableMangerProvider,
pszMkDocument,
filePath,
textBuffer,
_workspace);
ppunkDocView = Marshal.GetIUnknownForObject(newEditor);
Expand Down