Skip to content
This repository has been archived by the owner on Oct 4, 2021. It is now read-only.

[C#] Add language version 7.2 to supported languages UI #3911

Merged
merged 1 commit into from
Feb 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions main/src/addins/CSharpBinding/CSharpBinding.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@
<Compile Include="MonoDevelop.CSharp.Completion\CSharpCompletionData.cs" />
<Compile Include="MonoDevelop.CSharp.Completion\CompletionProvider\ProtocolMemberCompletionProvider.cs" />
<Compile Include="MonoDevelop.CSharp.Tooltips\QuickInfoProvider.cs" />
<Compile Include="MonoDevelop.CSharp.Project\CSharpLanguageVersionHelper.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Makefile.am" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
//
// CSharpLanguageVersionHelper.cs
//
// Author:
// Marius Ungureanu <maungu@microsoft.com>
//
// Copyright (c) 2018
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System;
using System.Collections.Generic;
using Microsoft.CodeAnalysis.CSharp;
using MonoDevelop.Core;

namespace MonoDevelop.CSharp.Project
{
class CSharpLanguageVersionHelper
{
public static IEnumerable<(string localized, LanguageVersion version)> GetKnownLanguageVersions ()
{
yield return (GettextCatalog.GetString ("Default"), LanguageVersion.Default);
yield return ("ISO-1", LanguageVersion.CSharp1);
yield return ("ISO-2", LanguageVersion.CSharp2);
yield return (GettextCatalog.GetString ("Version 3"), LanguageVersion.CSharp3);
yield return (GettextCatalog.GetString ("Version 4"), LanguageVersion.CSharp4);
yield return (GettextCatalog.GetString ("Version 5"), LanguageVersion.CSharp5);
yield return (GettextCatalog.GetString ("Version 6"), LanguageVersion.CSharp6);
yield return (GettextCatalog.GetString ("Version 7"), LanguageVersion.CSharp7);
yield return (GettextCatalog.GetString ("Version 7.1"), LanguageVersion.CSharp7_1);
yield return (GettextCatalog.GetString ("Version 7.2"), LanguageVersion.CSharp7_2);
yield return (GettextCatalog.GetString ("Latest"), LanguageVersion.Latest);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,9 @@ public CompilerOptionsPanelWidget (DotNetProject project)
noStdLibCheckButton.Active = compilerParameters.NoStdLib;

var langVerStore = new ListStore (typeof (string), typeof(LanguageVersion));
langVerStore.AppendValues (GettextCatalog.GetString ("Default"), LanguageVersion.Default);
langVerStore.AppendValues ("ISO-1", LanguageVersion.CSharp1);
langVerStore.AppendValues ("ISO-2", LanguageVersion.CSharp2);
langVerStore.AppendValues (GettextCatalog.GetString ("Version 3"), LanguageVersion.CSharp3);
langVerStore.AppendValues (GettextCatalog.GetString ("Version 4"), LanguageVersion.CSharp4);
langVerStore.AppendValues (GettextCatalog.GetString ("Version 5"), LanguageVersion.CSharp5);
langVerStore.AppendValues (GettextCatalog.GetString ("Version 6"), LanguageVersion.CSharp6);
langVerStore.AppendValues (GettextCatalog.GetString ("Version 7"), LanguageVersion.CSharp7);
langVerStore.AppendValues (GettextCatalog.GetString ("Version 7.1"), LanguageVersion.CSharp7_1);
langVerStore.AppendValues (GettextCatalog.GetString ("Latest"), LanguageVersion.Latest);
foreach (var (text, version) in CSharpLanguageVersionHelper.GetKnownLanguageVersions ()) {
langVerStore.AppendValues (text, version);
}
langVerCombo.Model = langVerStore;

TreeIter iter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@
</Reference>
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="System.ValueTuple">
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
</ItemGroup>
<ItemGroup>
<Compile Include="Features\ParameterHinting\ParameterHintingTests.cs" />
Expand Down Expand Up @@ -126,6 +130,7 @@
<Compile Include="MonoDevelop.CSharpBinding\CSharpAutoInsertBracketHandlerTests.cs" />
<Compile Include="MonoDevelop.CSharpBinding\ExpandSelectionHandlerTests.cs" />
<Compile Include="MonoDevelop.CSharpBinding.Parser\CSharpParsedDocumentTests.cs" />
<Compile Include="MonoDevelop.CSharpBinding\CSharpLanguageVersionHelperTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\addins\CSharpBinding\CSharpBinding.csproj">
Expand Down Expand Up @@ -195,6 +200,7 @@
</ItemGroup>
<ItemGroup>
<None Include="MonoDevelop.CSharpBinding\AutomaticBracketInsertionTests.cs" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="MonoDevelop.CSharpBinding.Parser\" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
//
// CSharpLanguageVersionTests.cs
//
// Author:
// Marius Ungureanu <maungu@microsoft.com>
//
// Copyright (c) 2018
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System;
using System.Linq;
using Microsoft.CodeAnalysis.CSharp;
using NUnit.Framework;

namespace MonoDevelop.CSharp.Project
{
[TestFixture]
public class CSharpLanguageVersionHelperTests
{
[Test]
public void AssertWeHaveAllLanguagesInUI ()
{
var known = CSharpLanguageVersionHelper.GetKnownLanguageVersions().ToDictionary(x => x.version, x => x.localized);
var roslyn = Enum.GetValues (typeof (LanguageVersion)).Cast<LanguageVersion> ().ToArray ();

var toAdd = roslyn.Where (x => !known.ContainsKey (x)).ToArray ();

Assert.AreEqual (0, toAdd.Length, "Roslyn added new C# language versions: '{0}', add to CSharpLanguageVersionHelper.GetKnownLanguageVersions",
string.Join (", ", toAdd));
}
}
}
4 changes: 4 additions & 0 deletions main/tests/MonoDevelop.CSharpBinding.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
</packages>