Review 2

SonarSource · Feb 13, 2024 · 1d1adca · 1d1adca
1 parent 05ad94d
commit 1d1adca
Showing 1 changed file with 8 additions and 22 deletions.
diff --git a/...rc/SonarAnalyzer.Common/SymbolicExecution/Roslyn/OperationProcessors/CollectionTracker.cs b/...rc/SonarAnalyzer.Common/SymbolicExecution/Roslyn/OperationProcessors/CollectionTracker.cs
@@ -96,27 +96,13 @@ public static CollectionConstraint ArrayCreationConstraint(IArrayCreationOperati
             ? CollectionConstraint.Empty
             : CollectionConstraint.NotEmpty;
 
-    public static ProgramState LearnFrom(ProgramState state, IMethodReferenceOperationWrapper operation)
-    {
-        if (operation.Instance is not null
-            && operation.Instance.Type.DerivesOrImplementsAny(CollectionTypes)
-            && AddOrRemoveMethods.Contains(operation.Method.Name))
-        {
-            state = state[operation.Instance] is { } operationValue
-                ? state.SetOperationValue(operation, operationValue.WithoutConstraint<CollectionConstraint>())
-                : state;
-
-            state = operation.Instance.TrackedSymbol(state) is { } symbol && state[symbol] is { } symbolValue
-                ? state.SetSymbolValue(symbol, symbolValue.WithoutConstraint<CollectionConstraint>())
-                : state;
-
-            return state;
-        }
-        else
-        {
-            return state;
-        }
-    }
+    public static ProgramState LearnFrom(ProgramState state, IMethodReferenceOperationWrapper operation) =>
+        operation.Instance is not null
+        && operation.Instance.Type.DerivesOrImplementsAny(CollectionTypes)
+        && AddOrRemoveMethods.Contains(operation.Method.Name)
+        && state[operation.Instance] is { } value
+            ? state.SetOperationAndSymbolValue(operation.Instance, value.WithoutConstraint<CollectionConstraint>())
+            : state;
 
     public static ProgramState LearnFrom(ProgramState state, IPropertyReferenceOperationWrapper operation, ISymbol instanceSymbol)
     {
@@ -136,7 +122,7 @@ public static ProgramState LearnFrom(ProgramState state, IPropertyReferenceOpera
                 state = state.SetOperationConstraint(operation, NumberConstraint.From(0, null));
             }
         }
-        if (operation.Property.IsIndexer)
+        else if (operation.Property.IsIndexer)
         {
             state = state.SetOperationConstraint(operation.Instance, CollectionConstraint.NotEmpty);
             if (instanceSymbol is not null)