Skip to content
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

Cleanup vs ext #349

Closed
wants to merge 9 commits into from
Closed

Cleanup vs ext #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
98e290b
remove comment /*[access-modifier], but [access-modifier] for FSharp.…
enricosada Apr 8, 2015
a15ace9
remove unused
enricosada Apr 8, 2015
f80ddd6
possible null ref, check parent before parent.onChildAdded
enricosada Apr 8, 2015
435f377
style fix
enricosada Apr 8, 2015
37004ea
remove commented out code
enricosada Apr 8, 2015
a31c7b5
fix xml docs
enricosada Apr 8, 2015
7e845de
cleanup
enricosada Apr 9, 2015
38193c4
unused comment and using
enricosada Apr 9, 2015
b8d7b1d
fix naming
enricosada Apr 9, 2015
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: 8 additions & 8 deletions ...ration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/AssemblyReferenceNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private struct AssemblyMSBuildProjectionInfo
/// The name of the assembly this reference represents.
/// </summary>
/// <value></value>
/*internal, but public for FSharp.Project.dll*/ public System.Reflection.AssemblyName AssemblyName
public System.Reflection.AssemblyName AssemblyName
{
get
{
Expand All @@ -75,7 +75,7 @@ private struct AssemblyMSBuildProjectionInfo
/// machine. It can be different from the AssemblyName property because it can
/// be more specific.
/// </summary>
/*internal, but public for FSharp.Project.dll*/ public System.Reflection.AssemblyName ResolvedAssembly
public System.Reflection.AssemblyName ResolvedAssembly
{
get { return this.resolvedInfo.ResolvedAssemblyName; }
}
Expand Down Expand Up @@ -120,7 +120,7 @@ public override string Caption
}

private Automation.OAAssemblyReference assemblyRef;
/*internal, but public for FSharp.Project.dll*/ public override object Object
public override object Object
{
get
{
Expand Down Expand Up @@ -325,7 +325,7 @@ private bool IsSpecialFSharpCoreReference
get { return ProjectMgr.CanUseTargetFSharpCoreReference && IsFSharpCoreReference(this) && ContainsUsagesOfTargetFSharpCoreVersionProperty(this); }
}

public /*protected, but public for FSharp.Project.dll*/ override NodeProperties CreatePropertiesObject()
public override NodeProperties CreatePropertiesObject()
{
if (IsSpecialFSharpCoreReference)
{
Expand All @@ -338,7 +338,7 @@ private bool IsSpecialFSharpCoreReference
/// <summary>
/// Links a reference node to the project and hierarchy.
/// </summary>
public /*protected, but public for FSharp.Project.dll*/ override void BindReferenceData()
public override void BindReferenceData()
{
// BindReferenceData only happens for newly created AssemblyReferenceNodes (as opposed to loaded from fsproj)
Debug.Assert(this.resolvedInfo.WasSuccessfullyResolved, "assembly was not resolved, we should not be trying to link a node to put in .fsproj file");
Expand Down Expand Up @@ -440,7 +440,7 @@ public override void Remove(bool removeFromStorage)
/// Determines if this is node a valid node for painting the default reference icon.
/// </summary>
/// <returns></returns>
public /*protected, but public for FSharp.Project.dll*/ override bool CanShowDefaultIcon()
public override bool CanShowDefaultIcon()
{
if (String.IsNullOrEmpty(this.myAssemblyPath) || !File.Exists(this.myAssemblyPath))
{
Expand Down Expand Up @@ -474,7 +474,7 @@ public void DoOneOffResolve()
var result = this.ProjectMgr.Build(MsBuildTarget.ResolveAssemblyReferences);
this.ResolveReference(result);
}
internal /*protected, but public for FSharp.Project.dll*/ override void ResolveReference(BuildResult buildResult)
internal override void ResolveReference(BuildResult buildResult)
{
Debug.Assert(this.ItemNode != null && this.ItemNode.Item != null, "called ResolveReference before initializing ItemNode");
this.ResolveFromBuiltProject(MSBuildItem.GetEvaluatedInclude(this.ItemNode.Item), buildResult);
Expand Down Expand Up @@ -687,7 +687,7 @@ private void OnAssemblyReferenceChangedOnDisk(object sender, FileChangedOnDiskEv
}
}

public /*protected, but public for FSharp.Project.dll*/ override Guid GetBrowseLibraryGuid()
public override Guid GetBrowseLibraryGuid()
{
return VSConstants.guidCOMPLUSLibrary;
}
Expand Down
10 changes: 5 additions & 5 deletions .../FsPkgs/FSharp.Project/Common.Source.CSharp/Project/Automation/OANavigableProjectItems.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ public class OANavigableProjectItems : EnvDTE.ProjectItems

#region properties
/// <summary>
/// Defines an /*internal, but public for FSharp.Project.dll*/ public list of project items
/// Defines an public list of project items
/// </summary>
/*internal, but public for FSharp.Project.dll*/ public IList<EnvDTE.ProjectItem> Items
public IList<EnvDTE.ProjectItem> Items
{
get
{
Expand All @@ -45,7 +45,7 @@ public class OANavigableProjectItems : EnvDTE.ProjectItems
/// <summary>
/// Defines a relationship to the associated project.
/// </summary>
/*internal, but public for FSharp.Project.dll*/ public OAProject Project
public OAProject Project
{
get
{
Expand All @@ -56,7 +56,7 @@ public class OANavigableProjectItems : EnvDTE.ProjectItems
/// <summary>
/// Defines the node that contains the items
/// </summary>
/*internal, but public for FSharp.Project.dll*/ public HierarchyNode NodeWithItems
public HierarchyNode NodeWithItems
{
get
{
Expand Down Expand Up @@ -258,7 +258,7 @@ public virtual IEnumerator GetEnumerator()
/// Retrives a list of items associated with the current node.
/// </summary>
/// <returns>A List of project items</returns>
public /*protected, but public for FSharp.Project.dll*/ IList<EnvDTE.ProjectItem> GetListOfProjectItems()
public IList<EnvDTE.ProjectItem> GetListOfProjectItems()
{
return UIThread.DoOnUIThread(delegate() {
List<EnvDTE.ProjectItem> list = new List<EnvDTE.ProjectItem>();
Expand Down
4 changes: 2 additions & 2 deletions ...ion/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/Automation/OAProjectItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class OAProjectItem<T> : EnvDTE.ProjectItem
#endregion

#region properties
public /*protected, but public for FSharp.Project.dll*/ T Node
public T Node
{
get
{
Expand All @@ -39,7 +39,7 @@ public class OAProjectItem<T> : EnvDTE.ProjectItem
/// <summary>
/// Returns the automation project
/// </summary>
public /*protected, but public for FSharp.Project.dll*/ OAProject Project
public OAProject Project
{
get
{
Expand Down
4 changes: 2 additions & 2 deletions ...on/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/Automation/OAProjectItems.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public override EnvDTE.ProjectItem AddFromFile(string fileName)
/// <param name="path">The full path of the item to add.</param>
/// <param name="op">The VSADDITEMOPERATION to use when adding the item.</param>
/// <returns>A ProjectItem object. </returns>
public /*protected, but public for FSharp.Project.dll*/ virtual EnvDTE.ProjectItem AddItem(string path, VSADDITEMOPERATION op)
public virtual EnvDTE.ProjectItem AddItem(string path, VSADDITEMOPERATION op)
{
return UIThread.DoOnUIThread(delegate() {
if (this.Project == null || this.Project.Project == null || this.Project.Project.Site == null || this.Project.Project.IsClosed)
Expand Down Expand Up @@ -247,7 +247,7 @@ public override EnvDTE.ProjectItem AddFromFile(string fileName)
/// <param name="result">The VSADDRESULT returned by the Add methods</param>
/// <param name="path">The full path of the item added.</param>
/// <returns>A ProjectItem object.</returns>
public /*protected, but public for FSharp.Project.dll*/ virtual EnvDTE.ProjectItem EvaluateAddResult(VSADDRESULT result, string path)
public virtual EnvDTE.ProjectItem EvaluateAddResult(VSADDRESULT result, string path)
{
return UIThread.DoOnUIThread(delegate() {
if (result == VSADDRESULT.ADDRESULT_Success)
Expand Down
4 changes: 2 additions & 2 deletions ...tion/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/Automation/OAProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public virtual object Parent
/// Add properties to the collection of properties filtering only those properties which are com-visible and AutomationBrowsable
/// </summary>
/// <param name="targetType">The type of NodeProperties the we should filter on</param>
public /*protected, but public for FSharp.Project.dll*/ void AddPropertiesFromType(Type targetType)
public void AddPropertiesFromType(Type targetType)
{
Debug.Assert(targetType != null);

Expand All @@ -209,7 +209,7 @@ public virtual object Parent
/// Creates a new OAProperty object and adds it to the current list of properties
/// </summary>
/// <param name="propertyInfo">The property to be associated with an OAProperty object</param>
public /*protected, but public for FSharp.Project.dll*/ virtual void AddProperty(PropertyInfo propertyInfo)
public virtual void AddProperty(PropertyInfo propertyInfo)
{
this.properties.Add(propertyInfo.Name, new OAProperty(this, propertyInfo));
}
Expand Down
2 changes: 1 addition & 1 deletion ...sPkgs/FSharp.Project/Common.Source.CSharp/Project/Automation/VSProject/OAReferenceBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ internal OAReferenceBase(RefType referenceNode)
#endregion

#region properties
public /*protected, but public for FSharp.Project.dll*/ RefType BaseReferenceNode
public RefType BaseReferenceNode
{
get { return referenceNode; }
}
Expand Down
8 changes: 4 additions & 4 deletions vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/ComReferenceNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public int MinorVersionNumber
}
}
private Automation.OAComReference comReference;
/*internal, but public for FSharp.Project.dll*/ public override object Object
public override object Object
{
get
{
Expand Down Expand Up @@ -219,7 +219,7 @@ internal ComReferenceNode(ProjectNode root, string filePath)
/// <summary>
/// Links a reference node to the project and hierarchy.
/// </summary>
public /*protected, but public for FSharp.Project.dll*/ override void BindReferenceData()
public override void BindReferenceData()
{
Debug.Assert(this.ItemNode != null, "The AssemblyName field has not been initialized");

Expand All @@ -240,7 +240,7 @@ internal ComReferenceNode(ProjectNode root, string filePath)
/// Checks if a reference is already added. The method parses all references and compares the the FinalItemSpec and the Guid.
/// </summary>
/// <returns>true if the assembly has already been added.</returns>
public /*protected, but public for FSharp.Project.dll*/ override bool IsAlreadyAdded(out ReferenceNode existingNode)
public override bool IsAlreadyAdded(out ReferenceNode existingNode)
{
ReferenceContainerNode referencesFolder = this.ProjectMgr.FindChild(ReferenceContainerNode.ReferencesNodeVirtualName) as ReferenceContainerNode;
Debug.Assert(referencesFolder != null, "Could not find the References node");
Expand Down Expand Up @@ -268,7 +268,7 @@ internal ComReferenceNode(ProjectNode root, string filePath)
/// Determines if this is node a valid node for painting the default reference icon.
/// </summary>
/// <returns></returns>
public /*protected, but public for FSharp.Project.dll*/ override bool CanShowDefaultIcon()
public override bool CanShowDefaultIcon()
{
return !String.IsNullOrEmpty(this.installedFilePath);
}
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/ConfigProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class ConfigProvider : IVsCfgProvider2, IVsProjectCfgProvider, IVsExtensi
/// <summary>
/// The associated project.
/// </summary>
public /*protected, but public for FSharp.Project.dll*/ ProjectNode ProjectMgr
public ProjectNode ProjectMgr
{
get
{
Expand Down
42 changes: 21 additions & 21 deletions vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/DataObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ internal sealed class DataCacheEntry : IDisposable
#endregion

#region properties
/*internal, but public for FSharp.Project.dll*/ public FORMATETC Format
public FORMATETC Format
{
get
{
return this.format;
}
}

/*internal, but public for FSharp.Project.dll*/ public long Data
public long Data
{
get
{
Expand All @@ -67,7 +67,7 @@ internal sealed class DataCacheEntry : IDisposable
}

[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
/*internal, but public for FSharp.Project.dll*/ public DATADIR DataDir
public DATADIR DataDir
{
get
{
Expand All @@ -80,7 +80,7 @@ internal sealed class DataCacheEntry : IDisposable
/// <summary>
/// The IntPtr is data allocated that should be removed. It is allocated by the ProcessSelectionData method.
/// </summary>
/*internal, but public for FSharp.Project.dll*/ public DataCacheEntry(FORMATETC fmt, IntPtr data, DATADIR dir)
public DataCacheEntry(FORMATETC fmt, IntPtr data, DATADIR dir)
{
this.format = fmt;
this.data = (long)data;
Expand Down Expand Up @@ -138,22 +138,22 @@ private void Dispose(bool disposing)
internal sealed class DataObject : IDataObject
{
#region fields
/*internal, but public for FSharp.Project.dll*/ public const int DATA_S_SAMEFORMATETC = 0x00040130;
public const int DATA_S_SAMEFORMATETC = 0x00040130;

/*internal, but public for FSharp.Project.dll*/ public static readonly int DATA_E_FORMATETC = ForceCast(0x80040064);
public static readonly int DATA_E_FORMATETC = ForceCast(0x80040064);

EventSinkCollection map;

ArrayList entries;
#endregion

/*internal, but public for FSharp.Project.dll*/ public DataObject()
public DataObject()
{
this.map = new EventSinkCollection();
this.entries = new ArrayList();
}

/*internal, but public for FSharp.Project.dll*/ public void SetData(FORMATETC format, IntPtr data)
public void SetData(FORMATETC format, IntPtr data)
{
this.entries.Add(new DataCacheEntry(format, data, DATADIR.DATADIR_SET));
}
Expand Down Expand Up @@ -240,12 +240,12 @@ void IDataObject.SetData(FORMATETC[] fmt, STGMEDIUM[] m, int fRelease)
#endregion

#region static methods
/*internal, but public for FSharp.Project.dll*/ public static int ForceCast(uint i)
public static int ForceCast(uint i)
{
unchecked { return (int)i; }
}

/*internal, but public for FSharp.Project.dll*/ public static uint ForceCast(int i)
public static uint ForceCast(int i)
{
unchecked { return (uint)i; }
}
Expand All @@ -257,12 +257,12 @@ void IDataObject.SetData(FORMATETC[] fmt, STGMEDIUM[] m, int fRelease)
internal static class DragDropHelper
{
#pragma warning disable 414
/*internal, but public for FSharp.Project.dll*/ internal static readonly ushort CF_VSREFPROJECTS = 0;
/*internal, but public for FSharp.Project.dll*/ internal static readonly ushort CF_VSSTGPROJECTS = 0;
/*internal, but public for FSharp.Project.dll*/ internal static readonly ushort CF_VSREFPROJECTITEMS = 0;
/*internal, but public for FSharp.Project.dll*/ internal static readonly ushort CF_VSSTGPROJECTITEMS = 0;
/*internal, but public for FSharp.Project.dll*/ internal static readonly ushort CF_PROJECTCLIPDESCRIPTOR = 0;
/*internal, but public for FSharp.Project.dll*/ internal static readonly ushort CF_VSPROJECTCLIPDESCRIPTOR = 0;
internal static readonly ushort CF_VSREFPROJECTS = 0;
internal static readonly ushort CF_VSSTGPROJECTS = 0;
internal static readonly ushort CF_VSREFPROJECTITEMS = 0;
internal static readonly ushort CF_VSSTGPROJECTITEMS = 0;
internal static readonly ushort CF_PROJECTCLIPDESCRIPTOR = 0;
internal static readonly ushort CF_VSPROJECTCLIPDESCRIPTOR = 0;
#pragma warning restore 414

static DragDropHelper()
Expand Down Expand Up @@ -414,7 +414,7 @@ public static string GetSourceProjectPath(Microsoft.VisualStudio.OLE.Interop.IDa
/// </summary>
/// <param name="dropHandle"></param>
/// <returns></returns>
/*internal, but public for FSharp.Project.dll*/ public static string GetData(IntPtr dropHandle)
public static string GetData(IntPtr dropHandle)
{
IntPtr data = UnsafeNativeMethods.GlobalLock(dropHandle);
try
Expand All @@ -437,7 +437,7 @@ public static string GetSourceProjectPath(Microsoft.VisualStudio.OLE.Interop.IDa
return null;
}

/*internal, but public for FSharp.Project.dll*/ public static void FillFormatEtc(ref FORMATETC template, ushort clipFormat, ref FORMATETC result)
public static void FillFormatEtc(ref FORMATETC template, ushort clipFormat, ref FORMATETC result)
{
if (clipFormat != 0)
{
Expand All @@ -450,7 +450,7 @@ public static string GetSourceProjectPath(Microsoft.VisualStudio.OLE.Interop.IDa
}
}

/*internal, but public for FSharp.Project.dll*/ public static void OleCopyFormatEtc(ref FORMATETC src, ref FORMATETC dest)
public static void OleCopyFormatEtc(ref FORMATETC src, ref FORMATETC dest)
{
dest.cfFormat = src.cfFormat;
dest.ptd = Marshal.AllocCoTaskMem(Marshal.SizeOf(src.ptd));
Expand All @@ -460,7 +460,7 @@ public static string GetSourceProjectPath(Microsoft.VisualStudio.OLE.Interop.IDa
dest.tymed = src.tymed;
}

/*internal, but public for FSharp.Project.dll*/ public static IntPtr CopyHGlobal(IntPtr data)
public static IntPtr CopyHGlobal(IntPtr data)
{
IntPtr src = UnsafeNativeMethods.GlobalLock(data);
int size = UnsafeNativeMethods.GlobalSize(data);
Expand Down Expand Up @@ -491,7 +491,7 @@ public static string GetSourceProjectPath(Microsoft.VisualStudio.OLE.Interop.IDa
return ptr;
}

/*internal, but public for FSharp.Project.dll*/ public static void CopyStringToHGlobal(string s, IntPtr data, int bufferSize)
public static void CopyStringToHGlobal(string s, IntPtr data, int bufferSize)
{
Int16 nullTerminator = 0;
int dwSize = Marshal.SizeOf(nullTerminator);
Expand Down
Loading