From e914514d92a2910f2c98b25587cb5b561092d69c Mon Sep 17 00:00:00 2001
From: Jan Finkenzeller <finkenzellerjan@gmail.com>
Date: Thu, 16 Jan 2020 08:05:35 +0100
Subject: [PATCH] removed most of the last commit (handling declarators) since
 they aren't discards from the compilers view. Kept the tests around and
 tweaked them so they now check that nothing is classified in these cases.

---
 .../Classification/SemanticClassifierTests.cs       | 13 +++++--------
 .../SyntaxClassification/DiscardSyntaxClassifier.cs |  5 -----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs b/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs
index 2f3e57c838e..6ad116e1d5f 100644
--- a/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs
+++ b/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs
@@ -3614,7 +3614,7 @@ void N()
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Classification)]
-        public async Task DiscardVariableDeclaration()
+        public async Task NonDiscardVariableDeclaration()
         {
             await TestAsync(@"
 class X
@@ -3625,13 +3625,12 @@ void N()
     }
 }",
             Keyword("var"),
-            Keyword("_"),
-            Method("Parse"),
-            Static("Parse"));
+            Static("Parse"),
+            Method("Parse"));
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Classification)]
-        public async Task DiscardVariableDeclarationMultipleDeclarators()
+        public async Task NonDiscardVariableDeclarationMultipleDeclarators()
         {
             await TestAsync(@"
 class X
@@ -3641,9 +3640,7 @@ void N()
         int i = 1, _ = 1;
         int _ = 2, j = 1;
     }
-}",
-            Keyword("_"),
-            Keyword("_"));
+}");
         }
 
         [Fact, Trait(Traits.Feature, Traits.Features.Classification)]
diff --git a/src/Workspaces/CSharp/Portable/Classification/SyntaxClassification/DiscardSyntaxClassifier.cs b/src/Workspaces/CSharp/Portable/Classification/SyntaxClassification/DiscardSyntaxClassifier.cs
index bda2a2446f7..90c18f86b6f 100644
--- a/src/Workspaces/CSharp/Portable/Classification/SyntaxClassification/DiscardSyntaxClassifier.cs
+++ b/src/Workspaces/CSharp/Portable/Classification/SyntaxClassification/DiscardSyntaxClassifier.cs
@@ -18,7 +18,6 @@ internal class DiscardSyntaxClassifier : AbstractSyntaxClassifier
         public override ImmutableArray<Type> SyntaxNodeTypes { get; } = ImmutableArray.Create(
             typeof(DiscardDesignationSyntax),
             typeof(DiscardPatternSyntax),
-            typeof(VariableDeclaratorSyntax),
             typeof(ParameterSyntax),
             typeof(IdentifierNameSyntax));
 
@@ -37,10 +36,6 @@ internal class DiscardSyntaxClassifier : AbstractSyntaxClassifier
 
             switch (syntax)
             {
-                case VariableDeclaratorSyntax declarator when declarator.Identifier.Text == "_":
-                    result.Add(new ClassifiedSpan(declarator.Identifier.Span, ClassificationTypeNames.Keyword));
-                    break;
-
                 case ParameterSyntax parameter when parameter.Identifier.Text == "_":
                     var symbol = semanticModel.GetDeclaredSymbol(parameter, cancellationToken);
 
-- 
GitLab