changed name to PsesSemanticTokensHandler

Justin Chen · Justin Chen · commit d4a86ac7c720 · 2020-07-30T09:45:00.000-07:00
diff --git a/src/PowerShellEditorServices/Server/PsesLanguageServer.cs b/src/PowerShellEditorServices/Server/PsesLanguageServer.cs
@@ -92,7 +92,7 @@ public async Task StartAsync()
                     .WithHandler<GetCommandHandler>()
                     .WithHandler<ShowHelpHandler>()
                     .WithHandler<ExpandAliasHandler>()
-                    .WithHandler<PsesSemanticTokens>()
+                    .WithHandler<PsesSemanticTokensHandler>()
                     .OnInitialize(
                         async (languageServer, request, cancellationToken) =>
                         {
diff --git a/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokens.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokens.cs
@@ -19,7 +19,7 @@
 
 namespace Microsoft.PowerShell.EditorServices.Handlers
 {
-    internal class PsesSemanticTokens : SemanticTokensHandler
+    internal class PsesSemanticTokensHandler : SemanticTokensHandler
     {
         private readonly ILogger _logger;
         private readonly WorkspaceService _workspaceService;
@@ -33,7 +33,7 @@ internal class PsesSemanticTokens : SemanticTokensHandler
             RangeProvider = true
         };
 
-        public PsesSemanticTokens(ILogger<PsesSemanticTokens> logger, WorkspaceService workspaceService) : base(s_registrationOptions)
+        public PsesSemanticTokensHandler(ILogger<PsesSemanticTokensHandler> logger, WorkspaceService workspaceService) : base(s_registrationOptions)
         {
             _logger = logger;
             _workspaceService = workspaceService;
diff --git a/test/PowerShellEditorServices.Test/Language/SemanticTokenTest.cs b/test/PowerShellEditorServices.Test/Language/SemanticTokenTest.cs
@@ -36,7 +36,7 @@ function Get-Sum {
 
             foreach (Token t in scriptFile.ScriptTokens)
             {
-                List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(t));
+                List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(t));
                 switch (t.Text)
                 {
                     case "function":
@@ -72,12 +72,12 @@ public async Task TokenizesStringExpansion()
                 Version.Parse("5.0"));
 
             Token commandToken = scriptFile.ScriptTokens[0];
-            List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(commandToken));
+            List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(commandToken));
             Assert.Single(mappedTokens);
             Assert.Equal(SemanticTokenType.Function, mappedTokens[0].Type);
 
             Token stringExpandableToken = scriptFile.ScriptTokens[1];
-            mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(stringExpandableToken));
+            mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(stringExpandableToken));
             Assert.Collection(mappedTokens,
                 sToken => Assert.Equal(SemanticTokenType.Function, sToken.Type),
                 sToken => Assert.Equal(SemanticTokenType.Function, sToken.Type),
@@ -101,7 +101,7 @@ function Get-A*A {
 
             foreach (Token t in scriptFile.ScriptTokens)
             {
-                List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(t));
+                List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(t));
                 switch (t.Text)
                 {
                     case "function":
@@ -126,7 +126,7 @@ public async Task RecognizesArrayMemberInExpandableString()
 
             foreach (Token t in scriptFile.ScriptTokens)
             {
-                List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(t));
+                List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(t));
                 switch (t.Text)
                 {
                     case "$Array":
@@ -149,7 +149,7 @@ public async Task RecognizesCurlyQuotedString()
                 text,
                 Version.Parse("5.0"));
 
-            List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(scriptFile.ScriptTokens[0]));
+            List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(scriptFile.ScriptTokens[0]));
             Assert.Collection(mappedTokens, sToken => Assert.Equal(SemanticTokenType.String, mappedTokens[0].Type));
         }
 
@@ -171,7 +171,7 @@ enum MyEnum{
 
             foreach (Token t in scriptFile.ScriptTokens)
             {
-                List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(t));
+                List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(t));
                 switch (t.Text)
                 {
                     case "enum":

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public async Task StartAsync()`
`92`	`92`	`.WithHandler<GetCommandHandler>()`
`93`	`93`	`.WithHandler<ShowHelpHandler>()`
`94`	`94`	`.WithHandler<ExpandAliasHandler>()`
`95`		`- .WithHandler<PsesSemanticTokens>()`
	`95`	`+ .WithHandler<PsesSemanticTokensHandler>()`
`96`	`96`	`.OnInitialize(`
`97`	`97`	`async (languageServer, request, cancellationToken) =>`
`98`	`98`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`namespace Microsoft.PowerShell.EditorServices.Handlers`
`21`	`21`	`{`
`22`		`- internal class PsesSemanticTokens : SemanticTokensHandler`
	`22`	`+ internal class PsesSemanticTokensHandler : SemanticTokensHandler`
`23`	`23`	`{`
`24`	`24`	`private readonly ILogger _logger;`
`25`	`25`	`private readonly WorkspaceService _workspaceService;`
`@@ -33,7 +33,7 @@ internal class PsesSemanticTokens : SemanticTokensHandler`
`33`	`33`	`RangeProvider = true`
`34`	`34`	`};`
`35`	`35`
`36`		`- public PsesSemanticTokens(ILogger<PsesSemanticTokens> logger, WorkspaceService workspaceService) : base(s_registrationOptions)`
	`36`	`+ public PsesSemanticTokensHandler(ILogger<PsesSemanticTokensHandler> logger, WorkspaceService workspaceService) : base(s_registrationOptions)`
`37`	`37`	`{`
`38`	`38`	`_logger = logger;`
`39`	`39`	`_workspaceService = workspaceService;`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ function Get-Sum {`
`36`	`36`
`37`	`37`	`foreach (Token t in scriptFile.ScriptTokens)`
`38`	`38`	`{`
`39`		`- List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(t));`
	`39`	`+ List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(t));`
`40`	`40`	`switch (t.Text)`
`41`	`41`	`{`
`42`	`42`	`case "function":`
`@@ -72,12 +72,12 @@ public async Task TokenizesStringExpansion()`
`72`	`72`	`Version.Parse("5.0"));`
`73`	`73`
`74`	`74`	`Token commandToken = scriptFile.ScriptTokens[0];`
`75`		`- List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(commandToken));`
	`75`	`+ List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(commandToken));`
`76`	`76`	`Assert.Single(mappedTokens);`
`77`	`77`	`Assert.Equal(SemanticTokenType.Function, mappedTokens[0].Type);`
`78`	`78`
`79`	`79`	`Token stringExpandableToken = scriptFile.ScriptTokens[1];`
`80`		`- mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(stringExpandableToken));`
	`80`	`+ mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(stringExpandableToken));`
`81`	`81`	`Assert.Collection(mappedTokens,`
`82`	`82`	`sToken => Assert.Equal(SemanticTokenType.Function, sToken.Type),`
`83`	`83`	`sToken => Assert.Equal(SemanticTokenType.Function, sToken.Type),`
`@@ -101,7 +101,7 @@ function Get-A*A {`
`101`	`101`
`102`	`102`	`foreach (Token t in scriptFile.ScriptTokens)`
`103`	`103`	`{`
`104`		`- List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(t));`
	`104`	`+ List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(t));`
`105`	`105`	`switch (t.Text)`
`106`	`106`	`{`
`107`	`107`	`case "function":`
`@@ -126,7 +126,7 @@ public async Task RecognizesArrayMemberInExpandableString()`
`126`	`126`
`127`	`127`	`foreach (Token t in scriptFile.ScriptTokens)`
`128`	`128`	`{`
`129`		`- List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(t));`
	`129`	`+ List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(t));`
`130`	`130`	`switch (t.Text)`
`131`	`131`	`{`
`132`	`132`	`case "$Array":`
`@@ -149,7 +149,7 @@ public async Task RecognizesCurlyQuotedString()`
`149`	`149`	`text,`
`150`	`150`	`Version.Parse("5.0"));`
`151`	`151`
`152`		`- List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(scriptFile.ScriptTokens[0]));`
	`152`	`+ List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(scriptFile.ScriptTokens[0]));`
`153`	`153`	`Assert.Collection(mappedTokens, sToken => Assert.Equal(SemanticTokenType.String, mappedTokens[0].Type));`
`154`	`154`	`}`
`155`	`155`
`@@ -171,7 +171,7 @@ enum MyEnum{`
`171`	`171`
`172`	`172`	`foreach (Token t in scriptFile.ScriptTokens)`
`173`	`173`	`{`
`174`		`- List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokens.ConvertToSemanticTokens(t));`
	`174`	`+ List<SemanticToken> mappedTokens = new List<SemanticToken>(PsesSemanticTokensHandler.ConvertToSemanticTokens(t));`
`175`	`175`	`switch (t.Text)`
`176`	`176`	`{`
`177`	`177`	`case "enum":`