[svn] r6655: vs-plugin/trunk: Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine-main.n Nemerle.VsIn...

[VladD2]

Log:
Fix delayed parsing of method body. It's earlier use wrong GlabalEnv.

Author: VladD2
Date: Fri Sep 15 02:32:20 2006
New Revision: 6655

Modified:
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine-main.n
   vs-plugin/trunk/Nemerle.VsIntegration/NemerleScanner.cs

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine-main.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine-main.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine-main.n	Fri Sep 15 02:32:20 2006
@@ -180,8 +180,8 @@
     {
       if (method.ParsedFunction != null)
       {
-        def env    = method.DeclaringType.GlobalEnv;
         def header = method.GetHeader();
+        def env    = method.Env;
         def body   = FunBody.Parsed(MainParser.ParseExpr(env, lexer, method.ParsedFunction.header));
 
         header.body = body;

Modified: vs-plugin/trunk/Nemerle.VsIntegration/NemerleScanner.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/NemerleScanner.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/NemerleScanner.cs	Fri Sep 15 02:32:20 2006
@@ -100,7 +100,7 @@
 
 				case SyntaxType.Comment:
 					tokenInfo.Color = TokenColor.Comment;
-					tokenInfo.Type  = state == 0? TokenType.LineComment : TokenType.Comment;
+					tokenInfo.Type  = state == 0 ? TokenType.LineComment : TokenType.Comment;
 					break;
 
 				case SyntaxType.CharLiteral: