Fix issue with language server not issuing warning errors and throwin…

…g wrong duplicate key matches
redhat-developer · Jan 22, 2020 · 20a8b07 · 20a8b07
1 parent 65a22fe
commit 20a8b07
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/languageservice/parser/yamlParser07.ts b/src/languageservice/parser/yamlParser07.ts
@@ -191,9 +191,8 @@ function createJSONDocument(yamlDoc: Yaml.YAMLNode, startPositions: number[], te
 
     //Patch ontop of yaml-ast-parser to disable duplicate key message on merge key
     const isDuplicateAndNotMergeKey = function (error: Yaml.YAMLException, yamlText: string) {
-        const errorConverted = convertError(error);
-        const errorStart = errorConverted.range.start.character;
-        const errorEnd = errorConverted.range.end.character;
+        const errorStart = error.mark.position;
+        const errorEnd = error.mark.position + error.mark.column;
         if (error.reason === duplicateKeyReason && yamlText.substring(errorStart, errorEnd).startsWith('<<')) {
             return false;
         }

diff --git a/src/languageservice/services/yamlValidation.ts b/src/languageservice/services/yamlValidation.ts
@@ -51,6 +51,9 @@ export class YAMLValidation {
             if (syd.errors.length > 0) {
                 validationResult.push(...syd.errors);
             }
+            if (syd.warnings.length > 0) {
+                validationResult.push(...syd.warnings);
+            }
 
             validationResult.push(...validation);
             index++;