From 4b2245eeb9898e1f2fb20a1be51b727afebd9869 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Wed, 15 Feb 2017 11:21:11 -0800 Subject: [PATCH] [Fixes #924] Correct RightShiftAssign operator --- .../Legacy/CSharpLanguageCharacteristics.cs | 2 +- .../Parser/CSharpLanguageCharacteristics.cs | 2 +- .../CSharpLanguageCharacteristicsTest.cs | 20 ++++++++++++++++++ .../CSharpLanguageCharacteristicsTest.cs | 21 +++++++++++++++++++ 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpLanguageCharacteristicsTest.cs create mode 100644 test/Microsoft.AspNetCore.Razor.Test/Parser/CSharpLanguageCharacteristicsTest.cs diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Legacy/CSharpLanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Legacy/CSharpLanguageCharacteristics.cs index 8af54a2c35..b21f65668f 100644 --- a/src/Microsoft.AspNetCore.Razor.Evolution/Legacy/CSharpLanguageCharacteristics.cs +++ b/src/Microsoft.AspNetCore.Razor.Evolution/Legacy/CSharpLanguageCharacteristics.cs @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy { CSharpSymbolType.GreaterThan, ">" }, { CSharpSymbolType.GreaterThanEqual, ">=" }, { CSharpSymbolType.RightShift, ">>" }, - { CSharpSymbolType.RightShiftAssign, ">>>" }, + { CSharpSymbolType.RightShiftAssign, ">>=" }, { CSharpSymbolType.Hash, "#" }, { CSharpSymbolType.Transition, "@" }, }; diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs index 02933dd1d6..87bee2821b 100644 --- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs +++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Razor.Parser { CSharpSymbolType.GreaterThan, ">" }, { CSharpSymbolType.GreaterThanEqual, ">=" }, { CSharpSymbolType.RightShift, ">>" }, - { CSharpSymbolType.RightShiftAssign, ">>>" }, + { CSharpSymbolType.RightShiftAssign, ">>=" }, { CSharpSymbolType.Hash, "#" }, { CSharpSymbolType.Transition, "@" }, }; diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpLanguageCharacteristicsTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpLanguageCharacteristicsTest.cs new file mode 100644 index 0000000000..5550784179 --- /dev/null +++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpLanguageCharacteristicsTest.cs @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Xunit; + +namespace Microsoft.AspNetCore.Razor.Evolution.Legacy +{ + public class CSharpLanguageCharacteristicsTest + { + [Fact] + public void GetSample_RightShiftAssign_ReturnsCorrectSymbol() + { + // Arrange & Act + var symbol = CSharpLanguageCharacteristics.Instance.GetSample(CSharpSymbolType.RightShiftAssign); + + // Assert + Assert.Equal(">>=", symbol); + } + } +} diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharpLanguageCharacteristicsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharpLanguageCharacteristicsTest.cs new file mode 100644 index 0000000000..fe905f65c3 --- /dev/null +++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharpLanguageCharacteristicsTest.cs @@ -0,0 +1,21 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Razor.Tokenizer.Symbols; +using Xunit; + +namespace Microsoft.AspNetCore.Razor.Parser +{ + public class CSharpLanguageCharacteristicsTest + { + [Fact] + public void GetSymbolSample_RightShiftAssign_ReturnsCorrectSymbol() + { + // Arrange & Act + var symbol = CSharpLanguageCharacteristics.GetSymbolSample(CSharpSymbolType.RightShiftAssign); + + // Assert + Assert.Equal(">>=", symbol); + } + } +}