Fix issues after merge and test fix

Author: adityapatwardhan

src/System.Management.Automation/engine/parser/token.cs

@@ -420,10 +420,7 @@ public enum TokenKind
         QuestionEquals = 101,
 
         /// <summary>The null coalesce operator '??'.</summary>
-        QuestionQuestion = 101,
-
-        /// <summary>The null conditional member access operator '?.'.</summary>
-        QuestionDot = 102,
+        QuestionQuestion = 102,
 
         #endregion Operators
 
@@ -865,7 +862,7 @@ public static class TokenTraits
             /*         QuestionMark */ TokenFlags.TernaryOperator | TokenFlags.DisallowedInRestrictedMode,
             /*      QuestionEquals  */ TokenFlags.AssignmentOperator,
             /*    QuestionQuestion  */ TokenFlags.BinaryOperator,
-            /*         QuestionDot  */ TokenFlags.SpecialOperator | TokenFlags.DisallowedInRestrictedMode,
+            /*     Reserved slot 5  */ TokenFlags.None,
             /*     Reserved slot 6  */ TokenFlags.None,
             /*     Reserved slot 7  */ TokenFlags.None,
             /*     Reserved slot 8  */ TokenFlags.None,
@@ -1062,7 +1059,7 @@ public static class TokenTraits
             /*                Colon */ ":",
             /*       QuestionEquals */ "?=",
             /*     QuestionQuestion */ "??",
-            /*          QuestionDot */ "?.",
+            /*    Reserved slot 4   */ string.Empty,
             /*    Reserved slot 5   */ string.Empty,
             /*    Reserved slot 6   */ string.Empty,
             /*    Reserved slot 7   */ string.Empty,

src/System.Management.Automation/engine/parser/tokenizer.cs

@@ -4994,9 +4994,6 @@ internal Token NextToken()
                     return this.NewToken(TokenKind.Colon);
 
                 case '?' when InExpressionMode():
-                    return this.NewToken(TokenKind.QuestionMark);
-
-                case '?':
                     c1 = PeekChar();
 
                     if (c1 == '=')
@@ -5011,7 +5008,7 @@ internal Token NextToken()
                         return CheckOperatorInCommandMode(c, c1, TokenKind.QuestionQuestion);
                     }
 
-                    return ScanGenericToken(c);
+                    return this.NewToken(TokenKind.QuestionMark);
 
                 case '\0':
                     if (AtEof())

test/powershell/Language/Operators/NullConditional.Tests.ps1

@@ -63,6 +63,9 @@ Describe 'NullConditionalOperations' -tag 'CI' {
     }
 
     Context 'Null coalesce operator ??' {
+        BeforeEach {
+            $x = $null
+        }
 
         It 'Variable does not exist' {
             $variableDoesNotExist ?? 100 | Should -Be 100