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

[VladD2]

Log:
1. Fix typo in _isCompletioInProgress.
2. Sync with compiler (remove splice from string with no splice and rename _isCompletioInProgress to _isCompletionInProgress).


Author: VladD2
Date: Sun Feb 18 22:40:05 2007
New Revision: 7443

Modified:
   vs-plugin/trunk/Nemerle.Compiler.Utils/FormCodeDomGenerator.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/QuickTipInfo.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeMethodBuilder.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeTyper.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine.Completion.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Tests.n

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/FormCodeDomGenerator.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/FormCodeDomGenerator.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/FormCodeDomGenerator.n	Sun Feb 18 22:40:05 2007
@@ -101,7 +101,7 @@
       // TODO : do we need to bother about namespace Imports?
 
       assert(e.Namespaces[0].Types.Count == 1,
-             $"CodeCompileUnit for a form should contain only one form class! (e.)");
+             "CodeCompileUnit for a form should contain only one form class!");
 
       def nsDecls = project.CompileUnits[_mainFileIndex].Decls.MapFilterByType.[Decl.Namespace]();
 

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/QuickTipInfo.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/QuickTipInfo.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/QuickTipInfo.n	Sun Feb 18 22:40:05 2007
@@ -75,7 +75,7 @@
     public this(location : Location, obj : object)
     {
       SetLocation(location);
-      _text = $"$(obj.GetType()): $(obj.ToString())";
+      _text = $"Debug: $(obj.GetType()): '$obj'";
     }
 
     private SetLocation(location : Location) : void

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	Sun Feb 18 22:40:05 2007
@@ -153,7 +153,7 @@
       {
         Trace.WriteLine($"$msg method body of:");
         Trace.WriteLine($"\t$method");
-        Trace.WriteLine($"\tfailed.");
+        Trace.WriteLine( "\tfailed.");
         Trace.WriteLine($"\tError: $(e.Message)");
       }
 

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeTyper.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeTyper.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CompilerConcreteDefinitions/IntelliSenseModeTyper.n	Sun Feb 18 22:40:05 2007
@@ -27,6 +27,11 @@
     }
     
     protected override RunDelayedTypings () : void { /* DO NOTHING */ }
-    protected override RunSecondPass (_ : MethodBuilder) : void { /* DO NOTHING */ }
+    protected override RunSecondPass (meth : MethodBuilder) : void
+    {
+      def t2 = Typer2 (CurrentTypeBuilder, meth);
+      t2.Run ();
+      /* DO NOTHING */
+    }
   }
 }

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine.Completion.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine.Completion.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine.Completion.n	Sun Feb 18 22:40:05 2007
@@ -254,19 +254,19 @@
           def tryInterpretAsQualifiedName() : void
           {
             // Try interpret as qualified name...
-            def overloads = typer.TypeNameFull(expression, typer.Solver.FreshTyVar (), true);
+            def overloads = typer.TypeNameFull(expression, typer.Solver.FreshTyVar(), true);
             AddOverloads(overloads);
           }
 
           def tryInterpretAsExtentionMethods() : void
           {
             // Try get extention methods...
-            def extMethods = this.LibrariesManager.GetExtensionMethods (name.Id, name.GetEnv (env), true);
+            def extMethods = this.LibrariesManager.GetExtensionMethods (name.Id, name.GetEnv(env), true);
             def ty = tobj.MType;
 
             when (ty != null)
               foreach (method when this.IsExtensionMethod(method, ty) in extMethods)
-                foreach (over in typer.ConstructMethodOverload (method, null, true))
+                foreach (over in typer.ConstructMethodOverload(method, null, true))
                 {
                   over.ExtensionMethodObject = tobj;
                   elems.Add(Elem.Overload (over));
@@ -416,7 +416,7 @@
     )
       : CompletionResult
     {
-      _isCompletioInProgress = true;
+      _isCompletionInProgress = true;
 
       try
       {
@@ -444,7 +444,7 @@
       }
       finally
       {
-        _isCompletioInProgress = false;
+        _isCompletionInProgress = false;
       }
     }
 
@@ -457,7 +457,7 @@
     )
       : CompletionResult
     {
-      _isCompletioInProgress = true;
+      _isCompletionInProgress = true;
 
       try
       {
@@ -485,7 +485,7 @@
       }
       finally
       {
-        _isCompletioInProgress = false;
+        _isCompletionInProgress = false;
       }
     }
 

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Tests.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Tests.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Tests.n	Sun Feb 18 22:40:05 2007
@@ -240,7 +240,7 @@
     public SimpleSourceTextManager_GetLine() : void
     {
       def file = FilePath1;
-      def (line, _) = ReadLocation(file, $"Start block 1");
+      def (line, _) = ReadLocation(file, "Start block 1");
       def txtMan = GetSource(file);
 
       def result = txtMan.GetLine(line);
@@ -253,7 +253,7 @@
     public SimpleSourceTextManager_GetLine_EOF() : void
     {
       def file = FilePath1;
-      def (line, _) = ReadLocation(file, $"EOF");
+      def (line, _) = ReadLocation(file, "EOF");
       def txtMan = GetSource(file);
 
       def result = txtMan.GetLine(line);
@@ -266,7 +266,7 @@
     public SimpleSourceTextManager_GetLineAndColumn() : void
     {
       def file = FilePath1;
-      def (line, col) = ReadLocation(file, $"Start block 1");
+      def (line, col) = ReadLocation(file, "Start block 1");
       def txtMan = GetSource(file);
 
       def pos = txtMan.GetPositionOfLineIndex(line, col);