addressed issues in PR

Author: Justin Chen

src/PowerShellEditorServices/Services/TextDocument/Handlers/PsesSemanticTokensHandler.cs

@@ -33,10 +33,12 @@ internal class PsesSemanticTokensHandler : SemanticTokensHandler
                 }),
             RangeProvider = true
         };
+
         private readonly ILogger _logger;
         private readonly WorkspaceService _workspaceService;
 
-        public PsesSemanticTokensHandler(ILogger<PsesSemanticTokensHandler> logger, WorkspaceService workspaceService) : base(s_registrationOptions)
+        public PsesSemanticTokensHandler(ILogger<PsesSemanticTokensHandler> logger, WorkspaceService workspaceService)
+            : base(s_registrationOptions)
         {
             _logger = logger;
             _workspaceService = workspaceService;
@@ -59,7 +61,7 @@ private static void PushToken(Token token, SemanticTokensBuilder builder)
             {
                 builder.Push(
                     sToken.Line,
-                    sToken.Index,
+                    sToken.Column,
                     length: sToken.Text.Length,
                     sToken.Type,
                     tokenModifiers: sToken.TokenModifiers);
@@ -88,12 +90,13 @@ internal static IEnumerable<SemanticToken> ConvertToSemanticTokens(Token token)
                 yield break;
             }
 
-            //Tokens line and col numbers indexed starting from 1, expecting indexing from 0
-            int line = token.Extent.StartLineNumber - 1;
-            int index = token.Extent.StartColumnNumber - 1;
-            SemanticToken sToken = new SemanticToken(token.Text, mappedType,
-                line, index, Array.Empty<string>());
-            yield return sToken;
+            //Note that both column and line numbers are 0-based
+            yield return new SemanticToken(
+                token.Text,
+                mappedType,
+                line: token.Extent.StartLineNumber - 1,
+                column: token.Extent.StartColumnNumber - 1,
+                tokenModifiers: Array.Empty<string>());
         }
 
         private static SemanticTokenType MapSemanticTokenType(Token token)

src/PowerShellEditorServices/Services/TextDocument/SemanticToken.cs

@@ -5,23 +5,23 @@ namespace Microsoft.PowerShell.EditorServices.Services.TextDocument
 {
     internal class SemanticToken
     {
-        public SemanticToken(string text, SemanticTokenType type, int line, int index, IEnumerable<string> tokenModifiers)
+        public SemanticToken(string text, SemanticTokenType type, int line, int column, IEnumerable<string> tokenModifiers)
         {
             Line = line;
             Text = text;
-            Index = index;
+            Column = column;
             Type = type;
             TokenModifiers = tokenModifiers;
         }
 
-        public string Text {get; set;}
+        public string Text { get; set ;}
 
-        public int Line {get; set;}
+        public int Line { get; set; }
 
-        public int Index {get; set;}
+        public int Column { get; set; }
 
-        public SemanticTokenType Type {get; set;}
+        public SemanticTokenType Type { get; set; }
 
-        public IEnumerable<string> TokenModifiers {get; set;}
+        public IEnumerable<string> TokenModifiers { get; set; }
     }
 }