[svn] r7738: vs-plugin/trunk: Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/CodeIndentationSta...

[kliss]

Log:
Sync with compiler

Author: kliss
Date: Fri Jul  6 12:45:38 2007
New Revision: 7738

Modified:
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/CodeIndentationStage.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/NonEatingLexer.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Checker.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/ScanLexer.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Content/Class1.n
   vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleLanguageService.cs

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/CodeIndentationStage.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/CodeIndentationStage.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/CodeIndentationStage.n	Fri Jul  6 12:45:38 2007
@@ -321,7 +321,7 @@
           }
           
 
-      | Match(_, cases) => // Match { expr : PExpr; cases : list [MatchCase]; }
+      | Match(_, cases, _) => // Match { expr : PExpr; cases : list [MatchCase]; }
           def beginBrace = GetFirstBeginBraceAfterLocation(pexpr.Location.Line, pexpr.Location.Column);
           IndentLocation(pexpr.Location);
           IndentLocation(beginBrace.Location);
@@ -347,7 +347,7 @@
             
             match(func.body)
             {
-            | PExpr.Match(_, cases) => FormatMatchCases(cases);
+            | PExpr.Match(_, cases, _) => FormatMatchCases(cases);
             | expr => 
                 using(GetIndentPusher())
                 {
@@ -519,7 +519,7 @@
         
         match(mb.BodyParsed)
         {
-        | PExpr.Match(_, cases) => FormatMatchCases(cases);
+        | PExpr.Match(_, cases, _) => FormatMatchCases(cases);
         | expr => 
             using(GetIndentPusher())
             {

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/NonEatingLexer.n
==============================================================================

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Checker.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Checker.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Checker.n	Fri Jul  6 12:45:38 2007
@@ -282,7 +282,7 @@
               AddRegion(loc, false);
             });
 
-          | PExpr.Match(_, cases) => ProcessMatch(cases);
+          | PExpr.Match(_, cases, _) => ProcessMatch(cases);
           | _ => ()
           }
         });

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/ScanLexer.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/ScanLexer.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/ScanLexer.n	Fri Jul  6 12:45:38 2007
@@ -77,6 +77,7 @@
     mutable _quotationCount       : int;
     mutable _identifiers          : list[string] = [];
 
+    
     _tokenInfo : ScanTokenInfo = ScanTokenInfo();
     mutable _pendingToken : ScanTokenInfo = null;
 

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Content/Class1.n
==============================================================================

Modified: vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleLanguageService.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleLanguageService.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleLanguageService.cs	Fri Jul  6 12:45:38 2007
@@ -1004,12 +1004,12 @@
 
 				// Setup default values.
 				//
-                _preferences.EnableFormatSelection = true;
 				_preferences.ShowNavigationBar     = true;
 
 				// Load from the registry.
 				//
 				_preferences.Init();
+                _preferences.EnableFormatSelection = true;
 
 #if DEBUG
 				//VladD2: Switch on synchronous mode for debugging purpose!