Permalink
Browse files

change formatting settings to be consistent with the rest of ILSpy

1 parent b5526fc commit 4725c171850177cd210a294d0d5c7e1e3abc27ec @siegfriedpammer siegfriedpammer committed Nov 13, 2014
Showing with 217 additions and 237 deletions.
  1. +3 −5 .editorconfig
  2. +6 −6 ILSpy.AddIn/Guids.cs
  3. +111 −114 ILSpy.AddIn/ILSpyAddInPackage.cs
  4. +6 −6 ILSpy.AddIn/PkgCmdID.cs
  5. +2 −2 ILSpy.AddIn/Properties/AssemblyInfo.cs
  6. +89 −104 ILSpy.AddIn/Utils.cs
View
@@ -5,11 +5,6 @@ root = true
indent_style = tab
indent_size = 4
-# The indentation (and source formatting!) of the addin sources are different than the rest of the solution.
-[ILSpy.AddIn/*]
-indent_style = space
-indent_size = 4
-
[*.il]
indent_style = space
indent_size = 2
@@ -23,3 +18,6 @@ indent_size = 2
[*.vsixmanifest]
indent_style = space
indent_size = 2
+[*.vsct]
+indent_style = space
+indent_size = 2
View
@@ -4,11 +4,11 @@
namespace ICSharpCode.ILSpy.AddIn
{
- static class GuidList
- {
- public const string guidILSpyAddInPkgString = "a9120dbe-164a-4891-842f-fb7829273838";
- public const string guidILSpyAddInCmdSetString = "85ddb8ca-a842-4b1c-ba1a-94141fdf19d0";
+ static class GuidList
+ {
+ public const string guidILSpyAddInPkgString = "a9120dbe-164a-4891-842f-fb7829273838";
+ public const string guidILSpyAddInCmdSetString = "85ddb8ca-a842-4b1c-ba1a-94141fdf19d0";
- public static readonly Guid guidILSpyAddInCmdSet = new Guid(guidILSpyAddInCmdSetString);
- };
+ public static readonly Guid guidILSpyAddInCmdSet = new Guid(guidILSpyAddInCmdSetString);
+ };
}
@@ -13,131 +13,128 @@
namespace ICSharpCode.ILSpy.AddIn
{
- /// <summary>
- /// This is the class that implements the package exposed by this assembly.
- ///
- /// The minimum requirement for a class to be considered a valid package for Visual Studio
- /// is to implement the IVsPackage interface and register itself with the shell.
- /// This package uses the helper classes defined inside the Managed Package Framework (MPF)
- /// to do it: it derives from the Package class that provides the implementation of the
- /// IVsPackage interface and uses the registration attributes defined in the framework to
- /// register itself and its components with the shell.
- /// </summary>
- // This attribute tells the PkgDef creation utility (CreatePkgDef.exe) that this class is
- // a package.
- [PackageRegistration(UseManagedResourcesOnly = true)]
- // This attribute is used to register the information needed to show this package
- // in the Help/About dialog of Visual Studio.
- [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
- // This attribute is needed to let the shell know that this package exposes some menus.
- [ProvideMenuResource("Menus.ctmenu", 1)]
- [Guid(GuidList.guidILSpyAddInPkgString)]
- [ProvideAutoLoad(VSConstants.UICONTEXT.SolutionExistsAndFullyLoaded_string)]
- public sealed class ILSpyAddInPackage : Package
- {
- /// <summary>
- /// Default constructor of the package.
- /// Inside this method you can place any initialization code that does not require
- /// any Visual Studio service because at this point the package object is created but
- /// not sited yet inside Visual Studio environment. The place to do all the other
- /// initialization is the Initialize method.
- /// </summary>
- public ILSpyAddInPackage()
- {
- Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "Entering constructor for: {0}", this.ToString()));
- }
+ /// <summary>
+ /// This is the class that implements the package exposed by this assembly.
+ ///
+ /// The minimum requirement for a class to be considered a valid package for Visual Studio
+ /// is to implement the IVsPackage interface and register itself with the shell.
+ /// This package uses the helper classes defined inside the Managed Package Framework (MPF)
+ /// to do it: it derives from the Package class that provides the implementation of the
+ /// IVsPackage interface and uses the registration attributes defined in the framework to
+ /// register itself and its components with the shell.
+ /// </summary>
+ // This attribute tells the PkgDef creation utility (CreatePkgDef.exe) that this class is
+ // a package.
+ [PackageRegistration(UseManagedResourcesOnly = true)]
+ // This attribute is used to register the information needed to show this package
+ // in the Help/About dialog of Visual Studio.
+ [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
+ // This attribute is needed to let the shell know that this package exposes some menus.
+ [ProvideMenuResource("Menus.ctmenu", 1)]
+ [Guid(GuidList.guidILSpyAddInPkgString)]
+ [ProvideAutoLoad(VSConstants.UICONTEXT.SolutionExistsAndFullyLoaded_string)]
+ public sealed class ILSpyAddInPackage : Package
+ {
+ /// <summary>
+ /// Default constructor of the package.
+ /// Inside this method you can place any initialization code that does not require
+ /// any Visual Studio service because at this point the package object is created but
+ /// not sited yet inside Visual Studio environment. The place to do all the other
+ /// initialization is the Initialize method.
+ /// </summary>
+ public ILSpyAddInPackage()
+ {
+ Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "Entering constructor for: {0}", this.ToString()));
+ }
- /////////////////////////////////////////////////////////////////////////////
- // Overridden Package Implementation
- #region Package Members
+ /////////////////////////////////////////////////////////////////////////////
+ // Overridden Package Implementation
+ #region Package Members
- /// <summary>
- /// Initialization of the package; this method is called right after the package is sited, so this is the place
- /// where you can put all the initialization code that rely on services provided by VisualStudio.
- /// </summary>
- protected override void Initialize()
- {
- Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "Entering Initialize() of: {0}", this.ToString()));
- base.Initialize();
+ /// <summary>
+ /// Initialization of the package; this method is called right after the package is sited, so this is the place
+ /// where you can put all the initialization code that rely on services provided by VisualStudio.
+ /// </summary>
+ protected override void Initialize()
+ {
+ Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "Entering Initialize() of: {0}", this.ToString()));
+ base.Initialize();
- // Add our command handlers for menu (commands must exist in the .vsct file)
- OleMenuCommandService mcs = GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
- if (null != mcs)
- {
- // Create the command for the menu item.
- CommandID menuCommandID = new CommandID(GuidList.guidILSpyAddInCmdSet, (int)PkgCmdIDList.cmdidOpenInILSpy);
- MenuCommand menuItem = new MenuCommand(OpenInILSpyCallback, menuCommandID);
- mcs.AddCommand(menuItem);
+ // Add our command handlers for menu (commands must exist in the .vsct file)
+ OleMenuCommandService mcs = GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
+ if (null != mcs) {
+ // Create the command for the menu item.
+ CommandID menuCommandID = new CommandID(GuidList.guidILSpyAddInCmdSet, (int)PkgCmdIDList.cmdidOpenInILSpy);
+ MenuCommand menuItem = new MenuCommand(OpenInILSpyCallback, menuCommandID);
+ mcs.AddCommand(menuItem);
- // Create the command for the menu item.
- CommandID menuCommandID2 = new CommandID(GuidList.guidILSpyAddInCmdSet, (int)PkgCmdIDList.cmdidOpenILSpy);
- MenuCommand menuItem2 = new MenuCommand(OpenILSpyCallback, menuCommandID2);
- mcs.AddCommand(menuItem2);
- }
- }
- #endregion
+ // Create the command for the menu item.
+ CommandID menuCommandID2 = new CommandID(GuidList.guidILSpyAddInCmdSet, (int)PkgCmdIDList.cmdidOpenILSpy);
+ MenuCommand menuItem2 = new MenuCommand(OpenILSpyCallback, menuCommandID2);
+ mcs.AddCommand(menuItem2);
+ }
+ }
+ #endregion
- /// <summary>
- /// This function is the callback used to execute a command when the a menu item is clicked.
- /// See the Initialize method to see how the menu item is associated to this function using
- /// the OleMenuCommandService service and the MenuCommand class.
- /// </summary>
- private void OpenInILSpyCallback(object sender, EventArgs e)
- {
- var explorer = ((EnvDTE80.DTE2)GetGlobalService(typeof(EnvDTE.DTE))).ToolWindows.SolutionExplorer;
- var items = explorer.SelectedItems as EnvDTE.UIHierarchyItem[];
+ /// <summary>
+ /// This function is the callback used to execute a command when the a menu item is clicked.
+ /// See the Initialize method to see how the menu item is associated to this function using
+ /// the OleMenuCommandService service and the MenuCommand class.
+ /// </summary>
+ private void OpenInILSpyCallback(object sender, EventArgs e)
+ {
+ var explorer = ((EnvDTE80.DTE2)GetGlobalService(typeof(EnvDTE.DTE))).ToolWindows.SolutionExplorer;
+ var items = explorer.SelectedItems as EnvDTE.UIHierarchyItem[];
- foreach (var item in items)
- {
- dynamic obj = item.Object;
- OpenAssemblyInILSpy(obj.Path);
- }
+ foreach (var item in items) {
+ dynamic obj = item.Object;
+ OpenAssemblyInILSpy(obj.Path);
+ }
- }
+ }
- private void OpenILSpyCallback(object sender, EventArgs e)
- {
- Process.Start(GetILSpyPath());
- }
+ private void OpenILSpyCallback(object sender, EventArgs e)
+ {
+ Process.Start(GetILSpyPath());
+ }
- private string GetILSpyPath()
- {
- var basePath = Path.GetDirectoryName(typeof(ILSpyAddInPackage).Assembly.Location);
- return Path.Combine(basePath, "ILSpy.exe");
- }
+ private string GetILSpyPath()
+ {
+ var basePath = Path.GetDirectoryName(typeof(ILSpyAddInPackage).Assembly.Location);
+ return Path.Combine(basePath, "ILSpy.exe");
+ }
- private void OpenAssemblyInILSpy(string assemblyFileName)
- {
- if (!File.Exists(assemblyFileName))
- {
- ShowMessage("Could not find assembly '{0}', please ensure the project and all references were built correctly!", assemblyFileName);
- return;
- }
- Process.Start(GetILSpyPath(), Utils.ArgumentArrayToCommandLine(assemblyFileName));
- }
+ private void OpenAssemblyInILSpy(string assemblyFileName)
+ {
+ if (!File.Exists(assemblyFileName)) {
+ ShowMessage("Could not find assembly '{0}', please ensure the project and all references were built correctly!", assemblyFileName);
+ return;
+ }
+ Process.Start(GetILSpyPath(), Utils.ArgumentArrayToCommandLine(assemblyFileName));
+ }
- private void ShowMessage(string format, params object[] items)
- {
- IVsUIShell uiShell = (IVsUIShell)GetService(typeof(SVsUIShell));
- Guid clsid = Guid.Empty;
- int result;
- Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(
- uiShell.ShowMessageBox(
- 0,
- ref clsid,
- "ILSpy.AddIn",
- string.Format(CultureInfo.CurrentCulture, format, items),
- string.Empty,
- 0,
- OLEMSGBUTTON.OLEMSGBUTTON_OK,
- OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST,
- OLEMSGICON.OLEMSGICON_INFO,
- 0, // false
- out result
- )
- );
- }
- }
+ private void ShowMessage(string format, params object[] items)
+ {
+ IVsUIShell uiShell = (IVsUIShell)GetService(typeof(SVsUIShell));
+ Guid clsid = Guid.Empty;
+ int result;
+ Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(
+ uiShell.ShowMessageBox(
+ 0,
+ ref clsid,
+ "ILSpy.AddIn",
+ string.Format(CultureInfo.CurrentCulture, format, items),
+ string.Empty,
+ 0,
+ OLEMSGBUTTON.OLEMSGBUTTON_OK,
+ OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST,
+ OLEMSGICON.OLEMSGICON_INFO,
+ 0, // false
+ out result
+ )
+ );
+ }
+ }
}
@@ -4,10 +4,10 @@
namespace ICSharpCode.ILSpy.AddIn
{
- static class PkgCmdIDList
- {
- public const uint cmdidOpenILSpy = 0x100;
- public const uint cmdidOpenInILSpy = 0x200;
- public const uint cmdidOpenDefinitionInILSpy = 0x300;
- };
+ static class PkgCmdIDList
+ {
+ public const uint cmdidOpenILSpy = 0x100;
+ public const uint cmdidOpenInILSpy = 0x200;
+ public const uint cmdidOpenDefinitionInILSpy = 0x300;
+ };
}
@@ -14,8 +14,8 @@
[assembly: AssemblyProduct("ILSpy.AddIn")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: NeutralResourcesLanguage("en-US")]
Oops, something went wrong.

0 comments on commit 4725c17

Please sign in to comment.