Merge branch 'VS2022-conversion'

Source/MDK/Build/AnalysisExtensions.cs

@@ -28,7 +28,7 @@ public static bool IsInterfaceImplementation(this ISymbol symbol)
                 .Any(member =>
                 {
                     var implementation = symbol.ContainingType.FindImplementationForInterfaceMember(member);
-                    return implementation != null && implementation.Equals(symbol);
+                    return implementation != null && SymbolEqualityComparer.Default.Equals(implementation, symbol);
                 });
         }
 

Source/MDK/Build/Annotations/MdkAnnotationRewriter.cs

@@ -86,18 +86,18 @@ SyntaxTriviaList TrimTrivia(SyntaxTriviaList source)
                     if (trivia.GetStructure() is RegionDirectiveTriviaSyntax regionDirective)
                     {
                         list.AddRange(regionDirective.GetLeadingTrivia());
-                        while (list.Count > 0 && list[list.Count - 1].Kind() == SyntaxKind.WhitespaceTrivia)
+                        while (list.Count > 0 && list[list.Count - 1].IsKind(SyntaxKind.WhitespaceTrivia))
                             list.RemoveAt(list.Count - 1);
-                        list.AddRange(regionDirective.GetTrailingTrivia().SkipWhile(t => t.Kind() == SyntaxKind.EndOfLineTrivia));
+                        list.AddRange(regionDirective.GetTrailingTrivia().SkipWhile(t => t.IsKind(SyntaxKind.EndOfLineTrivia)));
                         continue;
                     }
 
                     if (trivia.GetStructure() is EndRegionDirectiveTriviaSyntax endRegionDirective)
                     {
                         list.AddRange(endRegionDirective.GetLeadingTrivia());
-                        while (list.Count > 0 && list[list.Count - 1].Kind() == SyntaxKind.WhitespaceTrivia)
+                        while (list.Count > 0 && list[list.Count - 1].IsKind(SyntaxKind.WhitespaceTrivia))
                             list.RemoveAt(list.Count - 1);
-                        list.AddRange(endRegionDirective.GetTrailingTrivia().SkipWhile(t => t.Kind() == SyntaxKind.EndOfLineTrivia));
+                        list.AddRange(endRegionDirective.GetTrailingTrivia().SkipWhile(t => t.IsKind(SyntaxKind.EndOfLineTrivia)));
                         continue;
                     }
                 }

Source/MDK/Build/Composers/Default/NewlineCleaner.cs

@@ -14,7 +14,7 @@ public NewlineCleaner() : base(true)
         public override SyntaxTrivia VisitTrivia(SyntaxTrivia trivia)
         {
             trivia = base.VisitTrivia(trivia);
-            if (trivia.Kind() == SyntaxKind.EndOfLineTrivia && trivia.ToString() == "\r\n")
+            if (trivia.IsKind(SyntaxKind.EndOfLineTrivia) && trivia.ToString() == "\r\n")
             {
                 trivia = SyntaxFactory.EndOfLine("\n");
             }

Source/MDK/Build/Composers/Minifying/CodeSimplifier.cs

@@ -231,9 +231,9 @@ void TrimTrivia(SyntaxTriviaList leadingTrivia, List<SyntaxTrivia> newTrivia)
                     case SyntaxKind.DocumentationCommentExteriorTrivia:
                     case SyntaxKind.SingleLineDocumentationCommentTrivia:
                     case SyntaxKind.MultiLineDocumentationCommentTrivia:
-                        while (index < leadingTrivia.Count && leadingTrivia[index].Kind() != SyntaxKind.EndOfLineTrivia)
+                        while (index < leadingTrivia.Count && !leadingTrivia[index].IsKind(SyntaxKind.EndOfLineTrivia))
                             index++;
-                        while (newTrivia.Count > 0 && newTrivia[newTrivia.Count - 1].Kind() == SyntaxKind.WhitespaceTrivia)
+                        while (newTrivia.Count > 0 && newTrivia[newTrivia.Count - 1].IsKind(SyntaxKind.WhitespaceTrivia))
                             newTrivia.RemoveAt(newTrivia.Count - 1);
                         continue;
 

Source/MDK/Build/Composers/Minifying/LineWrapper.cs

@@ -81,7 +81,7 @@ public override SyntaxNode VisitInterpolatedStringExpression(InterpolatedStringE
         public override SyntaxToken VisitToken(SyntaxToken token)
         {
             token = base.VisitToken(token);
-            if (token.Kind() == SyntaxKind.None)
+            if (token.IsKind(SyntaxKind.None))
                 return token;
 
             if (token.ShouldBePreserved())
@@ -101,7 +101,7 @@ public override SyntaxToken VisitToken(SyntaxToken token)
 
             _isPreservedBlock = false;
 
-            if (token.Kind() == SyntaxKind.None)
+            if (token.IsKind(SyntaxKind.None))
                 return token;
 
             var span = token.GetLocation().GetLineSpan();

Source/MDK/Build/Composers/Minifying/MinifyingComposer.cs

@@ -49,6 +49,11 @@ public override async Task<string> GenerateAsync(ProgramComposition composition,
         }
 
 
+        /// <summary>
+        /// Generate the final script after all processors have run.
+        /// </summary>
+        /// <param name="composition"></param>
+        /// <returns></returns>
         protected async Task<string> GenerateScriptAsync(ProgramComposition composition)
         {
             var root = composition.RootNode;

Source/MDK/Build/Composers/Minifying/SymbolRenamer.cs

@@ -77,8 +77,9 @@ public async Task<ProgramComposition> ProcessAsync([NotNull] ProgramComposition
 
                 var document = composition.Document;
                 var documentId = document.Id;
-                var newSolution = await Renamer.RenameSymbolAsync(document.Project.Solution, definition.Symbol, newName, document.Project.Solution.Options);
-                composition = await composition.WithDocumentAsync(newSolution.GetDocument(documentId));
+                //var newSolution = await Renamer.RenameSymbolAsync(document.Project.Solution, definition.Symbol, newName, document.Project.Solution.Options);
+                var newSolution = await Renamer.RenameSymbolAsync(document.Project.Solution, definition.Symbol, new SymbolRenameOptions(), newName);
+                composition = await composition.WithDocumentAsync(newSolution.GetDocument(documentId)!);
                 symbolDefinitions = analyzer.FindSymbols(composition, config).ToList();
                 symbolDefinitions.Sort((a, b) => a.SyntaxNode.FullSpan.Start);
             }

Source/MDK/Build/Composers/Minifying/WhitespaceCompactor.cs

@@ -15,7 +15,7 @@ class WhitespaceCompactor : ProgramRewriter
         public override SyntaxTrivia VisitTrivia(SyntaxTrivia trivia)
         {
             trivia = base.VisitTrivia(trivia);
-            if (trivia.Kind() == SyntaxKind.EndOfLineTrivia && trivia.ToString() == "\r\n")
+            if (trivia.IsKind(SyntaxKind.EndOfLineTrivia) && trivia.ToString() == "\r\n")
                 trivia = trivia.CopyAnnotationsTo(SyntaxFactory.EndOfLine("\n"));
 
             return trivia;

Source/MDK/Build/Composers/StripComments/CommentStripper.cs

@@ -58,7 +58,7 @@ void TrimTrivia(SyntaxTriviaList trivia, List<SyntaxTrivia> newTrivia, bool trai
                     newTrivia.Add(triviaItem);
                     continue;
                 }
-                if (lastPreserved && triviaItem.Kind() == SyntaxKind.WhitespaceTrivia)
+                if (lastPreserved && triviaItem.IsKind(SyntaxKind.WhitespaceTrivia))
                 {
                     lastPreserved = false;
                     continue;
@@ -70,11 +70,11 @@ void TrimTrivia(SyntaxTriviaList trivia, List<SyntaxTrivia> newTrivia, bool trai
                     case SyntaxKind.DocumentationCommentExteriorTrivia:
                     case SyntaxKind.SingleLineDocumentationCommentTrivia:
                     case SyntaxKind.MultiLineDocumentationCommentTrivia:
-                        while (index < trivia.Count && trivia[index].Kind() != SyntaxKind.EndOfLineTrivia)
+                        while (index < trivia.Count && !trivia[index].IsKind(SyntaxKind.EndOfLineTrivia))
                             index++;
                         if (trailingMode)
                             index--;
-                        while (newTrivia.Count > 0 && newTrivia[newTrivia.Count - 1].Kind() == SyntaxKind.WhitespaceTrivia)
+                        while (newTrivia.Count > 0 && newTrivia[newTrivia.Count - 1].IsKind(SyntaxKind.WhitespaceTrivia))
                             newTrivia.RemoveAt(newTrivia.Count - 1);
                         continue;
 

Source/MDK/Build/DocumentAnalysis/DocumentAnalyzer.cs

@@ -154,9 +154,9 @@ ClassDeclarationSyntax MoveBraceTrivia(ClassDeclarationSyntax node)
 
                     // Skip the whitespace and line the brace itself is on
                     var i = 0;
-                    while (i < trailingTrivia.Count && trailingTrivia[i].Kind() == SyntaxKind.WhitespaceTrivia)
+                    while (i < trailingTrivia.Count && trailingTrivia[i].IsKind(SyntaxKind.WhitespaceTrivia))
                         i++;
-                    if (i < trailingTrivia.Count && trailingTrivia[i].Kind() == SyntaxKind.EndOfLineTrivia)
+                    if (i < trailingTrivia.Count && trailingTrivia[i].IsKind(SyntaxKind.EndOfLineTrivia))
                         i++;
                     node = node.WithOpenBraceToken(node.OpenBraceToken.WithTrailingTrivia(SyntaxFactory.EndOfLine("\n")));
                     if (i < trailingTrivia.Count)

Source/MDK/Build/DocumentAnalysis/ProgramScriptPart.cs

@@ -76,9 +76,9 @@ public override string GenerateContent()
 
                 // Skip the whitespace and line the brace itself is on
                 var i = 0;
-                while (i < trailingTrivia.Count && trailingTrivia[i].Kind() == SyntaxKind.WhitespaceTrivia)
+                while (i < trailingTrivia.Count && trailingTrivia[i].IsKind(SyntaxKind.WhitespaceTrivia))
                     i++;
-                if (i < trailingTrivia.Count && trailingTrivia[i].Kind() == SyntaxKind.EndOfLineTrivia)
+                if (i < trailingTrivia.Count && trailingTrivia[i].IsKind(SyntaxKind.EndOfLineTrivia))
                     i++;
                 for (; i < trailingTrivia.Count; i++)
                     buffer.Append(trailingTrivia[i].ToFullString());

Source/MDK/Build/TypeTrimming/TypeTrimmer.cs

@@ -68,14 +68,14 @@ public async Task<ProgramComposition> ProcessAsync([NotNull] ProgramComposition
                 throw new ArgumentNullException(nameof(composition));
             if (config == null)
                 throw new ArgumentNullException(nameof(config));
-            var nodes = new Dictionary<ISymbol, Node>();
+            var nodes = new Dictionary<ISymbol, Node>(SymbolEqualityComparer.Default);
             var analyzer = new UsageAnalyzer();
             var symbolDefinitions = await analyzer.FindUsagesAsync(composition, config);
-            var symbolLookup = symbolDefinitions.GroupBy(d => d.Symbol).ToDictionary(g => g.Key, g => g.ToList());
+            var symbolLookup = symbolDefinitions.GroupBy(d => d.Symbol, SymbolEqualityComparer.Default).ToDictionary(g => g.Key, g => g.ToList(), SymbolEqualityComparer.Default);
             var rootNode = composition.RootNode;
             foreach (var definition in symbolDefinitions)
             {
-                if (!(definition.Symbol is ITypeSymbol typeSymbol))
+                if (definition.Symbol is not ITypeSymbol typeSymbol)
                     continue;
                 if (typeSymbol.TypeKind == TypeKind.TypeParameter)
                     continue;

Source/MDK/Commands/DeployProjectCommand.cs

@@ -18,6 +18,7 @@ public DeployProjectCommand(ExtendedPackage package) : base(package)
 
         protected override async void OnExecute()
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             if (!TryGetValidProject(out Project project, out _))
             {
                 VsShellUtilities.ShowMessageBox(ServiceProvider, Text.ProjectOptionsCommand_OnExecute_NoMDKProjectsDescription, Text.ProjectOptionsCommand_OnExecute_NoMDKProjects, OLEMSGICON.OLEMSGICON_INFO, OLEMSGBUTTON.OLEMSGBUTTON_OK, OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);

Source/MDK/Commands/ProjectDependentCommand.cs

@@ -3,6 +3,7 @@
 using EnvDTE;
 using Malware.MDKServices;
 using MDK.VisualStudio;
+using Microsoft.VisualStudio.Shell;
 using Command = MDK.VisualStudio.Command;
 
 namespace MDK.Commands
@@ -14,18 +15,24 @@ protected ProjectDependentCommand(ExtendedPackage package) : base(package)
 
         protected override void OnBeforeQueryStatus()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var package = (MDKPackage)Package;
             OleCommand.Visible = package.IsEnabled && TryGetValidProject(out _);
         }
 
         protected bool TryGetValidProject(out Project project, out MDKProjectProperties projectProperties)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var package = (MDKPackage)Package;
             package.Echo("MDK Command", Id, "is attempting to retrieve an MDK project");
             var dte2 = (EnvDTE80.DTE2)Package.DTE;
             project = ((IEnumerable)dte2.ToolWindows.SolutionExplorer.SelectedItems)
                 .OfType<UIHierarchyItem>()
-                .Select(item => item.Object)
+                .Select(item =>
+                {
+                    ThreadHelper.ThrowIfNotOnUIThread();
+                    return item.Object;
+                })
                 .OfType<Project>()
                 .FirstOrDefault();
             if (project == null)
@@ -45,6 +52,9 @@ protected bool TryGetValidProject(out Project project, out MDKProjectProperties
         }
 
         protected bool TryGetValidProject(out MDKProjectProperties projectProperties)
-            => TryGetValidProject(out _, out projectProperties);
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+            return TryGetValidProject(out _, out projectProperties);
+        }
     }
 }

Source/MDK/Commands/ProjectOptionsCommand.cs

@@ -23,6 +23,7 @@ public ProjectOptionsCommand(ExtendedPackage package) : base(package)
 
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!TryGetValidProject(out MDKProjectProperties projectInfo))
             {
                 VsShellUtilities.ShowMessageBox(ServiceProvider, Text.ProjectOptionsCommand_OnExecute_NoMDKProjectsDescription, Text.ProjectOptionsCommand_OnExecute_NoMDKProjects, OLEMSGICON.OLEMSGICON_INFO, OLEMSGBUTTON.OLEMSGBUTTON_OK, OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);

Source/MDK/Commands/RefreshWhitelistCacheCommand.cs

@@ -24,6 +24,7 @@ protected override void OnBeforeQueryStatus()
 
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             var package = (MDKPackage)Package;
 
             if (RefreshWhitelistCacheDialog.ShowDialog(new RefreshWhitelistCacheDialogModel(package, package.DTE)) == true)

Source/MDK/Commands/ScriptManagerCommand.cs

@@ -19,6 +19,7 @@ public BlueprintManagerCommand(ExtendedPackage package) : base(package)
 
         protected override void OnExecute()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (!TryGetValidProject(out MDKProjectProperties projectInfo))
             {
                 VsShellUtilities.ShowMessageBox(ServiceProvider, Text.BlueprintManagerCommand_OnExecute_NoMDKProjectsDescription, Text.BlueprintManagerCommand_OnExecute_NoMDKProjects, OLEMSGICON.OLEMSGICON_INFO, OLEMSGBUTTON.OLEMSGBUTTON_OK, OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);