[svn] r6557: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2: CodeModel/Project.MakeCompletionL...

[VladD2]

Log:
Sync with compiler.

Author: VladD2
Date: Sat Aug 19 17:12:50 2006
New Revision: 6557

Modified:
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.MakeCompletionList.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/Engine-main.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Content/Class1.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Tests.n

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.MakeCompletionList.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.MakeCompletionList.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.MakeCompletionList.n	Sat Aug 19 17:12:50 2006
@@ -114,34 +114,5 @@
     {
       name.StartsWith("value__")
     }
-
-    public static MakeName(overloadPossibility : OverloadPossibility) : string
-    {
-      // Base copmletion logic
-      def MakeNameFromMember(member : IMember)
-      {
-        def name = match (member.MemberType)
-        {
-          | MemberTypes.Field => member.DeclaringType.Name.ToString()
-          | _ => member.Name.ToString();
-        }
-
-        match (member)
-        {
-          | typeInfo is TypeInfo => typeInfo.GetMemType().ToDisplayString()
-          | _ => 
-            if (name == ".ctor" || name == ".cctor")
-              member.DeclaringType.Name.ToString()
-            else
-              name
-        }
-      }
-
-      match (overloadPossibility)
-      {
-        | local is LocalValueCompletionPossibility => local.Value.Name
-        | _ => MakeNameFromMember(overloadPossibility.Member)
-      }
-    }
   } // end class Project
 } // end namespace

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	Sat Aug 19 17:12:50 2006
@@ -136,11 +136,11 @@
           content + " " else content;
 
         def lexer = LexerCompletion (this, content, completionPosition);
+        try
+        {
         observedMethod.GetHeader().body =
           FunBody.Parsed (MainParser.ParseExpr (env, lexer, true));
     
-        try
-        {
           observedMethod.RunBodyTyper ();
         }
         catch

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Content/Class1.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Content/Class1.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Tests/Content/Class1.n	Sat Aug 19 17:12:50 2006
@@ -20,7 +20,7 @@
 
         public Method2() : void
         {
-          	def x : T/*Complete type escalation:-0*/;
+          	def x : System.Co/*Complete type escalation:-0*/;
         }
       }
     }

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	Sat Aug 19 17:12:50 2006
@@ -20,7 +20,7 @@
       def (line, col) = ReadLocation(file, "Complete type escalation");
       def result = _project.CompleteWord(file, line, col, GetTextFromFile(file, _, _, _, _));
       Assert.IsNotNull(result, "result is null");
-      Assert.AreEqual(2, result.Length, "Expected 1 elements.");
+      Assert.AreEqual(18, result.Length, "Expected 1 elements.");
     }
 
     [Test]