Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 0 additions & 16 deletions src/XamlStyler.Extension.Windows.VS2019/XamlStyler.Package.vsct
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@
<Group guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerMenu" priority="0x0001">
<Parent guid="GuidVisualStudioXAMLWindowContextMenu" id="IDVisualStudioXAMLWindowContextMenu"/>
</Group>
<Group guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerMenu" priority="0x0001">
<Parent guid="GuidVisualStudioXamarWindowContextMenu" id="IDVisualStudioXamarinWindowContextMenu"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NicoVermeir do you recall why we added these Xamarin-specific entries? Are they still relevant?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like they were there for AXAML support :/

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

somehow I completely missed this comment, sorry about that! that entry was there because Xamarin, even though it has .xaml extension, didn't use the XAML editor window but the XML editor. XAML Styler didn't show up in the right-click menu because of that, this entry fixed that

</Group>
<Group guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerContextDocumentTabGroup" priority="0x0100">
<Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_EZDOCWINTAB" />
</Group>

<Group guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerContextSolutionNodeGroup" priority="0x0100">
<Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_SOLNNODE" />
Expand Down Expand Up @@ -133,9 +127,6 @@
<CommandPlacement guid="GuidXamlStylerMenuSet" id="CommandIDFormatXamlFile" priority="0x0100">
<Parent guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerMenu" />
</CommandPlacement>
<CommandPlacement guid="GuidXamlStylerMenuSet" id="CommandIDFormatXamlFile" priority="0x0200">
<Parent guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerContextDocumentTabGroup" />
</CommandPlacement>

<CommandPlacement guid="GuidXamlStylerMenuSet" id="CommandIDFormatAllXaml" priority="0x0200">
<Parent guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerContextSolutionNodeGroup" />
Expand Down Expand Up @@ -179,7 +170,6 @@
<!-- Visibility Constraints -->
<VisibilityConstraints>
<VisibilityItem context="GuidVisualStudioXAMLWindowContextMenu" guid="GuidXamlStylerMenuSet" id="CommandIDFormatXamlFile"/>
<VisibilityItem context="GuidVisualStudioXamarWindowContextMenu" guid="GuidXamlStylerMenuSet" id="CommandIDFormatXamlFile"/>
</VisibilityConstraints>

<!-- Keyboard Shortcuts -->
Expand Down Expand Up @@ -209,9 +199,6 @@
<GuidSymbol name="GuidVisualStudioXAMLWindowContextMenu" value="{4C87B692-1202-46AA-B64C-EF01FAEC53DA}">
<IDSymbol name="IDVisualStudioXAMLWindowContextMenu" value="0x0103" />
</GuidSymbol>
<GuidSymbol name="GuidVisualStudioXamarWindowContextMenu" value="{D309F791-903F-11D0-9EFC-00A0C911004F}">
<IDSymbol name="IDVisualStudioXamarinWindowContextMenu" value="0x040D" />
</GuidSymbol>

<!-- This is the package guid. -->
<GuidSymbol name="GuidXamlStylerPackage" value="{a224be3c-88d1-4a57-9804-181dbef68021}" />
Expand All @@ -235,9 +222,6 @@
<IDSymbol name="GroupIDXamlStylerContextCrossProjectMultiSolutionFolderGroup" value="0x105a" />
<IDSymbol name="GroupIDXamlStylerContextCrossProjectMultiProjectFolderGroup" value="0x105b" />

<!-- This is the command set for the document tab context menu -->
<IDSymbol name="GroupIDXamlStylerContextDocumentTabGroup" value="0x1070" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR removes format option from file tab context menu:

image

I suspect it might be this one but did not test myself.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, missed this comment previously.
The current (prior to this PR) version adds the "Format XAML" option to the context menu on the tab of any document window. Am I right to assume this should be filtered to just xaml files also?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is ideally filtered to xaml (and axaml) files.


<!-- These are the symbols for the individual commands -->
<IDSymbol name="CommandIDFormatXamlFile" value="0x0100" />
<IDSymbol name="CommandIDFormatAllXaml" value="0x0200" />
Expand Down
16 changes: 0 additions & 16 deletions src/XamlStyler.Extension.Windows.VS2022/XamlStyler.Package.vsct
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@
<Group guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerMenu" priority="0x0001">
<Parent guid="GuidVisualStudioXAMLWindowContextMenu" id="IDVisualStudioXAMLWindowContextMenu"/>
</Group>
<Group guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerMenu" priority="0x0001">
<Parent guid="GuidVisualStudioXamarWindowContextMenu" id="IDVisualStudioXamarinWindowContextMenu"/>
</Group>
<Group guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerContextDocumentTabGroup" priority="0x0100">
<Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_EZDOCWINTAB" />
</Group>

<Group guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerContextSolutionNodeGroup" priority="0x0100">
<Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_SOLNNODE" />
Expand Down Expand Up @@ -133,9 +127,6 @@
<CommandPlacement guid="GuidXamlStylerMenuSet" id="CommandIDFormatXamlFile" priority="0x0100">
<Parent guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerMenu" />
</CommandPlacement>
<CommandPlacement guid="GuidXamlStylerMenuSet" id="CommandIDFormatXamlFile" priority="0x0200">
<Parent guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerContextDocumentTabGroup" />
</CommandPlacement>

<CommandPlacement guid="GuidXamlStylerMenuSet" id="CommandIDFormatAllXaml" priority="0x0200">
<Parent guid="GuidXamlStylerMenuSet" id="GroupIDXamlStylerContextSolutionNodeGroup" />
Expand Down Expand Up @@ -179,7 +170,6 @@
<!-- Visibility Constraints -->
<VisibilityConstraints>
<VisibilityItem context="GuidVisualStudioXAMLWindowContextMenu" guid="GuidXamlStylerMenuSet" id="CommandIDFormatXamlFile"/>
<VisibilityItem context="GuidVisualStudioXamarWindowContextMenu" guid="GuidXamlStylerMenuSet" id="CommandIDFormatXamlFile"/>
</VisibilityConstraints>

<!-- Keyboard Shortcuts -->
Expand Down Expand Up @@ -209,9 +199,6 @@
<GuidSymbol name="GuidVisualStudioXAMLWindowContextMenu" value="{4C87B692-1202-46AA-B64C-EF01FAEC53DA}">
<IDSymbol name="IDVisualStudioXAMLWindowContextMenu" value="0x0103" />
</GuidSymbol>
<GuidSymbol name="GuidVisualStudioXamarWindowContextMenu" value="{D309F791-903F-11D0-9EFC-00A0C911004F}">
<IDSymbol name="IDVisualStudioXamarinWindowContextMenu" value="0x040D" />
</GuidSymbol>

<!-- This is the package guid. -->
<GuidSymbol name="GuidXamlStylerPackage" value="{a224be3c-88d1-4a57-9804-181dbef68021}" />
Expand All @@ -235,9 +222,6 @@
<IDSymbol name="GroupIDXamlStylerContextCrossProjectMultiSolutionFolderGroup" value="0x105a" />
<IDSymbol name="GroupIDXamlStylerContextCrossProjectMultiProjectFolderGroup" value="0x105b" />

<!-- This is the command set for the document tab context menu -->
<IDSymbol name="GroupIDXamlStylerContextDocumentTabGroup" value="0x1070" />

<!-- These are the symbols for the individual commands -->
<IDSymbol name="CommandIDFormatXamlFile" value="0x0100" />
<IDSymbol name="CommandIDFormatAllXaml" value="0x0200" />
Expand Down