fix review comments

Signed-off-by: Yevhen Vydolob <yvydolob@redhat.com>

Author: evidolob

src/languageservice/services/validation/unused-anchors.ts

@@ -41,7 +41,7 @@ export class UnusedAnchorsValidator implements AdditionalValidator {
           );
           const warningDiagnostic = Diagnostic.create(range, `Unused anchor "${aToken.source}"`, DiagnosticSeverity.Hint, 0);
           warningDiagnostic.tags = [DiagnosticTag.Unnecessary];
-          warningDiagnostic.data = { range, name: aToken.source };
+          warningDiagnostic.data = { name: aToken.source };
           result.push(warningDiagnostic);
         }
       }

src/languageservice/services/yamlCodeActions.ts

@@ -21,7 +21,7 @@ import * as path from 'path';
 import { TextBuffer } from '../utils/textBuffer';
 import { LanguageSettings } from '../yamlLanguageService';
 import { YAML_SOURCE } from '../parser/jsonParser07';
-import { getLastWhitespaceAfterChar } from '../utils/strings';
+import { getFirstNonWhitespaceCharacterAfterOffset } from '../utils/strings';
 
 interface YamlDiagnosticData {
   schemaUri: string[];
@@ -171,9 +171,10 @@ export class YamlCodeActions {
     const buffer = new TextBuffer(document);
     for (const diag of diagnostics) {
       if (diag.message.startsWith('Unused anchor') && diag.source === YAML_SOURCE) {
-        const { range, name } = diag.data as { range: Range; name: string };
+        const { name } = diag.data as { name: string };
+        const range = Range.create(diag.range.start, diag.range.end);
         const lineContent = buffer.getLineContent(range.end.line);
-        const lastWhitespaceChar = getLastWhitespaceAfterChar(lineContent, range.end.character);
+        const lastWhitespaceChar = getFirstNonWhitespaceCharacterAfterOffset(lineContent, range.end.character);
         range.end.character = lastWhitespaceChar;
         const action = CodeAction.create(
           `Delete unused anchor: ${name}`,

src/languageservice/utils/strings.ts

@@ -76,7 +76,7 @@ export function safeCreateUnicodeRegExp(pattern: string): RegExp {
   }
 }
 
-export function getLastWhitespaceAfterChar(str: string, offset: number): number {
+export function getFirstNonWhitespaceCharacterAfterOffset(str: string, offset: number): number {
   offset++;
   for (let i = offset; i < str.length; i++) {
     const char = str.charAt(i);

test/utils/verifyError.ts

@@ -53,7 +53,7 @@ export function createUnusedAnchorDiagnostic(
     'YAML'
   );
   diagnostic.tags = [DiagnosticTag.Unnecessary];
-  diagnostic.data = { range: Range.create(startLine, startCharacter, endLine, endCharacter), name };
+  diagnostic.data = { name };
   return diagnostic;
 }