[svn] r6780: vs-plugin/trunk: . Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/ExprFinder.n Nemerle....

[VladD2]

Log:
Sync with compiler.

Author: VladD2
Date: Tue Oct 24 14:06:24 2006
New Revision: 6780

Modified:
   vs-plugin/trunk/   (props changed)
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/ExprFinder.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompiledUnitAstBrowser.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Relocation.n
   vs-plugin/trunk/Nemerle.VsIntegration/Nemerle.VsIntegration.csproj
   vs-plugin/trunk/Nemerle.VsIntegration/Project/ProjectInfo.cs

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/ExprFinder.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/ExprFinder.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/ExprFinder.n	Tue Oct 24 14:06:24 2006
@@ -382,8 +382,7 @@
       Trace.WriteLine("");
 #endif
 
-      ignore(obj);
-      ignore(loc);
+      ignore(obj); ignore(loc); ignore(level);
     }
 
     #endregion

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompiledUnitAstBrowser.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompiledUnitAstBrowser.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompiledUnitAstBrowser.n	Tue Oct 24 14:06:24 2006
@@ -96,7 +96,7 @@
                 {
                   mutable infos2 = [];
                   
-                  foreach (elem in value :> System.Collections.IEnumerable)
+                  foreach (elem when elem != null in value :> System.Collections.IEnumerable)
                   {
                     def res1 = scan("elem:", elem);
                     unless (res1 is PropInfo.None)

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Relocation.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Relocation.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Relocation.n	Tue Oct 24 14:06:24 2006
@@ -23,7 +23,8 @@
           x.NameLocations = x.NameLocations.Map(Completion.Relocate(_, fileIndex, line, ch, lineOffset, chOffset));
           x.BodyLocation = Completion.Relocate(x.BodyLocation, fileIndex, line, ch, lineOffset, chOffset);
 
-        | Type(builder) => builder.Relocate(loc.FileIndex, line, ch, lineOffset, chOffset);
+        | Type(builder) =>
+          builder.Relocate(loc.FileIndex, line, ch, lineOffset, chOffset);
         | None => ()
       }
 

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 Oct 24 14:06:24 2006
@@ -235,7 +235,9 @@
     <ZipItem Include="Templates\ProjectItems\Text\Text.ico" />
     <ZipItem Include="Templates\ProjectItems\Form\Form.ico" />
     <ZipItem Include="Templates\ProjectItems\Form\windowsform.vstemplate" />
-    <ZipItem Include="Templates\ProjectItems\ResX\Resource.resX" />
+    <ZipItem Include="Templates\ProjectItems\ResX\Resource.resX">
+      <SubType>Designer</SubType>
+    </ZipItem>
     <ZipItem Include="Templates\ProjectItems\ResX\Resource_Resx.ico" />
     <ZipItem Include="Templates\ProjectItems\ResX\Resource.vstemplate" />
     <ZipProject Include="Templates\Projects\ClassLibrary\Class1.n" />

Modified: vs-plugin/trunk/Nemerle.VsIntegration/Project/ProjectInfo.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/Project/ProjectInfo.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/Project/ProjectInfo.cs	Tue Oct 24 14:06:24 2006
@@ -295,7 +295,7 @@
 				// Just debug staff.
 				// Update file content, because it is changed, but engine still doesn't know it.
 				//
-				string code = Utils.GetFileCode(_site, filePath);
+				string code = Utils.GetFileCode(ProjectNode.Site, filePath);
 
 				Engine.Sources.AddOrUpdate(filePath, code);