Skip to content

Commit 0bfd80c

Browse files
enricosadalatkin
enricosada
authored and
latkin
committed
Cleanup vs ext
remove all of the `/*internal, but public for FSharp.Project.dll*/` comments, and other small cleanups closes dotnet/fsharp#349 commit 4a8abefeddc58809f7429434649e2f5b02f67ff7 Author: enricosada <enrico@sada.io> Date: Thu Apr 9 16:44:03 2015 +0200 fix naming commit 2767f161028cfc78078eb7ac197f36bfdaed6e2e Author: enricosada <enrico@sada.io> Date: Thu Apr 9 16:39:48 2015 +0200 unused comment and using commit 784d73e80827ccb79485b07c481043842a1511a1 Author: enricosada <enrico@sada.io> Date: Thu Apr 9 16:32:46 2015 +0200 cleanup commit 3d9dd20bda3f27b35ab38c342f347b3d48fdd0b7 Author: enricosada <enrico@sada.io> Date: Wed Apr 8 17:18:46 2015 +0200 fix xml docs commit c737d7c82621eef223cc894be9c6fc415ddbf67e Author: enricosada <enrico@sada.io> Date: Wed Apr 8 17:16:19 2015 +0200 remove commented out code commit 9ddf4c15b2fa9ea1d82dffa37ae632062b24c33d Author: enricosada <enrico@sada.io> Date: Wed Apr 8 17:11:35 2015 +0200 style fix commit 24cdafd72721d2f81711d15d7f412b1f8810d719 Author: enricosada <enrico@sada.io> Date: Wed Apr 8 17:10:44 2015 +0200 possible null ref, check parent before parent.onChildAdded commit 3c74d24fd7e9ec78ae2cfddcd9d993d74e080742 Author: enricosada <enrico@sada.io> Date: Wed Apr 8 17:08:11 2015 +0200 remove unused commit 54bdb0530c64a959c345cfffa5566f4ddba753d8 Author: enricosada <enrico@sada.io> Date: Wed Apr 8 17:00:50 2015 +0200 remove comment /*[access-modifier], but [access-modifier] for FSharp.Project.dll*/
1 parent ae910ee commit 0bfd80c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+624
-689
lines changed

‎vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/AssemblyReferenceNode.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private struct AssemblyMSBuildProjectionInfo
6262
/// The name of the assembly this reference represents.
6363
/// </summary>
6464
/// <value></value>
65-
/*internal, but public for FSharp.Project.dll*/ public System.Reflection.AssemblyName AssemblyName
65+
public System.Reflection.AssemblyName AssemblyName
6666
{
6767
get
6868
{
@@ -75,7 +75,7 @@ private struct AssemblyMSBuildProjectionInfo
7575
/// machine. It can be different from the AssemblyName property because it can
7676
/// be more specific.
7777
/// </summary>
78-
/*internal, but public for FSharp.Project.dll*/ public System.Reflection.AssemblyName ResolvedAssembly
78+
public System.Reflection.AssemblyName ResolvedAssembly
7979
{
8080
get { return this.resolvedInfo.ResolvedAssemblyName; }
8181
}
@@ -120,7 +120,7 @@ public override string Caption
120120
}
121121

122122
private Automation.OAAssemblyReference assemblyRef;
123-
/*internal, but public for FSharp.Project.dll*/ public override object Object
123+
public override object Object
124124
{
125125
get
126126
{
@@ -325,7 +325,7 @@ private bool IsSpecialFSharpCoreReference
325325
get { return ProjectMgr.CanUseTargetFSharpCoreReference && IsFSharpCoreReference(this) && ContainsUsagesOfTargetFSharpCoreVersionProperty(this); }
326326
}
327327

328-
public /*protected, but public for FSharp.Project.dll*/ override NodeProperties CreatePropertiesObject()
328+
public override NodeProperties CreatePropertiesObject()
329329
{
330330
if (IsSpecialFSharpCoreReference)
331331
{
@@ -338,7 +338,7 @@ private bool IsSpecialFSharpCoreReference
338338
/// <summary>
339339
/// Links a reference node to the project and hierarchy.
340340
/// </summary>
341-
public /*protected, but public for FSharp.Project.dll*/ override void BindReferenceData()
341+
public override void BindReferenceData()
342342
{
343343
// BindReferenceData only happens for newly created AssemblyReferenceNodes (as opposed to loaded from fsproj)
344344
Debug.Assert(this.resolvedInfo.WasSuccessfullyResolved, "assembly was not resolved, we should not be trying to link a node to put in .fsproj file");
@@ -440,7 +440,7 @@ public override void Remove(bool removeFromStorage)
440440
/// Determines if this is node a valid node for painting the default reference icon.
441441
/// </summary>
442442
/// <returns></returns>
443-
public /*protected, but public for FSharp.Project.dll*/ override bool CanShowDefaultIcon()
443+
public override bool CanShowDefaultIcon()
444444
{
445445
if (String.IsNullOrEmpty(this.myAssemblyPath) || !File.Exists(this.myAssemblyPath))
446446
{
@@ -474,7 +474,7 @@ public void DoOneOffResolve()
474474
var result = this.ProjectMgr.Build(MsBuildTarget.ResolveAssemblyReferences);
475475
this.ResolveReference(result);
476476
}
477-
internal /*protected, but public for FSharp.Project.dll*/ override void ResolveReference(BuildResult buildResult)
477+
internal override void ResolveReference(BuildResult buildResult)
478478
{
479479
Debug.Assert(this.ItemNode != null && this.ItemNode.Item != null, "called ResolveReference before initializing ItemNode");
480480
this.ResolveFromBuiltProject(MSBuildItem.GetEvaluatedInclude(this.ItemNode.Item), buildResult);
@@ -687,7 +687,7 @@ private void OnAssemblyReferenceChangedOnDisk(object sender, FileChangedOnDiskEv
687687
}
688688
}
689689

690-
public /*protected, but public for FSharp.Project.dll*/ override Guid GetBrowseLibraryGuid()
690+
public override Guid GetBrowseLibraryGuid()
691691
{
692692
return VSConstants.guidCOMPLUSLibrary;
693693
}

‎vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/Automation/OANavigableProjectItems.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ public class OANavigableProjectItems : EnvDTE.ProjectItems
3232

3333
#region properties
3434
/// <summary>
35-
/// Defines an /*internal, but public for FSharp.Project.dll*/ public list of project items
35+
/// Defines an public list of project items
3636
/// </summary>
37-
/*internal, but public for FSharp.Project.dll*/ public IList<EnvDTE.ProjectItem> Items
37+
public IList<EnvDTE.ProjectItem> Items
3838
{
3939
get
4040
{
@@ -45,7 +45,7 @@ public class OANavigableProjectItems : EnvDTE.ProjectItems
4545
/// <summary>
4646
/// Defines a relationship to the associated project.
4747
/// </summary>
48-
/*internal, but public for FSharp.Project.dll*/ public OAProject Project
48+
public OAProject Project
4949
{
5050
get
5151
{
@@ -56,7 +56,7 @@ public class OANavigableProjectItems : EnvDTE.ProjectItems
5656
/// <summary>
5757
/// Defines the node that contains the items
5858
/// </summary>
59-
/*internal, but public for FSharp.Project.dll*/ public HierarchyNode NodeWithItems
59+
public HierarchyNode NodeWithItems
6060
{
6161
get
6262
{
@@ -258,7 +258,7 @@ public virtual IEnumerator GetEnumerator()
258258
/// Retrives a list of items associated with the current node.
259259
/// </summary>
260260
/// <returns>A List of project items</returns>
261-
public /*protected, but public for FSharp.Project.dll*/ IList<EnvDTE.ProjectItem> GetListOfProjectItems()
261+
public IList<EnvDTE.ProjectItem> GetListOfProjectItems()
262262
{
263263
return UIThread.DoOnUIThread(delegate() {
264264
List<EnvDTE.ProjectItem> list = new List<EnvDTE.ProjectItem>();

‎vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/Automation/OAProjectItem.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class OAProjectItem<T> : EnvDTE.ProjectItem
2828
#endregion
2929

3030
#region properties
31-
public /*protected, but public for FSharp.Project.dll*/ T Node
31+
public T Node
3232
{
3333
get
3434
{
@@ -39,7 +39,7 @@ public class OAProjectItem<T> : EnvDTE.ProjectItem
3939
/// <summary>
4040
/// Returns the automation project
4141
/// </summary>
42-
public /*protected, but public for FSharp.Project.dll*/ OAProject Project
42+
public OAProject Project
4343
{
4444
get
4545
{

‎vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/Automation/OAProjectItems.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public override EnvDTE.ProjectItem AddFromFile(string fileName)
201201
/// <param name="path">The full path of the item to add.</param>
202202
/// <param name="op">The VSADDITEMOPERATION to use when adding the item.</param>
203203
/// <returns>A ProjectItem object. </returns>
204-
public /*protected, but public for FSharp.Project.dll*/ virtual EnvDTE.ProjectItem AddItem(string path, VSADDITEMOPERATION op)
204+
public virtual EnvDTE.ProjectItem AddItem(string path, VSADDITEMOPERATION op)
205205
{
206206
return UIThread.DoOnUIThread(delegate() {
207207
if (this.Project == null || this.Project.Project == null || this.Project.Project.Site == null || this.Project.Project.IsClosed)
@@ -247,7 +247,7 @@ public override EnvDTE.ProjectItem AddFromFile(string fileName)
247247
/// <param name="result">The VSADDRESULT returned by the Add methods</param>
248248
/// <param name="path">The full path of the item added.</param>
249249
/// <returns>A ProjectItem object.</returns>
250-
public /*protected, but public for FSharp.Project.dll*/ virtual EnvDTE.ProjectItem EvaluateAddResult(VSADDRESULT result, string path)
250+
public virtual EnvDTE.ProjectItem EvaluateAddResult(VSADDRESULT result, string path)
251251
{
252252
return UIThread.DoOnUIThread(delegate() {
253253
if (result == VSADDRESULT.ADDRESULT_Success)

‎vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/Automation/OAProperties.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public virtual object Parent
184184
/// Add properties to the collection of properties filtering only those properties which are com-visible and AutomationBrowsable
185185
/// </summary>
186186
/// <param name="targetType">The type of NodeProperties the we should filter on</param>
187-
public /*protected, but public for FSharp.Project.dll*/ void AddPropertiesFromType(Type targetType)
187+
public void AddPropertiesFromType(Type targetType)
188188
{
189189
Debug.Assert(targetType != null);
190190

@@ -209,7 +209,7 @@ public virtual object Parent
209209
/// Creates a new OAProperty object and adds it to the current list of properties
210210
/// </summary>
211211
/// <param name="propertyInfo">The property to be associated with an OAProperty object</param>
212-
public /*protected, but public for FSharp.Project.dll*/ virtual void AddProperty(PropertyInfo propertyInfo)
212+
public virtual void AddProperty(PropertyInfo propertyInfo)
213213
{
214214
this.properties.Add(propertyInfo.Name, new OAProperty(this, propertyInfo));
215215
}

‎vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/Automation/VSProject/OAReferenceBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ internal OAReferenceBase(RefType referenceNode)
3131
#endregion
3232

3333
#region properties
34-
public /*protected, but public for FSharp.Project.dll*/ RefType BaseReferenceNode
34+
public RefType BaseReferenceNode
3535
{
3636
get { return referenceNode; }
3737
}

‎vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/ComReferenceNode.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public int MinorVersionNumber
104104
}
105105
}
106106
private Automation.OAComReference comReference;
107-
/*internal, but public for FSharp.Project.dll*/ public override object Object
107+
public override object Object
108108
{
109109
get
110110
{
@@ -219,7 +219,7 @@ internal ComReferenceNode(ProjectNode root, string filePath)
219219
/// <summary>
220220
/// Links a reference node to the project and hierarchy.
221221
/// </summary>
222-
public /*protected, but public for FSharp.Project.dll*/ override void BindReferenceData()
222+
public override void BindReferenceData()
223223
{
224224
Debug.Assert(this.ItemNode != null, "The AssemblyName field has not been initialized");
225225

@@ -240,7 +240,7 @@ internal ComReferenceNode(ProjectNode root, string filePath)
240240
/// Checks if a reference is already added. The method parses all references and compares the the FinalItemSpec and the Guid.
241241
/// </summary>
242242
/// <returns>true if the assembly has already been added.</returns>
243-
public /*protected, but public for FSharp.Project.dll*/ override bool IsAlreadyAdded(out ReferenceNode existingNode)
243+
public override bool IsAlreadyAdded(out ReferenceNode existingNode)
244244
{
245245
ReferenceContainerNode referencesFolder = this.ProjectMgr.FindChild(ReferenceContainerNode.ReferencesNodeVirtualName) as ReferenceContainerNode;
246246
Debug.Assert(referencesFolder != null, "Could not find the References node");
@@ -268,7 +268,7 @@ internal ComReferenceNode(ProjectNode root, string filePath)
268268
/// Determines if this is node a valid node for painting the default reference icon.
269269
/// </summary>
270270
/// <returns></returns>
271-
public /*protected, but public for FSharp.Project.dll*/ override bool CanShowDefaultIcon()
271+
public override bool CanShowDefaultIcon()
272272
{
273273
return !String.IsNullOrEmpty(this.installedFilePath);
274274
}

‎vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/ConfigProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class ConfigProvider : IVsCfgProvider2, IVsProjectCfgProvider, IVsExtensi
4141
/// <summary>
4242
/// The associated project.
4343
/// </summary>
44-
public /*protected, but public for FSharp.Project.dll*/ ProjectNode ProjectMgr
44+
public ProjectNode ProjectMgr
4545
{
4646
get
4747
{

‎vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/DataObject.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ internal sealed class DataCacheEntry : IDisposable
5050
#endregion
5151

5252
#region properties
53-
/*internal, but public for FSharp.Project.dll*/ public FORMATETC Format
53+
public FORMATETC Format
5454
{
5555
get
5656
{
5757
return this.format;
5858
}
5959
}
6060

61-
/*internal, but public for FSharp.Project.dll*/ public long Data
61+
public long Data
6262
{
6363
get
6464
{
@@ -67,7 +67,7 @@ internal sealed class DataCacheEntry : IDisposable
6767
}
6868

6969
[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
70-
/*internal, but public for FSharp.Project.dll*/ public DATADIR DataDir
70+
public DATADIR DataDir
7171
{
7272
get
7373
{
@@ -80,7 +80,7 @@ internal sealed class DataCacheEntry : IDisposable
8080
/// <summary>
8181
/// The IntPtr is data allocated that should be removed. It is allocated by the ProcessSelectionData method.
8282
/// </summary>
83-
/*internal, but public for FSharp.Project.dll*/ public DataCacheEntry(FORMATETC fmt, IntPtr data, DATADIR dir)
83+
public DataCacheEntry(FORMATETC fmt, IntPtr data, DATADIR dir)
8484
{
8585
this.format = fmt;
8686
this.data = (long)data;
@@ -138,22 +138,22 @@ private void Dispose(bool disposing)
138138
internal sealed class DataObject : IDataObject
139139
{
140140
#region fields
141-
/*internal, but public for FSharp.Project.dll*/ public const int DATA_S_SAMEFORMATETC = 0x00040130;
141+
public const int DATA_S_SAMEFORMATETC = 0x00040130;
142142

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

145145
EventSinkCollection map;
146146

147147
ArrayList entries;
148148
#endregion
149149

150-
/*internal, but public for FSharp.Project.dll*/ public DataObject()
150+
public DataObject()
151151
{
152152
this.map = new EventSinkCollection();
153153
this.entries = new ArrayList();
154154
}
155155

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

242242
#region static methods
243-
/*internal, but public for FSharp.Project.dll*/ public static int ForceCast(uint i)
243+
public static int ForceCast(uint i)
244244
{
245245
unchecked { return (int)i; }
246246
}
247247

248-
/*internal, but public for FSharp.Project.dll*/ public static uint ForceCast(int i)
248+
public static uint ForceCast(int i)
249249
{
250250
unchecked { return (uint)i; }
251251
}
@@ -257,12 +257,12 @@ void IDataObject.SetData(FORMATETC[] fmt, STGMEDIUM[] m, int fRelease)
257257
internal static class DragDropHelper
258258
{
259259
#pragma warning disable 414
260-
/*internal, but public for FSharp.Project.dll*/ internal static readonly ushort CF_VSREFPROJECTS = 0;
261-
/*internal, but public for FSharp.Project.dll*/ internal static readonly ushort CF_VSSTGPROJECTS = 0;
262-
/*internal, but public for FSharp.Project.dll*/ internal static readonly ushort CF_VSREFPROJECTITEMS = 0;
263-
/*internal, but public for FSharp.Project.dll*/ internal static readonly ushort CF_VSSTGPROJECTITEMS = 0;
264-
/*internal, but public for FSharp.Project.dll*/ internal static readonly ushort CF_PROJECTCLIPDESCRIPTOR = 0;
265-
/*internal, but public for FSharp.Project.dll*/ internal static readonly ushort CF_VSPROJECTCLIPDESCRIPTOR = 0;
260+
internal static readonly ushort CF_VSREFPROJECTS = 0;
261+
internal static readonly ushort CF_VSSTGPROJECTS = 0;
262+
internal static readonly ushort CF_VSREFPROJECTITEMS = 0;
263+
internal static readonly ushort CF_VSSTGPROJECTITEMS = 0;
264+
internal static readonly ushort CF_PROJECTCLIPDESCRIPTOR = 0;
265+
internal static readonly ushort CF_VSPROJECTCLIPDESCRIPTOR = 0;
266266
#pragma warning restore 414
267267

268268
static DragDropHelper()
@@ -414,7 +414,7 @@ public static string GetSourceProjectPath(Microsoft.VisualStudio.OLE.Interop.IDa
414414
/// </summary>
415415
/// <param name="dropHandle"></param>
416416
/// <returns></returns>
417-
/*internal, but public for FSharp.Project.dll*/ public static string GetData(IntPtr dropHandle)
417+
public static string GetData(IntPtr dropHandle)
418418
{
419419
IntPtr data = UnsafeNativeMethods.GlobalLock(dropHandle);
420420
try
@@ -437,7 +437,7 @@ public static string GetSourceProjectPath(Microsoft.VisualStudio.OLE.Interop.IDa
437437
return null;
438438
}
439439

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

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

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

494-
/*internal, but public for FSharp.Project.dll*/ public static void CopyStringToHGlobal(string s, IntPtr data, int bufferSize)
494+
public static void CopyStringToHGlobal(string s, IntPtr data, int bufferSize)
495495
{
496496
Int16 nullTerminator = 0;
497497
int dwSize = Marshal.SizeOf(nullTerminator);

0 commit comments

Comments
 (0)