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

[kliss]

Log:
- Add "Go to inheritor" into context menu
- Remove warnings

Author: kliss
Date: Sat Apr 21 19:50:56 2007
New Revision: 7605

Modified:
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/CodeIndentationStage.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/CodeLineBreakingStage.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/Formatter.n
   vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Refactoring.n
   vs-plugin/trunk/Nemerle.VsIntegration/CtcComponents/PkgCmd.ctc
   vs-plugin/trunk/Nemerle.VsIntegration/CtcComponents/PkgCmdID.h
   vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleViewFilter.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	Sat Apr 21 19:50:56 2007
@@ -7,7 +7,7 @@
 {
   public class CodeIndentationStage : IFormattingStage
   {
-    public this (engine : Engine, fileIndex : int)
+    public this (_engine : Engine, _fileIndex : int)
     {
     
     }
@@ -16,7 +16,7 @@
     {
       SCG.List.[FormatterResult]();
     }
-    public FormatRegion(startLine : int, startCol : int, endLine : int, endCol : int) : SCG.List.[FormatterResult]
+    public FormatRegion(_startLine : int, _startCol : int, _endLine : int, _endCol : int) : SCG.List.[FormatterResult]
     {
       FormatDocument();
     }

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/CodeLineBreakingStage.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/CodeLineBreakingStage.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/CodeLineBreakingStage.n	Sat Apr 21 19:50:56 2007
@@ -171,7 +171,6 @@
     {
       unless(mb.IsGenerated)
       {
-        def x = BuiltinMethodKind.CallWithCast;
         SetExpectedLine(mb.Header.Location.EndLine + 1);
         def beginBrace = _tokenFinder.FindNextIf(mb.Header.Location.EndLine, mb.Header.Location.EndColumn, IsBeginBrace);
         FormatBrace(beginBrace);
@@ -247,7 +246,6 @@
       
       def matchFinder = MatchingBrackerFinder().GetSearchFunc(typeof(Token.EndBrace));
       def endBrace = _tokenFinder.FindNextIf(beginBrace.Location.Line, beginBrace.Location.EndColumn + 1, matchFinder);
-      def str = endBrace.GetType().Name;    
       FormatBrace(endBrace);
 
       SetExpectedLine(endBrace.Location.EndLine + 1);
@@ -262,7 +260,7 @@
       _results = SCG.List.[FormatterResult]();
     }
     
-    public FormatRegion(startLine : int, startCol : int, endLine : int, endCol : int) : SCG.List.[FormatterResult]
+    public FormatRegion(_startLine : int, _startCol : int, _endLine : int, _endCol : int) : SCG.List.[FormatterResult]
     {
       FormatDocument();
     }

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/Formatter.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/Formatter.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeFormatting/Formatter.n	Sat Apr 21 19:50:56 2007
@@ -27,7 +27,7 @@
       private set { _engine = value }
     }
     
-    private this(engine : Engine, fileIndex : int)
+    public this(engine : Engine, fileIndex : int)
     {
       Engine = engine;
       _fileIndex = fileIndex;

Modified: vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Refactoring.n
==============================================================================
--- vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Refactoring.n	(original)
+++ vs-plugin/trunk/Nemerle.Compiler.Utils/Nemerle.Completion2/CodeModel/Project.Refactoring.n	Sat Apr 21 19:50:56 2007
@@ -444,7 +444,7 @@
               }
               false
             }
-        | ti is TypeInfo =>
+        | ti : TypeInfo =>
             if(ti.BaseType : object == ourBase)
               true
             else
@@ -453,7 +453,6 @@
                 return true;
               false
             }
-        | _ => false
         }
         checkParents(possibleInheritor);
       }

Modified: vs-plugin/trunk/Nemerle.VsIntegration/CtcComponents/PkgCmd.ctc
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/CtcComponents/PkgCmd.ctc	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/CtcComponents/PkgCmd.ctc	Sat Apr 21 19:50:56 2007
@@ -117,6 +117,7 @@
     guidNemerleProjectCmdSet:cmdIdShrinkSelection, guidNemerleProjectCmdSet:SelectionGroup,  0x100,   guidOfficeIcon:msotcidNoIcon, BUTTON,                ,                      "&Shrink";
 
     guidNemerleProjectCmdSet:cmdIdFindInheritors,  guidNemerleProjectCmdSet:NavigationGroup,  0x100,   guidOfficeIcon:msotcidNoIcon, BUTTON,                ,                      "Find &inheritors";
+    guidNemerleProjectCmdSet:cmdIdFindInheritorsCtxt,  guidSHLMainMenu:IDG_VS_CODEWIN_NAVIGATETOLOCATION,  0x100,   guidOfficeIcon:msotcidNoIcon, BUTTON,                ,         "Go to Inheritor";
 
 
 

Modified: vs-plugin/trunk/Nemerle.VsIntegration/CtcComponents/PkgCmdID.h
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/CtcComponents/PkgCmdID.h	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/CtcComponents/PkgCmdID.h	Sat Apr 21 19:50:56 2007
@@ -56,6 +56,9 @@
 #define cmdIdAddHighlighting          0x3108
 #define cmdIdRemoveLastHighlighting   0x3109
 
+#define cmdIdFindInheritorsCtxt  0x3110
+
+
 /////////////////////////////////////////////////////////////////////
 // Bitmaps
 //

Modified: vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleViewFilter.cs
==============================================================================
--- vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleViewFilter.cs	(original)
+++ vs-plugin/trunk/Nemerle.VsIntegration/LanguageService/NemerleViewFilter.cs	Sat Apr 21 19:50:56 2007
@@ -73,6 +73,7 @@
 					ShrinkSelection();
 					break;
                 case 0x3103: //cmdIdFindInheritors  
+                case 0x3110: //cmdIdFindInheritorsCtxt
                     FindInheritors();
 			        break;