Merge remote-tracking branch 'dotnet/master' into merge-master

* dotnet/master:
  Update error code in ConvertIfToSwitch test
  Don't specify OpenClose, default value is false
  Wait for callbacks to complete before returning
  Tell lsp client not to send us open/close notifications

src/EditorFeatures/CSharpTest/CodeActions/ConvertIfToSwitch/ConvertIfToSwitchTests.cs

@@ -2589,7 +2589,7 @@ enum ET1
             };
 
             test.ExpectedDiagnostics.Add(
-                // error CS9004: Program using top-level statements must be an executable.
+                // error CS8805: Program using top-level statements must be an executable.
                 DiagnosticResult.CompilerError("CS8805"));
 
             await test.RunAsync();

src/Features/LanguageServer/Protocol/Handler/Initialize/InitializeHandler.cs

@@ -53,7 +53,11 @@ public Task<LSP.InitializeResult> HandleRequestAsync(Solution solution, LSP.Init
                     DocumentOnTypeFormattingProvider = new LSP.DocumentOnTypeFormattingOptions { FirstTriggerCharacter = "}", MoreTriggerCharacter = new[] { ";", "\n" } },
                     DocumentHighlightProvider = true,
                     ReferencesProvider = true,
-                    ProjectContextProvider = true
+                    ProjectContextProvider = true,
+                    TextDocumentSync = new LSP.TextDocumentSyncOptions
+                    {
+                        Change = LSP.TextDocumentSyncKind.None
+                    }
                 }
             });
         }

src/VisualStudio/Core/Test.Next/Services/LanguageServiceTests.cs

@@ -105,6 +105,8 @@ private async Task<ImmutableArray<SymbolInformation>> GetVsSearchResultsAsync(Te
                     Methods.WorkspaceSymbolName,
                     new object[] { workspaceSymbolParams },
                     CancellationToken.None);
+
+                await awaitableProgress.WaitAsync(CancellationToken.None);
             }
 
             return symbolResultsBuilder.ToImmutableAndFree();

src/Workspaces/Remote/ServiceHub/Services/LanguageServer.cs

@@ -55,6 +55,10 @@ public Task<InitializeResult> InitializeAsync(JToken _1, CancellationToken _2)
                 {
                     DisableGoToWorkspaceSymbols = true,
                     WorkspaceSymbolProvider = true,
+                    TextDocumentSync = new TextDocumentSyncOptions
+                    {
+                        Change = TextDocumentSyncKind.None
+                    }
                 }
             });
         }