Switch to better document selecting (#1218)

TylerLeonhardt · web-flow · commit c005ef7c4a69 · 2020-03-05T13:29:14.000-08:00
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeActionHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeActionHandler.cs
@@ -11,6 +11,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Utility;
 using Newtonsoft.Json.Linq;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
@@ -42,7 +43,7 @@ public CodeActionHandler(ILoggerFactory factory, AnalysisService analysisService
             _workspaceService = workspaceService;
             _registrationOptions = new CodeActionRegistrationOptions
             {
-                DocumentSelector = new DocumentSelector(new DocumentFilter() { Language = "powershell" }),
+                DocumentSelector = LspUtils.PowerShellDocumentSelector,
                 CodeActionKinds = s_supportedCodeActions
             };
         }
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeLensHandlers.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeLensHandlers.cs
@@ -14,6 +14,7 @@
 using Microsoft.PowerShell.EditorServices.Logging;
 using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
@@ -23,13 +24,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class CodeLensHandlers : ICodeLensHandler, ICodeLensResolveHandler
     {
-        private readonly DocumentSelector _documentSelector = new DocumentSelector(
-            new DocumentFilter
-            {
-                Language = "powershell"
-            }
-        );
-
         private readonly ILogger _logger;
         private readonly SymbolsService _symbolsService;
         private readonly WorkspaceService _workspaceService;
@@ -47,7 +41,7 @@ CodeLensRegistrationOptions IRegistration<CodeLensRegistrationOptions>.GetRegist
         {
             return new CodeLensRegistrationOptions
             {
-                DocumentSelector = _documentSelector,
+                DocumentSelector = LspUtils.PowerShellDocumentSelector,
                 ResolveProvider = true
             };
         }
@@ -65,7 +59,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
         {
             return new TextDocumentRegistrationOptions
             {
-                DocumentSelector = _documentSelector,
+                DocumentSelector = LspUtils.PowerShellDocumentSelector,
             };
         }
 
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs
@@ -54,7 +54,7 @@ public CompletionRegistrationOptions GetRegistrationOptions()
         {
             return new CompletionRegistrationOptions
             {
-                DocumentSelector = new DocumentSelector(new DocumentFilter { Language = "powershell" }),
+                DocumentSelector = LspUtils.PowerShellDocumentSelector,
                 ResolveProvider = true,
                 TriggerCharacters = new[] { ".", "-", ":", "\\" }
             };
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/DefinitionHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DefinitionHandler.cs
@@ -19,13 +19,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class DefinitionHandler : IDefinitionHandler
     {
-        private readonly DocumentSelector _documentSelector = new DocumentSelector(
-            new DocumentFilter
-            {
-                Language = "powershell"
-            }
-        );
-
         private readonly ILogger _logger;
         private readonly SymbolsService _symbolsService;
         private readonly WorkspaceService _workspaceService;
@@ -46,7 +39,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
         {
             return new TextDocumentRegistrationOptions
             {
-                DocumentSelector = _documentSelector
+                DocumentSelector = LspUtils.PowerShellDocumentSelector
             };
         }
 
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentHighlightHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentHighlightHandler.cs
@@ -41,7 +41,7 @@ public DocumentHighlightHandler(
             _symbolsService = symbolService;
             _registrationOptions = new TextDocumentRegistrationOptions()
             {
-                DocumentSelector = new DocumentSelector(new DocumentFilter() { Language = "powershell" } )
+                DocumentSelector = LspUtils.PowerShellDocumentSelector
             };
             _logger.LogInformation("highlight handler loaded");
         }
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentSymbolHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentSymbolHandler.cs
@@ -24,13 +24,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class DocumentSymbolHandler : IDocumentSymbolHandler
     {
-        private readonly DocumentSelector _documentSelector = new DocumentSelector(
-            new DocumentFilter
-            {
-                Language = "powershell"
-            }
-        );
-
         private readonly ILogger _logger;
         private readonly WorkspaceService _workspaceService;
 
@@ -54,7 +47,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
         {
             return new TextDocumentRegistrationOptions
             {
-                DocumentSelector = _documentSelector,
+                DocumentSelector = LspUtils.PowerShellDocumentSelector,
             };
         }
 
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/FoldingRangeHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/FoldingRangeHandler.cs
@@ -9,6 +9,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
@@ -17,13 +18,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class FoldingRangeHandler : IFoldingRangeHandler
     {
-        private readonly DocumentSelector _documentSelector = new DocumentSelector(
-            new DocumentFilter()
-            {
-                Language = "powershell"
-            }
-        );
-
         private readonly ILogger _logger;
         private readonly ConfigurationService _configurationService;
         private readonly WorkspaceService _workspaceService;
@@ -40,7 +34,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
         {
             return new TextDocumentRegistrationOptions()
             {
-                DocumentSelector = _documentSelector,
+                DocumentSelector = LspUtils.PowerShellDocumentSelector,
             };
         }
 
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/FormattingHandlers.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/FormattingHandlers.cs
@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
@@ -15,13 +16,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class DocumentFormattingHandler : IDocumentFormattingHandler
     {
-        private readonly DocumentSelector _documentSelector = new DocumentSelector(
-            new DocumentFilter()
-            {
-                Language = "powershell"
-            }
-        );
-
         private readonly ILogger _logger;
         private readonly AnalysisService _analysisService;
         private readonly ConfigurationService _configurationService;
@@ -40,7 +34,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
         {
             return new TextDocumentRegistrationOptions
             {
-                DocumentSelector = _documentSelector
+                DocumentSelector = LspUtils.PowerShellDocumentSelector
             };
         }
 
@@ -93,13 +87,6 @@ public void SetCapability(DocumentFormattingCapability capability)
 
     internal class DocumentRangeFormattingHandler : IDocumentRangeFormattingHandler
     {
-        private readonly DocumentSelector _documentSelector = new DocumentSelector(
-            new DocumentFilter()
-            {
-                Pattern = "**/*.ps*1"
-            }
-        );
-
         private readonly ILogger _logger;
         private readonly AnalysisService _analysisService;
         private readonly ConfigurationService _configurationService;
@@ -118,7 +105,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
         {
             return new TextDocumentRegistrationOptions
             {
-                DocumentSelector = _documentSelector
+                DocumentSelector = LspUtils.PowerShellDocumentSelector
             };
         }
 
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/HoverHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/HoverHandler.cs
@@ -10,6 +10,7 @@
 using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Services.Symbols;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
@@ -18,13 +19,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class HoverHandler : IHoverHandler
     {
-        private readonly DocumentSelector _documentSelector = new DocumentSelector(
-            new DocumentFilter
-            {
-                Language = "powershell"
-            }
-        );
-
         private readonly ILogger _logger;
         private readonly SymbolsService _symbolsService;
         private readonly WorkspaceService _workspaceService;
@@ -48,7 +42,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
         {
             return new TextDocumentRegistrationOptions
             {
-                DocumentSelector = _documentSelector,
+                DocumentSelector = LspUtils.PowerShellDocumentSelector,
             };
         }
 
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/ReferencesHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/ReferencesHandler.cs
@@ -19,13 +19,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     class ReferencesHandler : IReferencesHandler
     {
-        private readonly DocumentSelector _documentSelector = new DocumentSelector(
-            new DocumentFilter()
-            {
-                Language = "powershell"
-            }
-        );
-
         private readonly ILogger _logger;
         private readonly SymbolsService _symbolsService;
         private readonly WorkspaceService _workspaceService;
@@ -42,7 +35,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()
         {
             return new TextDocumentRegistrationOptions
             {
-                DocumentSelector = _documentSelector
+                DocumentSelector = LspUtils.PowerShellDocumentSelector
             };
         }
 
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/SignatureHelpHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/SignatureHelpHandler.cs
@@ -11,6 +11,7 @@
 using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Services.Symbols;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
@@ -20,14 +21,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers
     internal class SignatureHelpHandler : ISignatureHelpHandler
     {
         private static readonly SignatureInformation[] s_emptySignatureResult = Array.Empty<SignatureInformation>();
-
-        private readonly DocumentSelector _documentSelector = new DocumentSelector(
-            new DocumentFilter()
-            {
-                Language = "powershell"
-            }
-        );
-
         private readonly ILogger _logger;
         private readonly SymbolsService _symbolsService;
         private readonly WorkspaceService _workspaceService;
@@ -51,7 +44,7 @@ public SignatureHelpRegistrationOptions GetRegistrationOptions()
         {
             return new SignatureHelpRegistrationOptions
             {
-                DocumentSelector = _documentSelector,
+                DocumentSelector = LspUtils.PowerShellDocumentSelector,
                 // A sane default of " ". We may be able to include others like "-".
                 TriggerCharacters = new Container<string>(" ")
             };
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs
@@ -15,6 +15,7 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities;
+using Microsoft.PowerShell.EditorServices.Utility;
 
 namespace Microsoft.PowerShell.EditorServices.Handlers
 {
@@ -25,14 +26,6 @@ class TextDocumentHandler : ITextDocumentSyncHandler
         private readonly AnalysisService _analysisService;
         private readonly WorkspaceService _workspaceService;
         private readonly RemoteFileManagerService _remoteFileManagerService;
-
-        private readonly DocumentSelector _documentSelector = new DocumentSelector(
-            new DocumentFilter()
-            {
-                Language = "powershell"
-            }
-        );
-
         private SynchronizationCapability _capability;
 
         public TextDocumentSyncKind Change => TextDocumentSyncKind.Incremental;
@@ -72,7 +65,7 @@ TextDocumentChangeRegistrationOptions IRegistration<TextDocumentChangeRegistrati
         {
             return new TextDocumentChangeRegistrationOptions()
             {
-                DocumentSelector = _documentSelector,
+                DocumentSelector = LspUtils.PowerShellDocumentSelector,
                 SyncKind = Change
             };
         }
@@ -101,7 +94,7 @@ TextDocumentRegistrationOptions IRegistration<TextDocumentRegistrationOptions>.G
         {
             return new TextDocumentRegistrationOptions()
             {
-                DocumentSelector = _documentSelector,
+                DocumentSelector = LspUtils.PowerShellDocumentSelector,
             };
         }
 
@@ -138,7 +131,7 @@ TextDocumentSaveRegistrationOptions IRegistration<TextDocumentSaveRegistrationOp
         {
             return new TextDocumentSaveRegistrationOptions()
             {
-                DocumentSelector = _documentSelector,
+                DocumentSelector = LspUtils.PowerShellDocumentSelector,
                 IncludeText = true
             };
         }
diff --git a/src/PowerShellEditorServices/Utility/LspUtils.cs b/src/PowerShellEditorServices/Utility/LspUtils.cs
@@ -0,0 +1,27 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace Microsoft.PowerShell.EditorServices.Utility
+{
+    internal static class LspUtils
+    {
+        public static DocumentSelector PowerShellDocumentSelector => new DocumentSelector(
+            DocumentFilter.ForLanguage("powershell"),
+            DocumentFilter.ForLanguage("pwsh"),
+
+            // The vim extension sets all PowerShell files as language "ps1" so this
+            // makes sure we track those.
+            DocumentFilter.ForLanguage("ps1"),
+            DocumentFilter.ForLanguage("psm1"),
+            DocumentFilter.ForLanguage("psd1"),
+
+            // Also specify the file extensions to be thorough
+            // This won't handle untitled files which is why we have to do the ones above.
+            DocumentFilter.ForPattern("**/*.ps*1")
+        );
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`using Microsoft.PowerShell.EditorServices.Logging;`
`15`	`15`	`using Microsoft.PowerShell.EditorServices.Services;`
`16`	`16`	`using Microsoft.PowerShell.EditorServices.Services.TextDocument;`
	`17`	`+using Microsoft.PowerShell.EditorServices.Utility;`
`17`	`18`	`using OmniSharp.Extensions.LanguageServer.Protocol;`
`18`	`19`	`using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;`
`19`	`20`	`using OmniSharp.Extensions.LanguageServer.Protocol.Models;`
`@@ -23,13 +24,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers`
`23`	`24`	`{`
`24`	`25`	`internal class CodeLensHandlers : ICodeLensHandler, ICodeLensResolveHandler`
`25`	`26`	`{`
`26`		`- private readonly DocumentSelector _documentSelector = new DocumentSelector(`
`27`		`- new DocumentFilter`
`28`		`- {`
`29`		`- Language = "powershell"`
`30`		`- }`
`31`		`- );`
`32`		`-`
`33`	`27`	`private readonly ILogger _logger;`
`34`	`28`	`private readonly SymbolsService _symbolsService;`
`35`	`29`	`private readonly WorkspaceService _workspaceService;`
`@@ -47,7 +41,7 @@ CodeLensRegistrationOptions IRegistration<CodeLensRegistrationOptions>.GetRegist`
`47`	`41`	`{`
`48`	`42`	`return new CodeLensRegistrationOptions`
`49`	`43`	`{`
`50`		`- DocumentSelector = _documentSelector,`
	`44`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector,`
`51`	`45`	`ResolveProvider = true`
`52`	`46`	`};`
`53`	`47`	`}`
`@@ -65,7 +59,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()`
`65`	`59`	`{`
`66`	`60`	`return new TextDocumentRegistrationOptions`
`67`	`61`	`{`
`68`		`- DocumentSelector = _documentSelector,`
	`62`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector,`
`69`	`63`	`};`
`70`	`64`	`}`
`71`	`65`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public CompletionRegistrationOptions GetRegistrationOptions()`
`54`	`54`	`{`
`55`	`55`	`return new CompletionRegistrationOptions`
`56`	`56`	`{`
`57`		`- DocumentSelector = new DocumentSelector(new DocumentFilter { Language = "powershell" }),`
	`57`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector,`
`58`	`58`	`ResolveProvider = true,`
`59`	`59`	`TriggerCharacters = new[] { ".", "-", ":", "\\" }`
`60`	`60`	`};`
Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers`
`19`	`19`	`{`
`20`	`20`	`internal class DefinitionHandler : IDefinitionHandler`
`21`	`21`	`{`
`22`		`- private readonly DocumentSelector _documentSelector = new DocumentSelector(`
`23`		`- new DocumentFilter`
`24`		`- {`
`25`		`- Language = "powershell"`
`26`		`- }`
`27`		`- );`
`28`		`-`
`29`	`22`	`private readonly ILogger _logger;`
`30`	`23`	`private readonly SymbolsService _symbolsService;`
`31`	`24`	`private readonly WorkspaceService _workspaceService;`
`@@ -46,7 +39,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()`
`46`	`39`	`{`
`47`	`40`	`return new TextDocumentRegistrationOptions`
`48`	`41`	`{`
`49`		`- DocumentSelector = _documentSelector`
	`42`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector`
`50`	`43`	`};`
`51`	`44`	`}`
`52`	`45`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public DocumentHighlightHandler(`
`41`	`41`	`_symbolsService = symbolService;`
`42`	`42`	`_registrationOptions = new TextDocumentRegistrationOptions()`
`43`	`43`	`{`
`44`		`- DocumentSelector = new DocumentSelector(new DocumentFilter() { Language = "powershell" } )`
	`44`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector`
`45`	`45`	`};`
`46`	`46`	`_logger.LogInformation("highlight handler loaded");`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers`
`24`	`24`	`{`
`25`	`25`	`internal class DocumentSymbolHandler : IDocumentSymbolHandler`
`26`	`26`	`{`
`27`		`- private readonly DocumentSelector _documentSelector = new DocumentSelector(`
`28`		`- new DocumentFilter`
`29`		`- {`
`30`		`- Language = "powershell"`
`31`		`- }`
`32`		`- );`
`33`		`-`
`34`	`27`	`private readonly ILogger _logger;`
`35`	`28`	`private readonly WorkspaceService _workspaceService;`
`36`	`29`
`@@ -54,7 +47,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()`
`54`	`47`	`{`
`55`	`48`	`return new TextDocumentRegistrationOptions`
`56`	`49`	`{`
`57`		`- DocumentSelector = _documentSelector,`
	`50`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector,`
`58`	`51`	`};`
`59`	`52`	`}`
`60`	`53`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using Microsoft.Extensions.Logging;`
`10`	`10`	`using Microsoft.PowerShell.EditorServices.Services;`
`11`	`11`	`using Microsoft.PowerShell.EditorServices.Services.TextDocument;`
	`12`	`+using Microsoft.PowerShell.EditorServices.Utility;`
`12`	`13`	`using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;`
`13`	`14`	`using OmniSharp.Extensions.LanguageServer.Protocol.Models;`
`14`	`15`	`using OmniSharp.Extensions.LanguageServer.Protocol.Server;`
`@@ -17,13 +18,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers`
`17`	`18`	`{`
`18`	`19`	`internal class FoldingRangeHandler : IFoldingRangeHandler`
`19`	`20`	`{`
`20`		`- private readonly DocumentSelector _documentSelector = new DocumentSelector(`
`21`		`- new DocumentFilter()`
`22`		`- {`
`23`		`- Language = "powershell"`
`24`		`- }`
`25`		`- );`
`26`		`-`
`27`	`21`	`private readonly ILogger _logger;`
`28`	`22`	`private readonly ConfigurationService _configurationService;`
`29`	`23`	`private readonly WorkspaceService _workspaceService;`
`@@ -40,7 +34,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()`
`40`	`34`	`{`
`41`	`35`	`return new TextDocumentRegistrationOptions()`
`42`	`36`	`{`
`43`		`- DocumentSelector = _documentSelector,`
	`37`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector,`
`44`	`38`	`};`
`45`	`39`	`}`
`46`	`40`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`	`using Microsoft.Extensions.Logging;`
`9`	`9`	`using Microsoft.PowerShell.EditorServices.Services;`
	`10`	`+using Microsoft.PowerShell.EditorServices.Utility;`
`10`	`11`	`using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;`
`11`	`12`	`using OmniSharp.Extensions.LanguageServer.Protocol.Models;`
`12`	`13`	`using OmniSharp.Extensions.LanguageServer.Protocol.Server;`
`@@ -15,13 +16,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers`
`15`	`16`	`{`
`16`	`17`	`internal class DocumentFormattingHandler : IDocumentFormattingHandler`
`17`	`18`	`{`
`18`		`- private readonly DocumentSelector _documentSelector = new DocumentSelector(`
`19`		`- new DocumentFilter()`
`20`		`- {`
`21`		`- Language = "powershell"`
`22`		`- }`
`23`		`- );`
`24`		`-`
`25`	`19`	`private readonly ILogger _logger;`
`26`	`20`	`private readonly AnalysisService _analysisService;`
`27`	`21`	`private readonly ConfigurationService _configurationService;`
`@@ -40,7 +34,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()`
`40`	`34`	`{`
`41`	`35`	`return new TextDocumentRegistrationOptions`
`42`	`36`	`{`
`43`		`- DocumentSelector = _documentSelector`
	`37`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector`
`44`	`38`	`};`
`45`	`39`	`}`
`46`	`40`
`@@ -93,13 +87,6 @@ public void SetCapability(DocumentFormattingCapability capability)`
`93`	`87`
`94`	`88`	`internal class DocumentRangeFormattingHandler : IDocumentRangeFormattingHandler`
`95`	`89`	`{`
`96`		`- private readonly DocumentSelector _documentSelector = new DocumentSelector(`
`97`		`- new DocumentFilter()`
`98`		`- {`
`99`		`- Pattern = "*/.ps*1"`
`100`		`- }`
`101`		`- );`
`102`		`-`
`103`	`90`	`private readonly ILogger _logger;`
`104`	`91`	`private readonly AnalysisService _analysisService;`
`105`	`92`	`private readonly ConfigurationService _configurationService;`
`@@ -118,7 +105,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()`
`118`	`105`	`{`
`119`	`106`	`return new TextDocumentRegistrationOptions`
`120`	`107`	`{`
`121`		`- DocumentSelector = _documentSelector`
	`108`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector`
`122`	`109`	`};`
`123`	`110`	`}`
`124`	`111`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`using Microsoft.PowerShell.EditorServices.Services;`
`11`	`11`	`using Microsoft.PowerShell.EditorServices.Services.Symbols;`
`12`	`12`	`using Microsoft.PowerShell.EditorServices.Services.TextDocument;`
	`13`	`+using Microsoft.PowerShell.EditorServices.Utility;`
`13`	`14`	`using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;`
`14`	`15`	`using OmniSharp.Extensions.LanguageServer.Protocol.Models;`
`15`	`16`	`using OmniSharp.Extensions.LanguageServer.Protocol.Server;`
`@@ -18,13 +19,6 @@ namespace Microsoft.PowerShell.EditorServices.Handlers`
`18`	`19`	`{`
`19`	`20`	`internal class HoverHandler : IHoverHandler`
`20`	`21`	`{`
`21`		`- private readonly DocumentSelector _documentSelector = new DocumentSelector(`
`22`		`- new DocumentFilter`
`23`		`- {`
`24`		`- Language = "powershell"`
`25`		`- }`
`26`		`- );`
`27`		`-`
`28`	`22`	`private readonly ILogger _logger;`
`29`	`23`	`private readonly SymbolsService _symbolsService;`
`30`	`24`	`private readonly WorkspaceService _workspaceService;`
`@@ -48,7 +42,7 @@ public TextDocumentRegistrationOptions GetRegistrationOptions()`
`48`	`42`	`{`
`49`	`43`	`return new TextDocumentRegistrationOptions`
`50`	`44`	`{`
`51`		`- DocumentSelector = _documentSelector,`
	`45`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector,`
`52`	`46`	`};`
`53`	`47`	`}`
`54`	`48`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`using OmniSharp.Extensions.LanguageServer.Protocol.Models;`
`16`	`16`	`using OmniSharp.Extensions.LanguageServer.Protocol.Server;`
`17`	`17`	`using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities;`
	`18`	`+using Microsoft.PowerShell.EditorServices.Utility;`
`18`	`19`
`19`	`20`	`namespace Microsoft.PowerShell.EditorServices.Handlers`
`20`	`21`	`{`
`@@ -25,14 +26,6 @@ class TextDocumentHandler : ITextDocumentSyncHandler`
`25`	`26`	`private readonly AnalysisService _analysisService;`
`26`	`27`	`private readonly WorkspaceService _workspaceService;`
`27`	`28`	`private readonly RemoteFileManagerService _remoteFileManagerService;`
`28`		`-`
`29`		`- private readonly DocumentSelector _documentSelector = new DocumentSelector(`
`30`		`- new DocumentFilter()`
`31`		`- {`
`32`		`- Language = "powershell"`
`33`		`- }`
`34`		`- );`
`35`		`-`
`36`	`29`	`private SynchronizationCapability _capability;`
`37`	`30`
`38`	`31`	`public TextDocumentSyncKind Change => TextDocumentSyncKind.Incremental;`
`@@ -72,7 +65,7 @@ TextDocumentChangeRegistrationOptions IRegistration<TextDocumentChangeRegistrati`
`72`	`65`	`{`
`73`	`66`	`return new TextDocumentChangeRegistrationOptions()`
`74`	`67`	`{`
`75`		`- DocumentSelector = _documentSelector,`
	`68`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector,`
`76`	`69`	`SyncKind = Change`
`77`	`70`	`};`
`78`	`71`	`}`
`@@ -101,7 +94,7 @@ TextDocumentRegistrationOptions IRegistration<TextDocumentRegistrationOptions>.G`
`101`	`94`	`{`
`102`	`95`	`return new TextDocumentRegistrationOptions()`
`103`	`96`	`{`
`104`		`- DocumentSelector = _documentSelector,`
	`97`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector,`
`105`	`98`	`};`
`106`	`99`	`}`
`107`	`100`
`@@ -138,7 +131,7 @@ TextDocumentSaveRegistrationOptions IRegistration<TextDocumentSaveRegistrationOp`
`138`	`131`	`{`
`139`	`132`	`return new TextDocumentSaveRegistrationOptions()`
`140`	`133`	`{`
`141`		`- DocumentSelector = _documentSelector,`
	`134`	`+ DocumentSelector = LspUtils.PowerShellDocumentSelector,`
`142`	`135`	`IncludeText = true`
`143`	`136`	`};`
`144`	`137`	`}`