PR feedbacl

RenderMichael · RenderMichael · commit 107d4842814f · 2024-10-30T00:00:24.000-04:00
diff --git a/dotnet/src/webdriver/DefaultFileDetector.cs b/dotnet/src/webdriver/DefaultFileDetector.cs
@@ -34,7 +34,11 @@ public class DefaultFileDetector : IFileDetector
         /// </summary>
         /// <param name="keySequence">The sequence to test for file existence.</param>
         /// <returns>This method always returns <see langword="false"/> in this implementation.</returns>
-        public bool IsFile([NotNullWhen(true)] string? keySequence)
+        public bool IsFile(
+#if NET
+            [NotNullWhen(true)]
+#endif
+        string? keySequence)
         {
             return false;
         }
diff --git a/dotnet/src/webdriver/DetachedShadowRootException.cs b/dotnet/src/webdriver/DetachedShadowRootException.cs
@@ -41,7 +41,7 @@ public DetachedShadowRootException()
         /// a specified error message.
         /// </summary>
         /// <param name="message">The message that describes the error.</param>
-        public DetachedShadowRootException(string message)
+        public DetachedShadowRootException(string? message)
             : base(message)
         {
         }
@@ -54,7 +54,7 @@ public DetachedShadowRootException(string message)
         /// <param name="message">The error message that explains the reason for the exception.</param>
         /// <param name="innerException">The exception that is the cause of the current exception,
         /// or <see langword="null"/> if no inner exception is specified.</param>
-        public DetachedShadowRootException(string message, Exception innerException)
+        public DetachedShadowRootException(string? message, Exception? innerException)
             : base(message, innerException)
         {
         }
diff --git a/dotnet/src/webdriver/ErrorResponse.cs b/dotnet/src/webdriver/ErrorResponse.cs
@@ -44,52 +44,41 @@ public ErrorResponse()
         /// </summary>
         /// <param name="responseValue">A <see cref="Dictionary{K, V}"/> containing names and values of
         /// the properties of this <see cref="ErrorResponse"/>.</param>
-        public ErrorResponse(Dictionary<string, object>? responseValue)
+        public ErrorResponse(Dictionary<string, object?>? responseValue)
         {
             if (responseValue != null)
             {
-                if (responseValue.ContainsKey("message"))
+                if (responseValue.TryGetValue("message", out object? messageObj)
+                    && messageObj?.ToString() is string message)
                 {
-                    if (responseValue["message"] != null)
-                    {
-                        this.message = responseValue["message"].ToString() ?? "";
-                    }
-                    else
-                    {
-                        this.message = "The error did not contain a message.";
-                    }
+                    this.message = message;
                 }
-
-                if (responseValue.ContainsKey("screen") && responseValue["screen"] != null)
+                else
                 {
-                    this.screenshot = responseValue["screen"].ToString() ?? "";
+                    this.message = "The error did not contain a message.";
                 }
 
-                if (responseValue.ContainsKey("class") && responseValue["class"] != null)
+                if (responseValue.TryGetValue("screen", out object? screenObj)
+                    && screenObj?.ToString() is string screen)
                 {
-                    this.className = responseValue["class"].ToString() ?? "";
+                    this.screenshot = screen;
                 }
 
-                if (responseValue.ContainsKey("stackTrace") || responseValue.ContainsKey("stacktrace"))
+                if (responseValue.TryGetValue("class", out object? classObj)
+                    && classObj?.ToString() is string @class)
                 {
-                    object[]? stackTraceArray = null;
-
-                    if (responseValue.ContainsKey("stackTrace"))
-                    {
-                        stackTraceArray = responseValue["stackTrace"] as object[];
-                    }
-                    else if (responseValue.ContainsKey("stacktrace"))
-                    {
-                        stackTraceArray = responseValue["stacktrace"] as object[];
-                    }
+                    this.className = @class;
+                }
 
-                    if (stackTraceArray != null)
+                if (responseValue.TryGetValue("stackTrace", out object? stackTraceObj)
+                    || responseValue.TryGetValue("stacktrace", out stackTraceObj))
+                {
+                    if (stackTraceObj is object?[] stackTraceArray)
                     {
                         List<StackTraceElement> stackTraceList = new List<StackTraceElement>();
-                        foreach (object rawStackTraceElement in stackTraceArray)
+                        foreach (object? rawStackTraceElement in stackTraceArray)
                         {
-                            Dictionary<string, object>? elementAsDictionary = rawStackTraceElement as Dictionary<string, object>;
-                            if (elementAsDictionary != null)
+                            if (rawStackTraceElement is Dictionary<string, object?> elementAsDictionary)
                             {
                                 stackTraceList.Add(new StackTraceElement(elementAsDictionary));
                             }
diff --git a/dotnet/src/webdriver/Firefox/FirefoxDriver.cs b/dotnet/src/webdriver/Firefox/FirefoxDriver.cs
@@ -249,7 +249,9 @@ public override IFileDetector FileDetector
         /// <summary>
         /// Gets a value indicating whether a DevTools session is active.
         /// </summary>
+#if NET
         [MemberNotNullWhen(true, nameof(devToolsSession))]
+#endif
         public bool HasActiveDevToolsSession
         {
             get { return this.devToolsSession != null; }
diff --git a/dotnet/src/webdriver/IFileDetector.cs b/dotnet/src/webdriver/IFileDetector.cs
@@ -34,6 +34,10 @@ public interface IFileDetector
         /// </summary>
         /// <param name="keySequence">The sequence to test for file existence.</param>
         /// <returns><see langword="true"/> if the key sequence represents a file; otherwise, <see langword="false"/>.</returns>
-        bool IsFile([NotNullWhen(true)] string? keySequence);
+        bool IsFile(
+#if NET
+            [NotNullWhen(true)]
+#endif
+        string? keySequence);
     }
 }
diff --git a/dotnet/src/webdriver/Internal/NullableAttributes.cs b/dotnet/src/webdriver/Internal/NullableAttributes.cs
diff --git a/dotnet/src/webdriver/InvalidSelectorException.cs b/dotnet/src/webdriver/InvalidSelectorException.cs
@@ -71,7 +71,7 @@ public InvalidSelectorException(string? message, Exception? innerException)
         /// <returns>The final message for exception</returns>
         protected static string GetMessage(string? message)
         {
-            return message + "; " + supportMsg + supportUrl;
+            return $"{message}; {supportMsg}{supportUrl}";
         }
     }
 }
diff --git a/dotnet/src/webdriver/NoSuchDriverException.cs b/dotnet/src/webdriver/NoSuchDriverException.cs
@@ -72,7 +72,7 @@ public NoSuchDriverException(string? message, Exception? innerException)
         /// <returns>The final message for exception</returns>
         protected static string GetMessage(string? message)
         {
-            return message + "; " + supportMsg + supportUrl;
+            return $"{message}; {supportMsg}{supportUrl}";
         }
     }
 }
diff --git a/dotnet/src/webdriver/NoSuchElementException.cs b/dotnet/src/webdriver/NoSuchElementException.cs
@@ -72,7 +72,7 @@ public NoSuchElementException(string? message, Exception? innerException)
         /// <returns>The final message for exception</returns>
         protected static string GetMessage(string? message)
         {
-            return message + "; " + supportMsg + supportUrl;
+            return $"{message}; {supportMsg}{supportUrl}";
         }
     }
 }
diff --git a/dotnet/src/webdriver/Remote/LocalFileDetector.cs b/dotnet/src/webdriver/Remote/LocalFileDetector.cs
@@ -35,7 +35,11 @@ public class LocalFileDetector : IFileDetector
         /// </summary>
         /// <param name="keySequence">The sequence to test for file existence.</param>
         /// <returns><see langword="true"/> if the key sequence represents a file; otherwise, <see langword="false"/>.</returns>
-        public bool IsFile([NotNullWhen(true)] string? keySequence)
+        public bool IsFile(
+#if NET
+            [NotNullWhen(true)]
+#endif
+        string? keySequence)
         {
             return File.Exists(keySequence);
         }
diff --git a/dotnet/src/webdriver/StackTraceElement.cs b/dotnet/src/webdriver/StackTraceElement.cs
@@ -45,32 +45,43 @@ public StackTraceElement()
         /// Initializes a new instance of the <see cref="StackTraceElement"/> class using the given property values.
         /// </summary>
         /// <param name="elementAttributes">A <see cref="Dictionary{K, V}"/> containing the names and values for the properties of this <see cref="StackTraceElement"/>.</param>
-        public StackTraceElement(Dictionary<string, object>? elementAttributes)
+        public StackTraceElement(Dictionary<string, object?>? elementAttributes)
         {
             if (elementAttributes != null)
             {
-                if (elementAttributes.ContainsKey("className") && elementAttributes["className"] != null)
+                if (elementAttributes.TryGetValue("className", out object? classNameObj))
                 {
-                    this.className = elementAttributes["className"].ToString() ?? "";
+                    string? className = classNameObj?.ToString();
+                    if (className is not null)
+                    {
+                        this.className = className;
+                    }
                 }
 
-                if (elementAttributes.ContainsKey("methodName") && elementAttributes["methodName"] != null)
+                if (elementAttributes.TryGetValue("methodName", out object? methodNameObj))
                 {
-                    this.methodName = elementAttributes["methodName"].ToString() ?? "";
+                    string? methodName = methodNameObj?.ToString();
+                    if (methodName is not null)
+                    {
+                        this.methodName = methodName;
+                    }
                 }
 
-                if (elementAttributes.ContainsKey("lineNumber"))
+                if (elementAttributes.TryGetValue("lineNumber", out object? lineNumberObj))
                 {
-                    int line = 0;
-                    if (int.TryParse(elementAttributes["lineNumber"].ToString(), out line))
+                    if (int.TryParse(lineNumberObj?.ToString(), out int line))
                     {
                         this.lineNumber = line;
                     }
                 }
 
-                if (elementAttributes.ContainsKey("fileName") && elementAttributes["fileName"] != null)
+                if (elementAttributes.TryGetValue("fileName", out object? fileNameObj))
                 {
-                    this.fileName = elementAttributes["fileName"].ToString() ?? "";
+                    string? fileName = fileNameObj?.ToString();
+                    if (fileName is not null)
+                    {
+                        this.fileName = fileName;
+                    }
                 }
             }
         }
diff --git a/dotnet/src/webdriver/StaleElementReferenceException.cs b/dotnet/src/webdriver/StaleElementReferenceException.cs
@@ -71,7 +71,7 @@ public StaleElementReferenceException(string? message, Exception? innerException
         /// <returns>The final message for exception</returns>
         protected static string GetMessage(string? message)
         {
-            return message + "; " + supportMsg + supportUrl;
+            return $"{message}; {supportMsg}{supportUrl}";
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,11 @@ public class DefaultFileDetector : IFileDetector`
`34`	`34`	`/// </summary>`
`35`	`35`	`/// <param name="keySequence">The sequence to test for file existence.</param>`
`36`	`36`	`/// <returns>This method always returns <see langword="false"/> in this implementation.</returns>`
`37`		`- public bool IsFile([NotNullWhen(true)] string? keySequence)`
	`37`	`+ public bool IsFile(`
	`38`	`+#if NET`
	`39`	`+ [NotNullWhen(true)]`
	`40`	`+#endif`
	`41`	`+ string? keySequence)`
`38`	`42`	`{`
`39`	`43`	`return false;`
`40`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public DetachedShadowRootException()`
`41`	`41`	`/// a specified error message.`
`42`	`42`	`/// </summary>`
`43`	`43`	`/// <param name="message">The message that describes the error.</param>`
`44`		`- public DetachedShadowRootException(string message)`
	`44`	`+ public DetachedShadowRootException(string? message)`
`45`	`45`	`: base(message)`
`46`	`46`	`{`
`47`	`47`	`}`
`@@ -54,7 +54,7 @@ public DetachedShadowRootException(string message)`
`54`	`54`	`/// <param name="message">The error message that explains the reason for the exception.</param>`
`55`	`55`	`/// <param name="innerException">The exception that is the cause of the current exception,`
`56`	`56`	`/// or <see langword="null"/> if no inner exception is specified.</param>`
`57`		`- public DetachedShadowRootException(string message, Exception innerException)`
	`57`	`+ public DetachedShadowRootException(string? message, Exception? innerException)`
`58`	`58`	`: base(message, innerException)`
`59`	`59`	`{`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,52 +44,41 @@ public ErrorResponse()`
`44`	`44`	`/// </summary>`
`45`	`45`	`/// <param name="responseValue">A <see cref="Dictionary{K, V}"/> containing names and values of`
`46`	`46`	`/// the properties of this <see cref="ErrorResponse"/>.</param>`
`47`		`- public ErrorResponse(Dictionary<string, object>? responseValue)`
	`47`	`+ public ErrorResponse(Dictionary<string, object?>? responseValue)`
`48`	`48`	`{`
`49`	`49`	`if (responseValue != null)`
`50`	`50`	`{`
`51`		`- if (responseValue.ContainsKey("message"))`
	`51`	`+ if (responseValue.TryGetValue("message", out object? messageObj)`
	`52`	`+ && messageObj?.ToString() is string message)`
`52`	`53`	`{`
`53`		`- if (responseValue["message"] != null)`
`54`		`- {`
`55`		`- this.message = responseValue["message"].ToString() ?? "";`
`56`		`- }`
`57`		`- else`
`58`		`- {`
`59`		`- this.message = "The error did not contain a message.";`
`60`		`- }`
	`54`	`+ this.message = message;`
`61`	`55`	`}`
`62`		`-`
`63`		`- if (responseValue.ContainsKey("screen") && responseValue["screen"] != null)`
	`56`	`+ else`
`64`	`57`	`{`
`65`		`- this.screenshot = responseValue["screen"].ToString() ?? "";`
	`58`	`+ this.message = "The error did not contain a message.";`
`66`	`59`	`}`
`67`	`60`
`68`		`- if (responseValue.ContainsKey("class") && responseValue["class"] != null)`
	`61`	`+ if (responseValue.TryGetValue("screen", out object? screenObj)`
	`62`	`+ && screenObj?.ToString() is string screen)`
`69`	`63`	`{`
`70`		`- this.className = responseValue["class"].ToString() ?? "";`
	`64`	`+ this.screenshot = screen;`
`71`	`65`	`}`
`72`	`66`
`73`		`- if (responseValue.ContainsKey("stackTrace") \|\| responseValue.ContainsKey("stacktrace"))`
	`67`	`+ if (responseValue.TryGetValue("class", out object? classObj)`
	`68`	`+ && classObj?.ToString() is string @class)`
`74`	`69`	`{`
`75`		`- object[]? stackTraceArray = null;`
`76`		`-`
`77`		`- if (responseValue.ContainsKey("stackTrace"))`
`78`		`- {`
`79`		`- stackTraceArray = responseValue["stackTrace"] as object[];`
`80`		`- }`
`81`		`- else if (responseValue.ContainsKey("stacktrace"))`
`82`		`- {`
`83`		`- stackTraceArray = responseValue["stacktrace"] as object[];`
`84`		`- }`
	`70`	`+ this.className = @class;`
	`71`	`+ }`
`85`	`72`
`86`		`- if (stackTraceArray != null)`
	`73`	`+ if (responseValue.TryGetValue("stackTrace", out object? stackTraceObj)`
	`74`	`+ \|\| responseValue.TryGetValue("stacktrace", out stackTraceObj))`
	`75`	`+ {`
	`76`	`+ if (stackTraceObj is object?[] stackTraceArray)`
`87`	`77`	`{`
`88`	`78`	`List<StackTraceElement> stackTraceList = new List<StackTraceElement>();`
`89`		`- foreach (object rawStackTraceElement in stackTraceArray)`
	`79`	`+ foreach (object? rawStackTraceElement in stackTraceArray)`
`90`	`80`	`{`
`91`		`- Dictionary<string, object>? elementAsDictionary = rawStackTraceElement as Dictionary<string, object>;`
`92`		`- if (elementAsDictionary != null)`
	`81`	`+ if (rawStackTraceElement is Dictionary<string, object?> elementAsDictionary)`
`93`	`82`	`{`
`94`	`83`	`stackTraceList.Add(new StackTraceElement(elementAsDictionary));`
`95`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,10 @@ public interface IFileDetector`
`34`	`34`	`/// </summary>`
`35`	`35`	`/// <param name="keySequence">The sequence to test for file existence.</param>`
`36`	`36`	`/// <returns><see langword="true"/> if the key sequence represents a file; otherwise, <see langword="false"/>.</returns>`
`37`		`- bool IsFile([NotNullWhen(true)] string? keySequence);`
	`37`	`+ bool IsFile(`
	`38`	`+#if NET`
	`39`	`+ [NotNullWhen(true)]`
	`40`	`+#endif`
	`41`	`+ string? keySequence);`
`38`	`42`	`}`
`39`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public InvalidSelectorException(string? message, Exception? innerException)`
`71`	`71`	`/// <returns>The final message for exception</returns>`
`72`	`72`	`protected static string GetMessage(string? message)`
`73`	`73`	`{`
`74`		`- return message + "; " + supportMsg + supportUrl;`
	`74`	`+ return $"{message}; {supportMsg}{supportUrl}";`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public NoSuchDriverException(string? message, Exception? innerException)`
`72`	`72`	`/// <returns>The final message for exception</returns>`
`73`	`73`	`protected static string GetMessage(string? message)`
`74`	`74`	`{`
`75`		`- return message + "; " + supportMsg + supportUrl;`
	`75`	`+ return $"{message}; {supportMsg}{supportUrl}";`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public NoSuchElementException(string? message, Exception? innerException)`
`72`	`72`	`/// <returns>The final message for exception</returns>`
`73`	`73`	`protected static string GetMessage(string? message)`
`74`	`74`	`{`
`75`		`- return message + "; " + supportMsg + supportUrl;`
	`75`	`+ return $"{message}; {supportMsg}{supportUrl}";`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,11 @@ public class LocalFileDetector : IFileDetector`
`35`	`35`	`/// </summary>`
`36`	`36`	`/// <param name="keySequence">The sequence to test for file existence.</param>`
`37`	`37`	`/// <returns><see langword="true"/> if the key sequence represents a file; otherwise, <see langword="false"/>.</returns>`
`38`		`- public bool IsFile([NotNullWhen(true)] string? keySequence)`
	`38`	`+ public bool IsFile(`
	`39`	`+#if NET`
	`40`	`+ [NotNullWhen(true)]`
	`41`	`+#endif`
	`42`	`+ string? keySequence)`
`39`	`43`	`{`
`40`	`44`	`return File.Exists(keySequence);`
`41`	`45`	`}`