C#: Address review comments

hvitved · hvitved · commit 2d0554a7eed8 · 2019-06-03T16:00:22.000+02:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/VariableDeclaration.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/VariableDeclaration.cs
@@ -11,14 +11,14 @@ class VariableDeclaration : Expression
     {
         VariableDeclaration(IExpressionInfo info) : base(info) { }
 
-        public static VariableDeclaration Create(Context cx, ISymbol symbol, Type type, TypeSyntax mention, Extraction.Entities.Location exprLocation, Extraction.Entities.Location declLocation, bool isVar, IExpressionParentEntity parent, int child)
+        public static VariableDeclaration Create(Context cx, ISymbol symbol, Type type, TypeSyntax optionalSyntax, Extraction.Entities.Location exprLocation, Extraction.Entities.Location declLocation, bool isVar, IExpressionParentEntity parent, int child)
         {
             var ret = new VariableDeclaration(new ExpressionInfo(cx, type, exprLocation, ExprKind.LOCAL_VAR_DECL, parent, child, false, null));
             cx.Try(null, null, () =>
             {
                 LocalVariable.Create(cx, symbol, ret, isVar, declLocation);
-                if (mention != null)
-                    TypeMention.Create(cx, mention, parent, type);
+                if (optionalSyntax != null)
+                    TypeMention.Create(cx, optionalSyntax, parent, type);
             });
             return ret;
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Statements/Case.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Statements/Case.cs
@@ -80,10 +80,10 @@ private void PopulatePattern(PatternSyntax pattern, TypeSyntax optionalType, Var
                     }
                     break;
                 case DiscardDesignationSyntax discard:
-                    if (!isVar)
-                        Expressions.TypeAccess.Create(cx, optionalType, this, 0);
-                    else
+                    if (isVar)
                         new Expressions.Discard(cx, discard, this, 0);
+                    else
+                        Expressions.TypeAccess.Create(cx, optionalType, this, 0);
                     break;
                 case null:
                     break;

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@ class VariableDeclaration : Expression`
`11`	`11`	`{`
`12`	`12`	`VariableDeclaration(IExpressionInfo info) : base(info) { }`
`13`	`13`
`14`		`- public static VariableDeclaration Create(Context cx, ISymbol symbol, Type type, TypeSyntax mention, Extraction.Entities.Location exprLocation, Extraction.Entities.Location declLocation, bool isVar, IExpressionParentEntity parent, int child)`
	`14`	`+ public static VariableDeclaration Create(Context cx, ISymbol symbol, Type type, TypeSyntax optionalSyntax, Extraction.Entities.Location exprLocation, Extraction.Entities.Location declLocation, bool isVar, IExpressionParentEntity parent, int child)`
`15`	`15`	`{`
`16`	`16`	`var ret = new VariableDeclaration(new ExpressionInfo(cx, type, exprLocation, ExprKind.LOCAL_VAR_DECL, parent, child, false, null));`
`17`	`17`	`cx.Try(null, null, () =>`
`18`	`18`	`{`
`19`	`19`	`LocalVariable.Create(cx, symbol, ret, isVar, declLocation);`
`20`		`- if (mention != null)`
`21`		`- TypeMention.Create(cx, mention, parent, type);`
	`20`	`+ if (optionalSyntax != null)`
	`21`	`+ TypeMention.Create(cx, optionalSyntax, parent, type);`
`22`	`22`	`});`
`23`	`23`	`return ret;`
`24`	`24`	`}`