corrected spelling of Overrides-modifier; convert virtual to Overrida…

…ble and override to Overrides
icsharpcode · Jul 17, 2011 · 6e86570 · 6e86570
1 parent e5609f6
commit 6e86570
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/NRefactory/ICSharpCode.NRefactory.VB/Ast/Enums.cs b/NRefactory/ICSharpCode.NRefactory.VB/Ast/Enums.cs
@@ -25,7 +25,7 @@ public enum Modifiers
 		Const           = 0x0200,
 		Shared          = 0x0400,
 		Static          = 0x0800,
-		Override        = 0x1000,
+		Overrides        = 0x1000,
 		ReadOnly        = 0x2000,
 		Shadows         = 0x4000,
 		Partial         = 0x8000,

diff --git a/NRefactory/ICSharpCode.NRefactory.VB/Ast/VBModifierToken.cs b/NRefactory/ICSharpCode.NRefactory.VB/Ast/VBModifierToken.cs
@@ -50,7 +50,7 @@ protected internal override bool DoMatch(AstNode other, PatternMatching.Match ma
 			new KeyValuePair<Modifiers, int>(Modifiers.Const, "Const".Length),
 			new KeyValuePair<Modifiers, int>(Modifiers.Shared, "Shared".Length),
 			new KeyValuePair<Modifiers, int>(Modifiers.Static, "Static".Length),
-			new KeyValuePair<Modifiers, int>(Modifiers.Override, "Override".Length),
+			new KeyValuePair<Modifiers, int>(Modifiers.Overrides, "Overrides".Length),
 			new KeyValuePair<Modifiers, int>(Modifiers.ReadOnly, "ReadOnly".Length),
 			new KeyValuePair<Modifiers, int>(Modifiers.WriteOnly, "WriteOnly".Length),
 			new KeyValuePair<Modifiers, int>(Modifiers.Shadows, "Shadows".Length),
@@ -109,8 +109,8 @@ public static string GetModifierName(Modifiers modifier)
 					return "Shared";
 				case Modifiers.Static:
 					return "Static";
-				case Modifiers.Override:
-					return "Override";
+				case Modifiers.Overrides:
+					return "Overrides";
 				case Modifiers.ReadOnly:
 					return "ReadOnly";
 				case Modifiers.Shadows:

diff --git a/NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs b/NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs
@@ -2112,6 +2112,10 @@ Modifiers ConvertModifiers(CSharp.Modifiers modifier, CSharp.AstNode container)
 			if (readable && !writeable)
 				mod |= Modifiers.ReadOnly;
 
+			if ((modifier & CSharp.Modifiers.Override) == CSharp.Modifiers.Override)
+				mod |= Modifiers.Overrides;
+			if ((modifier & CSharp.Modifiers.Virtual) == CSharp.Modifiers.Virtual)
+				mod |= Modifiers.Overridable;
 
 			return mod;
 		}