Sync with upstream

README.md

@@ -55,6 +55,10 @@ rules/tags added to `warn_list`
 (see [Ansible Lint Documentation](https://ansible-lint.readthedocs.io/en/latest/configuring.html))
 are shown as warnings instead.
 
+> If you also install `yamllint`, `ansible-lint` will detect it and incorporate
+> into the linting process. Any findings reported by `yamllint` will be exposed
+> in VSCode as errors/warnings.
+
 ### Smart autocompletion
 ![Autocompletion](images/smart-completions.gif)
 
@@ -92,7 +96,8 @@ holding `ctrl`/`cmd`.
 ## Requirements
 - [Ansible 2.9+](https://docs.ansible.com/ansible/latest/index.html)
 - [Ansible Lint](https://ansible-lint.readthedocs.io/en/latest/) (required,
-  unless you disable linter support; install without `yamllint`)
+  unless you disable linter support)
+- [yamllint](https://yamllint.readthedocs.io/en/stable/) (optional)
 
 For Windows users, this extension works perfectly well with extensions such as
 `Remote - WSL` and `Remote - Containers`.

src/providers/completionProvider.ts

@@ -6,7 +6,6 @@ import {
   TextEdit,
 } from 'vscode-languageserver';
 import { Position, TextDocument } from 'vscode-languageserver-textdocument';
-import { parseAllDocuments } from 'yaml';
 import { Node, Pair, Scalar, YAMLMap } from 'yaml/types';
 import { IOption } from '../interfaces/module';
 import { WorkspaceFolderContext } from '../services/workspaceManager';
@@ -24,11 +23,13 @@ import {
   findProvidedModule,
   getDeclaredCollections,
   getPathAt,
+  getOrigRange,
   getYamlMapKeys,
   isBlockParam,
   isPlayParam,
   isRoleParam,
   isTaskParam,
+  parseAllDocuments,
 } from '../utils/yaml';
 
 const priorityMap = {
@@ -293,9 +294,10 @@ function getKeywordCompletion(
  * the node has range information and is a string scalar.
  */
 function getNodeRange(node: Node, document: TextDocument): Range | undefined {
-  if (node.range && node instanceof Scalar && typeof node.value === 'string') {
-    const start = node.range[0];
-    let end = node.range[1];
+  const range = getOrigRange(node);
+  if (range && node instanceof Scalar && typeof node.value === 'string') {
+    const start = range[0];
+    let end = range[1];
     // compensate for `_:`
     if (node.value.includes('_:')) {
       end -= 2;

src/providers/definitionProvider.ts

@@ -1,10 +1,15 @@
 import { DefinitionLink, Range } from 'vscode-languageserver';
 import { Position, TextDocument } from 'vscode-languageserver-textdocument';
-import { parseAllDocuments } from 'yaml';
 import { Scalar } from 'yaml/types';
 import { DocsLibrary } from '../services/docsLibrary';
 import { toLspRange } from '../utils/misc';
-import { AncestryBuilder, getPathAt, isTaskParam } from '../utils/yaml';
+import {
+  AncestryBuilder,
+  getOrigRange,
+  getPathAt,
+  isTaskParam,
+  parseAllDocuments,
+} from '../utils/yaml';
 
 export async function getDefinition(
   document: TextDocument,
@@ -26,11 +31,12 @@ export async function getDefinition(
           document.uri
         );
         if (module) {
+          const range = getOrigRange(node);
           return [
             {
               targetUri: module.source,
-              originSelectionRange: node.range
-                ? toLspRange(node.range, document)
+              originSelectionRange: range
+                ? toLspRange(range, document)
                 : undefined,
               targetRange: Range.create(
                 module.sourceLineRange[0],

src/providers/hoverProvider.ts

@@ -1,6 +1,5 @@
 import { Hover, MarkupContent, MarkupKind } from 'vscode-languageserver';
 import { Position, TextDocument } from 'vscode-languageserver-textdocument';
-import { parseAllDocuments } from 'yaml';
 import { Scalar, YAMLMap } from 'yaml/types';
 import { DocsLibrary } from '../services/docsLibrary';
 import {
@@ -19,11 +18,13 @@ import { toLspRange } from '../utils/misc';
 import {
   AncestryBuilder,
   findProvidedModule,
+  getOrigRange,
   getPathAt,
   isBlockParam,
   isPlayParam,
   isRoleParam,
   isTaskParam,
+  parseAllDocuments,
 } from '../utils/yaml';
 
 export async function doHover(
@@ -60,23 +61,22 @@ export async function doHover(
             path,
             document.uri
           );
+          const range = getOrigRange(node);
           if (module && module.documentation) {
             return {
               contents: formatModule(
                 module.documentation,
                 docsLibrary.getModuleRoute(hitFqcn || node.value)
               ),
-              range: node.range ? toLspRange(node.range, document) : undefined,
+              range: range ? toLspRange(range, document) : undefined,
             };
           } else if (hitFqcn) {
             // check for tombstones
             const route = docsLibrary.getModuleRoute(hitFqcn);
             if (route) {
               return {
                 contents: formatTombstone(route),
-                range: node.range
-                  ? toLspRange(node.range, document)
-                  : undefined,
+                range: range ? toLspRange(range, document) : undefined,
               };
             }
           }
@@ -136,9 +136,10 @@ function getKeywordHover(
         }
       : keywordDocumentation;
   if (markupDoc) {
+    const range = getOrigRange(node);
     return {
       contents: markupDoc,
-      range: node.range ? toLspRange(node.range, document) : undefined,
+      range: range ? toLspRange(range, document) : undefined,
     };
   } else return null;
 }

src/providers/semanticTokenProvider.ts

@@ -5,7 +5,6 @@ import {
   SemanticTokenTypes,
 } from 'vscode-languageserver';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { parseAllDocuments } from 'yaml';
 import { Node, Pair, Scalar, YAMLMap, YAMLSeq } from 'yaml/types';
 import { IModuleMetadata } from '../interfaces/module';
 import { DocsLibrary } from '../services/docsLibrary';
@@ -17,10 +16,12 @@ import {
 } from '../utils/ansible';
 import {
   findProvidedModule,
+  getOrigRange,
   isBlockParam,
   isPlayParam,
   isRoleParam,
   isTaskParam,
+  parseAllDocuments,
 } from '../utils/yaml';
 
 export const tokenTypes = [
@@ -233,9 +234,10 @@ function markNode(
   builder: SemanticTokensBuilder,
   document: TextDocument
 ) {
-  if (node.range) {
-    const startPosition = document.positionAt(node.range[0]);
-    const length = node.range[1] - node.range[0];
+  const range = getOrigRange(node);
+  if (range) {
+    const startPosition = document.positionAt(range[0]);
+    const length = range[1] - range[0];
     builder.push(
       startPosition.line,
       startPosition.character,

src/providers/validationProvider.ts

@@ -8,9 +8,9 @@ import {
   Range,
 } from 'vscode-languageserver';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { parseAllDocuments } from 'yaml';
 import { ValidationManager } from '../services/validationManager';
 import { WorkspaceFolderContext } from '../services/workspaceManager';
+import { parseAllDocuments } from '../utils/yaml';
 
 /**
  * Validates the given document.
@@ -63,8 +63,14 @@ function getYamlValidation(textDocument: TextDocument): Diagnostic[] {
       const errorRange = error.range || error.source?.range;
       let range;
       if (errorRange) {
-        const start = textDocument.positionAt(errorRange.start);
-        const end = textDocument.positionAt(errorRange.end);
+        const start = textDocument.positionAt(
+          errorRange.origStart !== undefined
+            ? errorRange.origStart
+            : errorRange.start
+        );
+        const end = textDocument.positionAt(
+          errorRange.origEnd !== undefined ? errorRange.origEnd : errorRange.end
+        );
         range = Range.create(start, end);
 
         let severity;

src/services/ansibleConfig.ts

@@ -35,7 +35,7 @@ export class AnsibleConfig {
 
       const ansibleConfigResult = child_process.execSync(ansibleConfigCommand, {
         encoding: 'utf-8',
-        cwd: new URL(this.context.workspaceFolder.uri).pathname,
+        cwd: decodeURI(new URL(this.context.workspaceFolder.uri).pathname),
         env: ansibleConfigEnv,
       });