didChangeConfiguration message and general settings support

Author: TylerLeonhardt

src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/TextDocumentHandler.cs

@@ -18,15 +18,9 @@ class TextDocumentHandler : ITextDocumentSyncHandler
     {
 
         private readonly ILogger _logger;
-        private readonly ILanguageServer _languageServer;
         private readonly AnalysisService _analysisService;
         private readonly WorkspaceService _workspaceService;
 
-        private Dictionary<string, Dictionary<string, MarkerCorrection>> codeActionsPerFile =
-            new Dictionary<string, Dictionary<string, MarkerCorrection>>();
-
-        private static CancellationTokenSource s_existingRequestCancellation;
-
         private readonly DocumentSelector _documentSelector = new DocumentSelector(
             new DocumentFilter()
             {
@@ -38,10 +32,9 @@ class TextDocumentHandler : ITextDocumentSyncHandler
 
         public TextDocumentSyncKind Change => TextDocumentSyncKind.Incremental;
 
-        public TextDocumentHandler(ILoggerFactory factory, ILanguageServer languageServer, AnalysisService analysisService, WorkspaceService workspaceService)
+        public TextDocumentHandler(ILoggerFactory factory, AnalysisService analysisService, WorkspaceService workspaceService)
         {
             _logger = factory.CreateLogger<TextDocumentHandler>();
-            _languageServer = languageServer;
             _analysisService = analysisService;
             _workspaceService = workspaceService;
         }

src/PowerShellEditorServices.Engine/Services/Workspace/LanguageServerSettings.cs

@@ -178,6 +178,10 @@ public class CodeFormattingSettings
         /// </summary>>
         public CodeFormattingSettings()
         {
+<<<<<<< HEAD
+=======
+
+>>>>>>> didChangeConfiguration message and general settings support
         }
 
         /// <summary>

test/Pester/EditorServices.Integration.Tests.ps1

@@ -117,11 +117,7 @@ function Get-Foo {
         # ReportLogErrors -LogPath $psesServer.LogPath -FromIndex ([ref]$logIdx)
     }
 
-<<<<<<< HEAD
     It "Can get Diagnostics after opening a text document" {
-=======
-    It "Can get Diagnostics" {
->>>>>>> Added Diagnostics
         $script = '$a = 4'
         $file = Set-Content -Path (Join-Path $TestDrive "$([System.IO.Path]::GetRandomFileName()).ps1") -Value $script -PassThru -Force