[svn] r7666: vs-plugin/trunk: Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions Nemer...

[VladD2]

Log:
Sync with compiler.

Author: VladD2
Date: Fri May 11 04:26:49 2007
New Revision: 7666

Modified:
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/   (props changed)
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeMethodBuilder.n
   vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleSource.cs

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeMethodBuilder.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeMethodBuilder.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeMethodBuilder.n	Fri May 11 04:26:49 2007
@@ -97,7 +97,15 @@
         {
           //def indent = _indent; _indent += "  ";
           Manager.SetCompiletMessages (BodyMessages);
-          _bodyParsed = MainParser.ParseFunctionBody (Env, Ast.header, BodyTokens);
+          mutable bodyParsed = MainParser.ParseFunctionBody (Env, Ast.header, BodyTokens);
+          
+          // Do all transform of method body.
+          when (BeforeBodyTyping != null)
+            foreach (handler in BeforeBodyTyping)
+              bodyParsed = handler(this, bodyParsed);
+
+          _bodyParsed = bodyParsed;
+
           fun_header.body = FunBody.Parsed (_bodyParsed);
           //_indent = indent;
         }

Modified: vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleSource.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleSource.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleSource.cs	Fri May 11 04:26:49 2007
@@ -125,7 +125,7 @@
 					changes.iStartLine   + 1);
 			}
 
-			if (_scanner.GetLexer().ClearHoverHighlights())
+			if (_scanner != null && _scanner.GetLexer().ClearHoverHighlights())
 			{
 				int lineCount;
 				GetTextLines().GetLineCount(out lineCount);