Improve parsing of argument to value (#11)

Keep old way of working when possible. Only switch to ToFullString if FQN doesn't work.
SkylineCommunications · Nov 21, 2023 · 277f146 · 277f146
1 parent 1584f28
commit 277f146
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 1 deletion.
diff --git a/Common/RoslynHelper.cs b/Common/RoslynHelper.cs
@@ -843,11 +843,24 @@ public static bool TryParseValue(ExpressionSyntax expression, SemanticModel sema
                 case ObjectCreationExpressionSyntax oces:
                     // Examples: new DateTime(...); new MyClass();
 
+                    object o;
+                    try
+                    {
+                        // Will work when it's defined in the same project
+                        o = GetFullyQualifiedName(semanticModel, oces);
+                    }
+                    catch
+                    {
+                        // Backup for when it's defined in another project/semantic model
+                        // Will change the outcome as we can't retrieve the FQN.
+                        o = oces.ToFullString();
+                    }
+
                     value = new Value
                     {
                         Type = Value.ValueType.Unknown,
                         HasNotChanged = true,
-                        Object = oces.ToFullString(),
+                        Object = o,
                     };
                     succeeded = true;
                     break;

diff --git a/CommonTests/CheckCallingMethodTests.cs b/CommonTests/CheckCallingMethodTests.cs
@@ -34,6 +34,8 @@ public static class MyOtherConstants
             string programText = @"
 namespace MyNamespace
 {
+    using System;
+
     using MyOtherNamespace;
 	//using Skyline.DataMiner.Scripting;
 
@@ -122,6 +124,9 @@ public static void Run(int randomValue)
 
             Method16(MyOtherConstants.TriggerQueue.Dequeue());
             Method17(MyOtherConstants.MyDoubleConst);
+
+            Method18(new DateTime(2008, 8, 29, 19, 27, 15));
+            Method19(MyOtherConstants.TriggerQueue);
 	    }
 
 	    private static void Method1(object o) { }
@@ -141,6 +146,8 @@ private static void Method14(object o) { }
 	    private static void Method15(object o) { }
         private static void Method16(object o) { }
         private static void Method17(object o) { }
+        private static void Method18(object o) { }
+        private static void Method19(object o) { }
     }
 }";
 
@@ -191,6 +198,9 @@ void CheckCallingMethod(CallingMethodClass callingMethod, SemanticModel semantic
                 // Using type from another project
                 results.Add(Method16(callingMethod, semanticModel, solution));
                 results.Add(Method17(callingMethod, semanticModel, solution));
+
+                results.Add(Method18(callingMethod, semanticModel, solution));
+                results.Add(Method19(callingMethod, semanticModel, solution));
             }
 
             string Method1(CallingMethodClass callingMethod, SemanticModel semanticModel, Solution solution)
@@ -563,6 +573,48 @@ string Method17(CallingMethodClass callingMethod, SemanticModel semanticModel, S
 
                 return String.Empty;
             }
+
+            string Method18(CallingMethodClass callingMethod, SemanticModel semanticModel, Solution solution)
+            {
+                if (callingMethod.Name != "Method18")
+                {
+                    return null;
+                }
+
+                try
+                {
+                    callingMethod.Arguments[0].TryParseToValue(semanticModel, solution, out Value value).Should().BeTrue();
+                    value.Type.Should().Be(Value.ValueType.Unknown);
+                    value.Object.Should().BeEquivalentTo("System.DateTime");
+                }
+                catch (AssertFailedException e)
+                {
+                    return $"[Method18] {e.Message}";
+                }
+
+                return String.Empty;
+            }
+
+            string Method19(CallingMethodClass callingMethod, SemanticModel semanticModel, Solution solution)
+            {
+                if (callingMethod.Name != "Method19")
+                {
+                    return null;
+                }
+
+                try
+                {
+                    callingMethod.Arguments[0].TryParseToValue(semanticModel, solution, out Value value).Should().BeTrue();
+                    value.Type.Should().Be(Value.ValueType.Unknown);
+                    value.Object.Should().BeEquivalentTo("new Queue<int>()");
+                }
+                catch (AssertFailedException e)
+                {
+                    return $"[Method19] {e.Message}";
+                }
+
+                return String.Empty;
+            }
         }
 
         private class QActionAnalyzer : CSharpAnalyzerBase