Updated Roslyn libraries to 1.0.0-rc1

KathleenDollard · Apr 12, 2015 · efcf37c · efcf37c
1 parent 7c11e29
commit efcf37c
Show file tree

Hide file tree

Showing 35 changed files with 252 additions and 188 deletions.
diff --git a/RoslynDom/RoslynDom.csproj b/RoslynDom/RoslynDom.csproj
@@ -36,39 +36,56 @@
   <ItemGroup>
     <Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.CSharp">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.Desktop">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.Workspaces">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-beta1-20141031-01\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.1.32.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="System.Collections.Immutable, Version=1.1.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <Private>True</Private>
-      <HintPath>..\packages\System.Collections.Immutable.1.1.32-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Composition.AttributedModel">
+      <HintPath>..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Convention">
+      <HintPath>..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Hosting">
+      <HintPath>..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.Runtime">
+      <HintPath>..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Composition.TypedParts">
+      <HintPath>..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
-    <Reference Include="System.Reflection.Metadata">
-      <HintPath>..\packages\System.Reflection.Metadata.1.0.17-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    <Reference Include="System.Reflection.Metadata, Version=1.0.18.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\System.Reflection.Metadata.1.0.18-beta\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -170,7 +187,10 @@
       <Name>RoslynDomUtilities</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0-rc1\tools\analyzers\C#\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0-rc1\tools\analyzers\Microsoft.CodeAnalysis.Analyzers.dll" />
+  </ItemGroup>
   <ItemGroup>
     <CodeAnalysisDictionary Include="..\RoslynDomCommon\CustomDictionary.xml">
       <Link>CustomDictionary.xml</Link>

diff --git a/RoslynDom/packages.config b/RoslynDom/packages.config
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-beta1-20141031-01" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-beta1-20141031-01" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-beta1-20141031-01" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-beta1-20141031-01" targetFramework="net45" />
-  <package id="System.Collections.Immutable" version="1.1.32-beta" targetFramework="net45" />
-  <package id="System.Reflection.Metadata" version="1.0.17-beta" targetFramework="net45" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0-rc1" targetFramework="net45" />
+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net45" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc1" targetFramework="net45" />
+  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc1" targetFramework="net45" />
+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" targetFramework="net45" />
+  <package id="Microsoft.Composition" version="1.0.27" targetFramework="net45" />
+  <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
+  <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
   <package id="Unity" version="3.5.1405-prerelease" targetFramework="net45" />
 </packages>
diff --git a/RoslynDomCSharpFactories/BuildSyntaxHelpers.cs b/RoslynDomCSharpFactories/BuildSyntaxHelpers.cs
@@ -96,7 +96,7 @@ internal static T RemoveLeadingSpaces<T>(T syntax)
          where T : SyntaxNode
       {
          var trivia = syntax.GetLeadingTrivia();
-         var newTrivia = trivia.Where(x => x.CSharpKind() != SyntaxKind.WhitespaceTrivia);
+         var newTrivia = trivia.Where(x => x.Kind() != SyntaxKind.WhitespaceTrivia);
          syntax = syntax.WithLeadingTrivia(newTrivia);
          return syntax;
       }

diff --git a/RoslynDomCSharpFactories/CreateFromWorker.cs b/RoslynDomCSharpFactories/CreateFromWorker.cs
@@ -82,15 +82,15 @@ private void InitializeAccessModifiers(IHasAccessModifier itemHasAccessModifier,
 
          var accessibility = itemAsHasSymbol.Symbol.DeclaredAccessibility;
          var tokens = syntaxNode.ChildTokens();
-         if (tokens.Any(x => x.CSharpKind() == SyntaxKind.PublicKeyword))
+         if (tokens.Any(x => x.Kind() == SyntaxKind.PublicKeyword))
          { itemHasAccessModifier.DeclaredAccessModifier = AccessModifier.Public; }
-         else if (tokens.Any(x => x.CSharpKind() == SyntaxKind.PrivateKeyword))
+         else if (tokens.Any(x => x.Kind() == SyntaxKind.PrivateKeyword))
          { itemHasAccessModifier.DeclaredAccessModifier = AccessModifier.Private; }
-         else if (tokens.Any(x => x.CSharpKind() == SyntaxKind.ProtectedKeyword) && tokens.Any(x => x.CSharpKind() == SyntaxKind.InternalKeyword))
+         else if (tokens.Any(x => x.Kind() == SyntaxKind.ProtectedKeyword) && tokens.Any(x => x.Kind() == SyntaxKind.InternalKeyword))
          { itemHasAccessModifier.DeclaredAccessModifier = AccessModifier.ProtectedOrInternal; }
-         else if (tokens.Any(x => x.CSharpKind() == SyntaxKind.ProtectedKeyword))
+         else if (tokens.Any(x => x.Kind() == SyntaxKind.ProtectedKeyword))
          { itemHasAccessModifier.DeclaredAccessModifier = AccessModifier.Protected; }
-         else if (tokens.Any(x => x.CSharpKind() == SyntaxKind.InternalKeyword))
+         else if (tokens.Any(x => x.Kind() == SyntaxKind.InternalKeyword))
          { itemHasAccessModifier.DeclaredAccessModifier = AccessModifier.Internal; }
          else
          {
@@ -129,7 +129,7 @@ private void InitializeOOTypeMember(IOOTypeMember itemAsOO, SyntaxNode syntaxNod
          if (itemAsOO == null) { return; }
          var itemAsDom = itemAsOO as IRoslynHasSymbol;
          //itemAsOO.IsAbstract = itemAsDom.Symbol.IsAbstract;
-         itemAsOO.IsAbstract = syntaxNode.ChildTokens().Any(x => x.CSharpKind() == SyntaxKind.AbstractKeyword);
+         itemAsOO.IsAbstract = syntaxNode.ChildTokens().Any(x => x.Kind() == SyntaxKind.AbstractKeyword);
          itemAsOO.IsVirtual = itemAsDom.Symbol.IsVirtual;
          itemAsOO.IsOverride = itemAsDom.Symbol.IsOverride;
          itemAsOO.IsSealed = itemAsDom.Symbol.IsSealed;
@@ -138,7 +138,7 @@ private void InitializeOOTypeMember(IOOTypeMember itemAsOO, SyntaxNode syntaxNod
          {
 
             // See note on IsNew on interface before changing
-            itemAsCanBeNew.IsNew = syntaxNode.ChildTokens().Any(x => x.CSharpKind() == SyntaxKind.NewKeyword);
+            itemAsCanBeNew.IsNew = syntaxNode.ChildTokens().Any(x => x.Kind() == SyntaxKind.NewKeyword);
          }
       }
 
@@ -205,7 +205,7 @@ private void InitializeBaseList(IHasImplementedInterfaces itemAsT,
                                             .PreviousSiblings(implementedInterfaceSyntax)
                                             .LastOrDefault();
                   var sepKind = whitespaceLookupForImplementedInterfaces.Lookup(LanguageElement.Separator);
-                  if (prevNodeOrToken.CSharpKind() == sepKind)
+                  if (prevNodeOrToken.Kind() == sepKind)
                   {
                      var commaToken = prevNodeOrToken.AsToken();
                      whitespace2.LeadingWhitespace = commaToken.TrailingTrivia.ToString();
@@ -277,11 +277,11 @@ public IEnumerable<IDetail> GetDetail<T, TSyntax>(
          foreach (var trivia in triviaList)
          {
             // This is ugly, but we assume comments stand on their own lines. 
-            var skip = (lastWasComment && trivia.CSharpKind() == SyntaxKind.EndOfLineTrivia);
+            var skip = (lastWasComment && trivia.Kind () == SyntaxKind.EndOfLineTrivia);
             lastWasComment = false;
             if (!skip)
             {
-               switch (trivia.CSharpKind())
+               switch (trivia.Kind())
                {
                   case SyntaxKind.EndOfLineTrivia:
                      // TODO: Consider whether leading WS on a vert whitespace matters
@@ -328,11 +328,11 @@ public IEnumerable<IDetail> GetDetail<T, TSyntax>(
       //   foreach (var trivia in triviaList)
       //   {
       //      // This is ugly, but we assume comments stand on their own lines. 
-      //      var skip = (lastWasComment && trivia.CSharpKind() == SyntaxKind.EndOfLineTrivia);
+      //      var skip = (lastWasComment && trivia.Kind() == SyntaxKind.EndOfLineTrivia);
       //      lastWasComment = false;
       //      if (!skip)
       //      {
-      //         switch (trivia.CSharpKind())
+      //         switch (trivia.Kind())
       //         {
       //            case SyntaxKind.EndOfLineTrivia:
       //               // TODO: Consider whether leading WS on a vert whitespace matters
@@ -427,14 +427,14 @@ public Tuple<object, string, LiteralKind> GetArgumentValue(IDom newItem, Semanti
          if (!TryLiteralExpression(expr as LiteralExpressionSyntax, newItem, model, ref value, ref literalKind, ref constantIdentifier))
             if (!TryTyepofExpression(expr as TypeOfExpressionSyntax, newItem, model, ref value, ref literalKind, ref constantIdentifier))
                if (!TryDefaultExpression(expr as DefaultExpressionSyntax, newItem, model, ref value, ref literalKind, ref constantIdentifier))
-                  if (!TryInterpolatedStringExpression(expr as InterpolatedStringSyntax, newItem, model, ref value, ref literalKind, ref constantIdentifier))
+                  if (!TryInterpolatedStringExpression(expr as InterpolatedStringExpressionSyntax, newItem, model, ref value, ref literalKind, ref constantIdentifier))
                      if (!TryMemberExpression(expr as MemberAccessExpressionSyntax, newItem, model, ref value, ref literalKind, ref constantIdentifier))
                      //if (!TryIdentifierExpression(expr as IdentifierNameSyntax, newItem, model, ref value, ref literalKind, ref constantIdentifier))
                      { }
          return Tuple.Create(value, constantIdentifier, literalKind);
       }
 
-      private bool TryInterpolatedStringExpression(InterpolatedStringSyntax interpolatedStringSyntax,
+      private bool TryInterpolatedStringExpression(InterpolatedStringExpressionSyntax interpolatedStringSyntax,
                      IDom newItem,
                      SemanticModel model,
                      ref object value,
@@ -538,7 +538,7 @@ private bool TryLiteralExpression(LiteralExpressionSyntax literalExpression,
       {
          if (literalExpression == null)
          { return false; }
-         literalKind = Mappings.LiteralKindFromSyntaxKind(literalExpression.Token.CSharpKind());
+         literalKind = Mappings.LiteralKindFromSyntaxKind(literalExpression.Token.Kind());
          value = literalExpression.Token.Value;
          return true;
       }

diff --git a/RoslynDomCSharpFactories/DetailFactory.cs b/RoslynDomCSharpFactories/DetailFactory.cs
@@ -61,8 +61,8 @@ private static WhitespaceKindLookup whitespaceLookup
 
       public override IDom CreateFrom(SyntaxTrivia trivia, IDom parent, OutputContext context)
       {
-         if (trivia.CSharpKind() == SyntaxKind.RegionDirectiveTrivia) { return CreateStartRegion(trivia, parent, context); }
-         else if (trivia.CSharpKind() == SyntaxKind.EndRegionDirectiveTrivia) { return CreateEndRegion(trivia, parent, context); }
+         if (trivia.Kind() == SyntaxKind.RegionDirectiveTrivia) { return CreateStartRegion(trivia, parent, context); }
+         else if (trivia.Kind() == SyntaxKind.EndRegionDirectiveTrivia) { return CreateEndRegion(trivia, parent, context); }
          return CreateComment(trivia, parent, context);
       }
 
@@ -81,7 +81,7 @@ private IDom CreateStartRegion(SyntaxTrivia trivia, IDom parent, OutputContext c
       private Whitespace2 GetWhitespace(SyntaxTrivia trivia)
       {
          var str = "";
-         if (trivia.CSharpKind() == SyntaxKind.WhitespaceTrivia)
+         if (trivia.Kind() == SyntaxKind.WhitespaceTrivia)
          { str = trivia.ToFullString(); }
          return new Whitespace2(LanguagePart.Parent, LanguageElement.Detail, str, "", "");
       }
@@ -121,7 +121,7 @@ private static bool MatchEndRegion(SyntaxNode startSyntax, SyntaxTrivia typedTri
 
       private IDom CreateComment(SyntaxTrivia trivia, IDom parent, OutputContext context)
       {
-         var isMultiline = (trivia.CSharpKind() == SyntaxKind.MultiLineCommentTrivia);
+         var isMultiline = (trivia.Kind() == SyntaxKind.MultiLineCommentTrivia);
          var precedingTrivia = trivia.Token.LeadingTrivia.PreviousSiblings(trivia);
          var commentText = trivia.ToString();
          var tuple = context.Corporation.CreateFromWorker.ExtractComment(trivia.ToString());

diff --git a/RoslynDomCSharpFactories/Factories/RDomAccessorFactory.cs b/RoslynDomCSharpFactories/Factories/RDomAccessorFactory.cs
@@ -42,7 +42,7 @@ protected override IDom CreateItemFrom(SyntaxNode syntaxNode, IDom parent, Seman
       {
          var syntax = syntaxNode as AccessorDeclarationSyntax;
          var parentProperty = parent as IProperty;
-         var accessorType = (syntaxNode.CSharpKind() == SyntaxKind.GetAccessorDeclaration)
+         var accessorType = (syntaxNode.Kind() == SyntaxKind.GetAccessorDeclaration)
                              ? AccessorType.Get : AccessorType.Set;
          var newItem = new RDomPropertyAccessor(syntaxNode, accessorType, parent, model);
          CreateFromWorker.StandardInitialize(newItem, syntaxNode, parent, model, OutputContext);

diff --git a/RoslynDomCSharpFactories/Factories/RDomArgumentFactory.cs b/RoslynDomCSharpFactories/Factories/RDomArgumentFactory.cs
@@ -42,8 +42,8 @@ protected override IDom CreateItemFrom(SyntaxNode syntaxNode, IDom parent, Seman
          CreateFromWorker.StandardInitialize(newItem, syntaxNode, parent, model, OutputContext);
 
          newItem.ValueExpression = OutputContext.Corporation.CreateSpecial<IExpression>(syntax.Expression, newItem, model).FirstOrDefault();
-         newItem.IsOut = syntax.ChildTokens().Any(x => x.CSharpKind() == SyntaxKind.OutKeyword);
-         newItem.IsRef = syntax.ChildTokens().Any(x => x.CSharpKind() == SyntaxKind.RefKeyword);
+         newItem.IsOut = syntax.ChildTokens().Any(x => x.Kind() == SyntaxKind.OutKeyword);
+         newItem.IsRef = syntax.ChildTokens().Any(x => x.Kind() == SyntaxKind.RefKeyword);
          if (syntax.NameColon != null)
          {
             newItem.Name = syntax.NameColon.Name.ToString();

diff --git a/RoslynDomCSharpFactories/Factories/RDomConversionOperatorFactory.cs b/RoslynDomCSharpFactories/Factories/RDomConversionOperatorFactory.cs
@@ -59,7 +59,7 @@ protected override IDom CreateItemFrom(SyntaxNode syntaxNode, IDom parent, Seman
          newItem.Type = type;
 
          newItem.IsStatic = newItem.Symbol.IsStatic;
-         newItem.IsImplicit = (syntax.ImplicitOrExplicitKeyword.CSharpKind() == SyntaxKind.ImplicitKeyword);
+         newItem.IsImplicit = (syntax.ImplicitOrExplicitKeyword.Kind() == SyntaxKind.ImplicitKeyword);
 
          newItem.Parameters.CreateAndAdd(syntax, x => x.ParameterList.Parameters, x => OutputContext.Corporation.Create(x, newItem, model).Cast<IParameter>());
          //var parameters = ListUtilities.MakeList(syntax, x => x.ParameterList.Parameters, x => Corporation.Create(x, newItem, model))

diff --git a/RoslynDomCSharpFactories/Factories/RDomEnumMemberFactory.cs b/RoslynDomCSharpFactories/Factories/RDomEnumMemberFactory.cs
@@ -96,7 +96,7 @@ private void MemberWhitespace(RDomEnumMember newItem, EnumMemberDeclarationSynta
          //                        .PreviousSiblings(syntax)
          //                        .LastOrDefault();
          //var sepKind = WhitespaceLookup.Lookup(LanguageElement.EnumValueSeparator);
-         //if (prevNodeOrToken.CSharpKind() == sepKind)
+         //if (prevNodeOrToken.Kind() == sepKind)
          //{
          //    var commaToken = prevNodeOrToken.AsToken();
          //    var whitespace2 = newItem.Whitespace2Set[LanguageElement.Identifier];