[svn] r7119: vs-plugin/trunk/Nemerle.VsIntegration: LanguageService/NemerleViewFilter.cs Nemerle.VsIntegra...

[IT]

Log:
Sync with SDK.

Author: IT
Date: Tue Dec 19 06:13:01 2006
New Revision: 7119

Added:
   vs-plugin/trunk/Nemerle.VsIntegration/Project/ModuleID.cs
Modified:
   vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleViewFilter.cs
   vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VsIntegration.csproj
   vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleLibraryManager.cs
   vs-plugin/trunk/Nemerle.VsIntegration/Project/TextLineEventListener.cs

Modified: vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleViewFilter.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleViewFilter.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleViewFilter.cs	Tue Dec 19 06:13:01 2006
@@ -1,10 +1,11 @@
 using System;
+using System.Diagnostics;
 
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.Package;
 using Microsoft.VisualStudio.TextManager.Interop;
-using System.Diagnostics;
+
 using Nemerle.Completion2;
 
 namespace Nemerle.VisualStudio.LanguageService

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VsIntegration.csproj
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VsIntegration.csproj	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VsIntegration.csproj	Tue Dec 19 06:13:01 2006
@@ -144,6 +144,7 @@
     <Compile Include="LanguageService\ProjectManager.cs" />
     <Compile Include="LanguageService\SourceTextManager.cs" />
     <Compile Include="NemerlePackage.cs" />
+    <Compile Include="Project\ModuleID.cs" />
     <Compile Include="Project\NemerleAssemblyReference.cs" />
     <Compile Include="Project\NemerleAssemblyReferenceNode.cs" />
     <Compile Include="Project\NemerleDependentFileNode.cs" />

Added: vs-plugin/trunk/Nemerle.VsIntegration/Project/ModuleID.cs
==============================================================================
--- (empty file)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Project/ModuleID.cs	Tue Dec 19 06:13:01 2006
@@ -0,0 +1,60 @@
+using System;
+using System.Diagnostics;
+
+using Microsoft.VisualStudio.Shell.Interop;
+
+namespace Nemerle.VisualStudio.Project
+{
+	/// <summary>
+	/// Class used to identify a module. The module is identify using the
+	/// hierarchy that contains it and its item id inside the hierarchy.
+	/// </summary>
+	[DebuggerStepThrough]
+	sealed class ModuleID
+	{
+		public ModuleID(IVsHierarchy owner, uint id)
+		{
+			_hierarchy = owner;
+			_itemID    = id;
+		}
+
+		private IVsHierarchy _hierarchy;
+		public  IVsHierarchy  Hierarchy
+		{
+			get { return _hierarchy; }
+		}
+
+		private uint _itemID;
+		public  uint  ItemID
+		{
+			[DebuggerStepThrough]
+			get { return _itemID; }
+		}
+
+		public override int GetHashCode()
+		{
+			int hash = 0;
+
+			if (null != _hierarchy)
+				hash = _hierarchy.GetHashCode();
+
+			hash = hash ^ (int)_itemID;
+
+			return hash;
+		}
+
+		public override bool Equals(object obj)
+		{
+			ModuleID other = obj as ModuleID;
+
+			if (null == obj)
+				return false;
+
+			if (!_hierarchy.Equals(other._hierarchy))
+				return false;
+
+			return _itemID == other._itemID;
+		}
+	}
+
+}

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleLibraryManager.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleLibraryManager.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Project/NemerleLibraryManager.cs	Tue Dec 19 06:13:01 2006
@@ -53,58 +53,6 @@
 			}
 		}
 
-		/// <summary>
-		/// Class used to identify a module. The module is identify using the
-		/// hierarchy that contains it and its item id inside the hierarchy.
-		/// </summary>
-		[DebuggerStepThrough]
-		internal sealed class ModuleID
-		{
-			public ModuleID(IVsHierarchy owner, uint id)
-			{
-				_hierarchy = owner;
-				_itemID    = id;
-			}
-
-			private IVsHierarchy _hierarchy;
-			public  IVsHierarchy  Hierarchy
-			{
-				get { return _hierarchy; }
-			}
-
-			private uint _itemID;
-			public  uint  ItemID
-			{
-				[DebuggerStepThrough]
-				get { return _itemID; }
-			}
-
-			public override int GetHashCode()
-			{
-				int hash = 0;
-
-				if (null != _hierarchy)
-					hash = _hierarchy.GetHashCode();
-
-				hash = hash ^ (int)_itemID;
-
-				return hash;
-			}
-
-			public override bool Equals(object obj)
-			{
-				ModuleID other = obj as ModuleID;
-
-				if (null == obj)
-					return false;
-
-				if (!_hierarchy.Equals(other._hierarchy))
-					return false;
-
-				return _itemID == other._itemID;
-			}
-		}
-
 		IServiceProvider   _provider;
 		uint               _objectManagerCookie;
 		uint               _runningDocTableCookie;

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Project/TextLineEventListener.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Project/TextLineEventListener.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Project/TextLineEventListener.cs	Tue Dec 19 06:13:01 2006
@@ -13,13 +13,13 @@
 		//private const int defaultDelay = 2000;
 
 		private string                         _fileName;
-		private NemerleLibraryManager.ModuleID _fileId;
+		private ModuleID         _fileId;
 		private IVsTextLines                   _buffer;
 		private bool                           _isDirty;
 		private IConnectionPoint               _connectionPoint;
 		private uint                           _connectionCookie;
 
-		public TextLineEventListener(IVsTextLines buffer, string fileName, NemerleLibraryManager.ModuleID id)
+		public TextLineEventListener(IVsTextLines buffer, string fileName, ModuleID id)
 		{
 			_buffer   = buffer;
 			_fileId   = id;
@@ -38,7 +38,7 @@
 
 		#region Properties
 
-		public NemerleLibraryManager.ModuleID FileID
+		public ModuleID FileID
 		{
 			get { return _fileId; }
 		}