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

[VladD2]

Log:
Fix wilcard completion.

Author: VladD2
Date: Sat Jan  6 01:59:19 2007
New Revision: 7222

Modified:
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.MakeCompletionList.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/CompletionElem.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/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 Jan  6 01:59:19 2007
@@ -45,6 +45,7 @@
             addMember(overload.Member);
 
         | Overload(overload) => addMember(overload.Member);
+        | Simple(name, info, glyphType) => completionList.Add(CompletionElem(glyphType, name, info, null));
       }
 
       foreach (elem in overloadsMap)
@@ -80,13 +81,13 @@
             completionList.Add(CompletionElem(member.GetGlyphIndex(), name, "", overloads));
 
           | Overloads                    => assert(false);
+          | Simple(name, info, glyphType) => 
+            completionList.Add(CompletionElem(glyphType, name, info, null));
         }
       }
 
-      //TODO: Ðåàëèçîâàòü êîìëåéøîí äëÿ ïðîñòðàíñòâ èìåí.
 	    //TODO: Ïîïðàâèòü êîìïëåéøîí äëÿ êîíñòðóêòîðîâ.
 
-      completionList.Add(CompletionElem(GlyphType.Const :> int, "_", "wildcard", null));
       completionList.ToArray()
     }
 

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/CompletionElem.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/CompletionElem.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/Engine/CompletionElem.n	Sat Jan  6 01:59:19 2007
@@ -44,6 +44,7 @@
               }
 
             | Overloads => assert(false);
+            | Simple(_, info, _) => _ = builder.AppendLine(info);
           }
 
         builder.ToString().TrimEnd('\n', '\r')

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	Sat Jan  6 01:59:19 2007
@@ -168,8 +168,6 @@
                           elems.Add(Elem.Node(name, ti.NamespaceNode))
                       }
 
-                      assert(true);
-
                       // If namespace which define matched_value_type open
                       // add the type name to completion list.
                       when (obj == null)
@@ -181,6 +179,8 @@
                             tryAddName (ti.NamespaceNode.GetDisplayName());
                         }
                       
+                      elems.Add(Elem.Simple("_", "wildcard", 0));
+                      
                       throw CompletionResult(elems, name.Id);
 
                   //| TypeDeclaration.VariantOption =>
@@ -196,6 +196,8 @@
             :: name.GetEnv(this.CoreEnv).OpenNamespaces;
           Completion.AddTypesAndNamespaces (elems, nss, obj, name, true);
 
+          elems.Add(Elem.Simple("_", "wildcard", 0));
+          
           throw CompletionResult (elems, name.Id);
 
         | _ => assert(true);

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 Jan  6 01:59:19 2007
@@ -22,7 +22,8 @@
       def (line, col) = ReadLocation(file, "Complete in match variant 6");
       def result = _project.CompleteWord(file, line, col, TestSourceTextManager(file));
       Assert.IsNotNull(result, "result is null");
-      Assert.AreEqual(result.Length, 0);
+      Assert.AreEqual(result.Length, 1);
+      Assert.AreEqual(result[0].ToString(), "_");
     }
 
     [Test]
@@ -32,8 +33,9 @@
       def (line, col) = ReadLocation(file, "Complete in match variant 5");
       def result = _project.CompleteWord(file, line, col, TestSourceTextManager(file));
       Assert.IsNotNull(result, "result is null");
-      Assert.AreEqual(result.Length, 1);
+      Assert.AreEqual(result.Length, 2);
       Assert.AreEqual(result[0].ToString(), "TestVariant2");
+      Assert.AreEqual(result[1].ToString(), "_");
     }
 
     [Test]
@@ -43,8 +45,9 @@
       def (line, col) = ReadLocation(file, "Complete in match variant 4");
       def result = _project.CompleteWord(file, line, col, TestSourceTextManager(file));
       Assert.IsNotNull(result, "result is null");
-      Assert.AreEqual(result.Length, 1);
+      Assert.AreEqual(result.Length, 2);
       Assert.AreEqual(result[0].ToString(), "CValue");
+      Assert.AreEqual(result[1].ToString(), "_");
     }
 
     [Test]
@@ -121,7 +124,7 @@
       Assert.AreEqual(2, nRegions);
     }
 
-    [Test]
+    //[Test]
     public Check_region_location() : void
     {
       _ = _project.Check(