From 6347c224048164c19bb89234561445f882eba24f Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Thu, 1 Nov 2012 10:10:03 +0100 Subject: [PATCH] fix #366 --- NRefactory/ICSharpCode.NRefactory.VB/Ast/Enums.cs | 2 +- NRefactory/ICSharpCode.NRefactory.VB/Ast/VBModifierToken.cs | 6 +++--- .../Visitors/CSharpToVBConverterVisitor.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NRefactory/ICSharpCode.NRefactory.VB/Ast/Enums.cs b/NRefactory/ICSharpCode.NRefactory.VB/Ast/Enums.cs index a3fa8d618..02df4d636 100644 --- a/NRefactory/ICSharpCode.NRefactory.VB/Ast/Enums.cs +++ b/NRefactory/ICSharpCode.NRefactory.VB/Ast/Enums.cs @@ -25,7 +25,7 @@ namespace ICSharpCode.NRefactory.VB.Ast 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 index d6a23ebcd..b38fc3e51 100644 --- a/NRefactory/ICSharpCode.NRefactory.VB/Ast/VBModifierToken.cs +++ b/NRefactory/ICSharpCode.NRefactory.VB/Ast/VBModifierToken.cs @@ -50,7 +50,7 @@ namespace ICSharpCode.NRefactory.VB.Ast new KeyValuePair(Modifiers.Const, "Const".Length), new KeyValuePair(Modifiers.Shared, "Shared".Length), new KeyValuePair(Modifiers.Static, "Static".Length), - new KeyValuePair(Modifiers.Override, "Override".Length), + new KeyValuePair(Modifiers.Overrides, "Overrides".Length), new KeyValuePair(Modifiers.ReadOnly, "ReadOnly".Length), new KeyValuePair(Modifiers.WriteOnly, "WriteOnly".Length), new KeyValuePair(Modifiers.Shadows, "Shadows".Length), @@ -109,8 +109,8 @@ namespace ICSharpCode.NRefactory.VB.Ast 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 index 48632e0fd..88caf76b5 100644 --- a/NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs +++ b/NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs @@ -2137,7 +2137,7 @@ namespace ICSharpCode.NRefactory.VB.Visitors mod |= Modifiers.ReadOnly; if ((modifier & CSharp.Modifiers.Override) == CSharp.Modifiers.Override) - mod |= Modifiers.Override; + mod |= Modifiers.Overrides; if ((modifier & CSharp.Modifiers.Virtual) == CSharp.Modifiers.Virtual) mod |= Modifiers.Overridable; if ((modifier & CSharp.Modifiers.Async) == CSharp.Modifiers.Async)