diff --git a/build.js b/build.js
index 14bd5d1..27ab1f1 100755
--- a/build.js
+++ b/build.js
@@ -20,13 +20,41 @@ fs.rm(join(__dirname, 'lib'), { force: true, recursive: true })
         {
           name: 'alias',
           setup({ onResolve }) {
+            // The yaml language service only imports re-exports of vscode-languageserver-types from
+            // vscode-languageserver.
+            onResolve({ filter: /^vscode-languageserver-textdocument$/ }, () => ({
+              path: 'vscode-languageserver-textdocument/lib/esm/main.js',
+              external: true,
+            }));
+            // The yaml language service only imports re-exports of vscode-languageserver-types from
+            // vscode-languageserver.
+            onResolve({ filter: /^vscode-languageserver$/ }, () => ({
+              path: 'vscode-languageserver-types/lib/esm/main.js',
+              external: true,
+            }));
+            // The yaml language service only imports re-exports of vscode-languageserver-types from
+            // vscode-languageserver.
+            onResolve({ filter: /^vscode-languageserver-types$/ }, () => ({
+              path: 'vscode-languageserver-types/lib/esm/main.js',
+              external: true,
+            }));
+            // The yaml language service uses path. We can stub it using path-browserify.
+            onResolve({ filter: /^path$/ }, () => ({
+              path: 'path-browserify',
+              external: true,
+            }));
+            // The main prettier entry point contains all of Prettier.
+            // The standalone bundle is smaller and works fine for us.
             onResolve({ filter: /^prettier$/ }, () => ({
               path: 'prettier/standalone',
               external: true,
             }));
+            // This tiny filler implementation serves all our needs.
             onResolve({ filter: /vscode-nls/ }, () => ({
               path: require.resolve('./src/fillers/vscode-nls.ts'),
             }));
+            // The language server dependencies tend to write both ESM and UMD output alongside each
+            // other, then use UMD for imports. We prefer ESM.
             onResolve({ filter: /\/umd\// }, (args) => ({
               path: require.resolve(args.path.replace(/\/umd\//, '/esm/'), {
                 paths: [args.resolveDir],
diff --git a/package-lock.json b/package-lock.json
index b908f25..84e0d1e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
     "": {
       "name": "monaco-yaml",
       "version": "3.0.1",
+      "dev": true,
       "license": "MIT",
       "workspaces": [
         "examples/*"
@@ -15,8 +16,11 @@
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "js-yaml": "^3.14.1",
+        "path-browserify": "^1.0.1",
         "prettier": "2.0.5",
-        "yaml-ast-parser-custom-tags": "^0.0.43"
+        "vscode-languageserver-textdocument": "^1.0.1",
+        "vscode-languageserver-types": "^3.16.0",
+        "yaml-language-server-parser": "^0.1.2"
       },
       "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^4.29.0",
@@ -28,7 +32,7 @@
         "lint-staged": "^11.1.1",
         "monaco-editor": "^0.27.0",
         "typescript": "^4.3.5",
-        "yaml-language-server": "^0.11.1"
+        "yaml-language-server": "^0.22.0"
       },
       "peerDependencies": {
         "monaco-editor": ">=0.22"
@@ -6410,9 +6414,9 @@
       }
     },
     "node_modules/jsonc-parser": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
-      "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
       "dev": true
     },
     "node_modules/killable": {
@@ -7622,6 +7626,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="
+    },
     "node_modules/path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
@@ -10841,85 +10850,73 @@
       }
     },
     "node_modules/vscode-json-languageservice": {
-      "version": "3.8.4",
-      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.4.tgz",
-      "integrity": "sha512-njDG0+YJvYNKXH+6plQGZMxgbifATFrRpC6Qnm/SAn4IW8bMHxsYunsxrjtpqK42CVSz6Lr7bpbTEZbVuOmFLw==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.7.tgz",
+      "integrity": "sha512-cwG5TwZyHYthsk2aS3W1dVgVP6Vwn3o+zscwN58uMgZt/nKuyxd9vdEB1F58Ix+S5kSKAnkUCP6hvulcoImQQQ==",
       "dev": true,
       "dependencies": {
-        "jsonc-parser": "^2.3.1",
+        "jsonc-parser": "^3.0.0",
         "vscode-languageserver-textdocument": "^1.0.1",
-        "vscode-languageserver-types": "3.16.0-next.2",
+        "vscode-languageserver-types": "^3.16.0",
         "vscode-nls": "^5.0.0",
-        "vscode-uri": "^2.1.2"
+        "vscode-uri": "^3.0.2"
+      },
+      "engines": {
+        "npm": ">=7.0.0"
       }
     },
-    "node_modules/vscode-json-languageservice/node_modules/vscode-languageserver-types": {
-      "version": "3.16.0-next.2",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz",
-      "integrity": "sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==",
-      "dev": true
-    },
     "node_modules/vscode-json-languageservice/node_modules/vscode-nls": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz",
       "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==",
       "dev": true
     },
+    "node_modules/vscode-json-languageservice/node_modules/vscode-uri": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz",
+      "integrity": "sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==",
+      "dev": true
+    },
     "node_modules/vscode-jsonrpc": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz",
-      "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
+      "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==",
       "dev": true,
       "engines": {
         "node": ">=8.0.0 || >=10.0.0"
       }
     },
     "node_modules/vscode-languageserver": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz",
-      "integrity": "sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz",
+      "integrity": "sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==",
       "dev": true,
       "dependencies": {
-        "vscode-languageserver-protocol": "3.14.1",
-        "vscode-uri": "^1.0.6"
+        "vscode-languageserver-protocol": "3.16.0"
       },
       "bin": {
         "installServerIntoExtension": "bin/installServerIntoExtension"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz",
-      "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==",
+      "version": "3.16.0",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz",
+      "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==",
       "dev": true,
       "dependencies": {
-        "vscode-jsonrpc": "^4.0.0",
-        "vscode-languageserver-types": "3.14.0"
+        "vscode-jsonrpc": "6.0.0",
+        "vscode-languageserver-types": "3.16.0"
       }
     },
-    "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
-      "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==",
-      "dev": true
-    },
     "node_modules/vscode-languageserver-textdocument": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz",
-      "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==",
-      "dev": true
+      "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA=="
     },
     "node_modules/vscode-languageserver-types": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
-      "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==",
-      "dev": true
-    },
-    "node_modules/vscode-languageserver/node_modules/vscode-uri": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz",
-      "integrity": "sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==",
-      "dev": true
+      "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="
     },
     "node_modules/vscode-nls": {
       "version": "4.1.2",
@@ -11514,37 +11511,58 @@
         "node": ">= 6"
       }
     },
-    "node_modules/yaml-ast-parser-custom-tags": {
-      "version": "0.0.43",
-      "resolved": "https://registry.npmjs.org/yaml-ast-parser-custom-tags/-/yaml-ast-parser-custom-tags-0.0.43.tgz",
-      "integrity": "sha512-R5063FF/JSAN6qXCmylwjt9PcDH6M0ExEme/nJBzLspc6FJDmHHIqM7xh2WfEmsTJqClF79A9VkXjkAqmZw9SQ=="
-    },
     "node_modules/yaml-language-server": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.11.1.tgz",
-      "integrity": "sha512-N3Tu3g4O6ZWV7W0LVsNk62DtKJDQkbnPZRDd7ntaAeEl8QkxL1vnMunI26uzDU4PwwG4tPJ8g/VRS6U+fVp/6A==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.22.0.tgz",
+      "integrity": "sha512-+b2B5qsQhVdovneS3cU8HzTIZSMw8gn6zsznXqtjHYrdXUZqLCnWhnYNVRWLrWSzrxOHOyczOnx60sSuQNctJw==",
       "dev": true,
       "dependencies": {
-        "js-yaml": "^3.13.1",
-        "jsonc-parser": "^2.2.1",
+        "js-yaml": "^4.1.0",
+        "jsonc-parser": "^3.0.0",
         "request-light": "^0.2.4",
-        "vscode-json-languageservice": "^3.6.0",
-        "vscode-languageserver": "^5.2.1",
-        "vscode-languageserver-types": "^3.15.1",
+        "vscode-json-languageservice": "^4.1.0",
+        "vscode-languageserver": "^7.0.0",
+        "vscode-languageserver-textdocument": "^1.0.1",
+        "vscode-languageserver-types": "^3.16.0",
         "vscode-nls": "^4.1.2",
         "vscode-uri": "^2.1.1",
-        "yaml-ast-parser-custom-tags": "0.0.43"
+        "yaml-language-server-parser": "0.1.2"
       },
       "bin": {
         "yaml-language-server": "bin/yaml-language-server"
       },
       "engines": {
-        "node": "*"
+        "node": "*",
+        "npm": "\n\nERROR: Please use yarn, npm is not supported in this repository!!!\n\n",
+        "yarn": "^1.22.5"
       },
       "optionalDependencies": {
         "prettier": "2.0.5"
       }
     },
+    "node_modules/yaml-language-server-parser": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.2.tgz",
+      "integrity": "sha512-GQ2eRE5GcKBK8XVKBIcMyOfC8WMZmEs6gogtVc6knLKE6pG+e5L/lOMfBxZzAt2lqye5itMggQ9+6stXAVhMsw=="
+    },
+    "node_modules/yaml-language-server/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/yaml-language-server/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/yargs": {
       "version": "13.3.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
@@ -16630,9 +16648,9 @@
       }
     },
     "jsonc-parser": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
-      "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
       "dev": true
     },
     "killable": {
@@ -17060,11 +17078,14 @@
         "js-yaml": "^3.14.1",
         "lint-staged": "^11.1.1",
         "monaco-editor": "^0.27.0",
+        "path-browserify": "^1.0.1",
         "prettier": "2.0.5",
         "typescript": "^4.3.5",
+        "vscode-languageserver-textdocument": "*",
+        "vscode-languageserver-types": "^3.16.0",
         "webpack-example": "file:examples/webpack",
-        "yaml-ast-parser-custom-tags": "^0.0.43",
-        "yaml-language-server": "^0.11.1"
+        "yaml-language-server": "^0.22.0",
+        "yaml-language-server-parser": "^0.1.2"
       },
       "dependencies": {
         "@babel/code-frame": {
@@ -21990,9 +22011,9 @@
           }
         },
         "jsonc-parser": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
-          "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
+          "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
           "dev": true
         },
         "killable": {
@@ -22925,6 +22946,11 @@
           "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
           "dev": true
         },
+        "path-browserify": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+          "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="
+        },
         "path-dirname": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
@@ -25428,85 +25454,66 @@
           "dev": true
         },
         "vscode-json-languageservice": {
-          "version": "3.8.4",
-          "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.4.tgz",
-          "integrity": "sha512-njDG0+YJvYNKXH+6plQGZMxgbifATFrRpC6Qnm/SAn4IW8bMHxsYunsxrjtpqK42CVSz6Lr7bpbTEZbVuOmFLw==",
+          "version": "4.1.7",
+          "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.7.tgz",
+          "integrity": "sha512-cwG5TwZyHYthsk2aS3W1dVgVP6Vwn3o+zscwN58uMgZt/nKuyxd9vdEB1F58Ix+S5kSKAnkUCP6hvulcoImQQQ==",
           "dev": true,
           "requires": {
-            "jsonc-parser": "^2.3.1",
+            "jsonc-parser": "^3.0.0",
             "vscode-languageserver-textdocument": "^1.0.1",
-            "vscode-languageserver-types": "3.16.0-next.2",
+            "vscode-languageserver-types": "^3.16.0",
             "vscode-nls": "^5.0.0",
-            "vscode-uri": "^2.1.2"
+            "vscode-uri": "^3.0.2"
           },
           "dependencies": {
-            "vscode-languageserver-types": {
-              "version": "3.16.0-next.2",
-              "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz",
-              "integrity": "sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==",
-              "dev": true
-            },
             "vscode-nls": {
               "version": "5.0.0",
               "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz",
               "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==",
               "dev": true
+            },
+            "vscode-uri": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz",
+              "integrity": "sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==",
+              "dev": true
             }
           }
         },
         "vscode-jsonrpc": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz",
-          "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
+          "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==",
           "dev": true
         },
         "vscode-languageserver": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz",
-          "integrity": "sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==",
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz",
+          "integrity": "sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==",
           "dev": true,
           "requires": {
-            "vscode-languageserver-protocol": "3.14.1",
-            "vscode-uri": "^1.0.6"
-          },
-          "dependencies": {
-            "vscode-uri": {
-              "version": "1.0.8",
-              "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz",
-              "integrity": "sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==",
-              "dev": true
-            }
+            "vscode-languageserver-protocol": "3.16.0"
           }
         },
         "vscode-languageserver-protocol": {
-          "version": "3.14.1",
-          "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz",
-          "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==",
+          "version": "3.16.0",
+          "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz",
+          "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==",
           "dev": true,
           "requires": {
-            "vscode-jsonrpc": "^4.0.0",
-            "vscode-languageserver-types": "3.14.0"
-          },
-          "dependencies": {
-            "vscode-languageserver-types": {
-              "version": "3.14.0",
-              "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
-              "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==",
-              "dev": true
-            }
+            "vscode-jsonrpc": "6.0.0",
+            "vscode-languageserver-types": "3.16.0"
           }
         },
         "vscode-languageserver-textdocument": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz",
-          "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==",
-          "dev": true
+          "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA=="
         },
         "vscode-languageserver-types": {
           "version": "3.16.0",
           "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
-          "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==",
-          "dev": true
+          "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="
         },
         "vscode-nls": {
           "version": "4.1.2",
@@ -25954,29 +25961,47 @@
           "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
           "dev": true
         },
-        "yaml-ast-parser-custom-tags": {
-          "version": "0.0.43",
-          "resolved": "https://registry.npmjs.org/yaml-ast-parser-custom-tags/-/yaml-ast-parser-custom-tags-0.0.43.tgz",
-          "integrity": "sha512-R5063FF/JSAN6qXCmylwjt9PcDH6M0ExEme/nJBzLspc6FJDmHHIqM7xh2WfEmsTJqClF79A9VkXjkAqmZw9SQ=="
-        },
         "yaml-language-server": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.11.1.tgz",
-          "integrity": "sha512-N3Tu3g4O6ZWV7W0LVsNk62DtKJDQkbnPZRDd7ntaAeEl8QkxL1vnMunI26uzDU4PwwG4tPJ8g/VRS6U+fVp/6A==",
+          "version": "0.22.0",
+          "resolved": "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.22.0.tgz",
+          "integrity": "sha512-+b2B5qsQhVdovneS3cU8HzTIZSMw8gn6zsznXqtjHYrdXUZqLCnWhnYNVRWLrWSzrxOHOyczOnx60sSuQNctJw==",
           "dev": true,
           "requires": {
-            "js-yaml": "^3.13.1",
-            "jsonc-parser": "^2.2.1",
+            "js-yaml": "^4.1.0",
+            "jsonc-parser": "^3.0.0",
             "prettier": "2.0.5",
             "request-light": "^0.2.4",
-            "vscode-json-languageservice": "^3.6.0",
-            "vscode-languageserver": "^5.2.1",
-            "vscode-languageserver-types": "^3.15.1",
+            "vscode-json-languageservice": "^4.1.0",
+            "vscode-languageserver": "^7.0.0",
+            "vscode-languageserver-textdocument": "^1.0.1",
+            "vscode-languageserver-types": "^3.16.0",
             "vscode-nls": "^4.1.2",
             "vscode-uri": "^2.1.1",
-            "yaml-ast-parser-custom-tags": "0.0.43"
+            "yaml-language-server-parser": "0.1.2"
+          },
+          "dependencies": {
+            "argparse": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+              "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+              "dev": true
+            },
+            "js-yaml": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+              "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+              "dev": true,
+              "requires": {
+                "argparse": "^2.0.1"
+              }
+            }
           }
         },
+        "yaml-language-server-parser": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.2.tgz",
+          "integrity": "sha512-GQ2eRE5GcKBK8XVKBIcMyOfC8WMZmEs6gogtVc6knLKE6pG+e5L/lOMfBxZzAt2lqye5itMggQ9+6stXAVhMsw=="
+        },
         "yargs": {
           "version": "13.3.2",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
@@ -26620,6 +26645,11 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
+    "path-browserify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="
+    },
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
@@ -29123,85 +29153,66 @@
       "dev": true
     },
     "vscode-json-languageservice": {
-      "version": "3.8.4",
-      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.4.tgz",
-      "integrity": "sha512-njDG0+YJvYNKXH+6plQGZMxgbifATFrRpC6Qnm/SAn4IW8bMHxsYunsxrjtpqK42CVSz6Lr7bpbTEZbVuOmFLw==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.7.tgz",
+      "integrity": "sha512-cwG5TwZyHYthsk2aS3W1dVgVP6Vwn3o+zscwN58uMgZt/nKuyxd9vdEB1F58Ix+S5kSKAnkUCP6hvulcoImQQQ==",
       "dev": true,
       "requires": {
-        "jsonc-parser": "^2.3.1",
+        "jsonc-parser": "^3.0.0",
         "vscode-languageserver-textdocument": "^1.0.1",
-        "vscode-languageserver-types": "3.16.0-next.2",
+        "vscode-languageserver-types": "^3.16.0",
         "vscode-nls": "^5.0.0",
-        "vscode-uri": "^2.1.2"
+        "vscode-uri": "^3.0.2"
       },
       "dependencies": {
-        "vscode-languageserver-types": {
-          "version": "3.16.0-next.2",
-          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz",
-          "integrity": "sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==",
-          "dev": true
-        },
         "vscode-nls": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz",
           "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==",
           "dev": true
+        },
+        "vscode-uri": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz",
+          "integrity": "sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==",
+          "dev": true
         }
       }
     },
     "vscode-jsonrpc": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz",
-      "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
+      "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==",
       "dev": true
     },
     "vscode-languageserver": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz",
-      "integrity": "sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz",
+      "integrity": "sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==",
       "dev": true,
       "requires": {
-        "vscode-languageserver-protocol": "3.14.1",
-        "vscode-uri": "^1.0.6"
-      },
-      "dependencies": {
-        "vscode-uri": {
-          "version": "1.0.8",
-          "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz",
-          "integrity": "sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==",
-          "dev": true
-        }
+        "vscode-languageserver-protocol": "3.16.0"
       }
     },
     "vscode-languageserver-protocol": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz",
-      "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==",
+      "version": "3.16.0",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz",
+      "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==",
       "dev": true,
       "requires": {
-        "vscode-jsonrpc": "^4.0.0",
-        "vscode-languageserver-types": "3.14.0"
-      },
-      "dependencies": {
-        "vscode-languageserver-types": {
-          "version": "3.14.0",
-          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
-          "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==",
-          "dev": true
-        }
+        "vscode-jsonrpc": "6.0.0",
+        "vscode-languageserver-types": "3.16.0"
       }
     },
     "vscode-languageserver-textdocument": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz",
-      "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==",
-      "dev": true
+      "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA=="
     },
     "vscode-languageserver-types": {
       "version": "3.16.0",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
-      "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==",
-      "dev": true
+      "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="
     },
     "vscode-nls": {
       "version": "4.1.2",
@@ -29649,29 +29660,47 @@
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true
     },
-    "yaml-ast-parser-custom-tags": {
-      "version": "0.0.43",
-      "resolved": "https://registry.npmjs.org/yaml-ast-parser-custom-tags/-/yaml-ast-parser-custom-tags-0.0.43.tgz",
-      "integrity": "sha512-R5063FF/JSAN6qXCmylwjt9PcDH6M0ExEme/nJBzLspc6FJDmHHIqM7xh2WfEmsTJqClF79A9VkXjkAqmZw9SQ=="
-    },
     "yaml-language-server": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.11.1.tgz",
-      "integrity": "sha512-N3Tu3g4O6ZWV7W0LVsNk62DtKJDQkbnPZRDd7ntaAeEl8QkxL1vnMunI26uzDU4PwwG4tPJ8g/VRS6U+fVp/6A==",
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.22.0.tgz",
+      "integrity": "sha512-+b2B5qsQhVdovneS3cU8HzTIZSMw8gn6zsznXqtjHYrdXUZqLCnWhnYNVRWLrWSzrxOHOyczOnx60sSuQNctJw==",
       "dev": true,
       "requires": {
-        "js-yaml": "^3.13.1",
-        "jsonc-parser": "^2.2.1",
+        "js-yaml": "^4.1.0",
+        "jsonc-parser": "^3.0.0",
         "prettier": "2.0.5",
         "request-light": "^0.2.4",
-        "vscode-json-languageservice": "^3.6.0",
-        "vscode-languageserver": "^5.2.1",
-        "vscode-languageserver-types": "^3.15.1",
+        "vscode-json-languageservice": "^4.1.0",
+        "vscode-languageserver": "^7.0.0",
+        "vscode-languageserver-textdocument": "^1.0.1",
+        "vscode-languageserver-types": "^3.16.0",
         "vscode-nls": "^4.1.2",
         "vscode-uri": "^2.1.1",
-        "yaml-ast-parser-custom-tags": "0.0.43"
+        "yaml-language-server-parser": "0.1.2"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        }
       }
     },
+    "yaml-language-server-parser": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.2.tgz",
+      "integrity": "sha512-GQ2eRE5GcKBK8XVKBIcMyOfC8WMZmEs6gogtVc6knLKE6pG+e5L/lOMfBxZzAt2lqye5itMggQ9+6stXAVhMsw=="
+    },
     "yargs": {
       "version": "13.3.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
diff --git a/package.json b/package.json
index abf011d..29a11d3 100644
--- a/package.json
+++ b/package.json
@@ -41,8 +41,11 @@
   "dependencies": {
     "@types/json-schema": "^7.0.9",
     "js-yaml": "^3.14.1",
+    "path-browserify": "^1.0.1",
     "prettier": "2.0.5",
-    "yaml-ast-parser-custom-tags": "^0.0.43"
+    "vscode-languageserver-textdocument": "^1.0.1",
+    "vscode-languageserver-types": "^3.16.0",
+    "yaml-language-server-parser": "^0.1.2"
   },
   "peerDependencies": {
     "monaco-editor": ">=0.22"
@@ -57,7 +60,7 @@
     "lint-staged": "^11.1.1",
     "monaco-editor": "^0.27.0",
     "typescript": "^4.3.5",
-    "yaml-language-server": "^0.11.1"
+    "yaml-language-server": "^0.22.0"
   },
   "resolutions": {},
   "lint-staged": {
diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts
index 32f39f3..33c61a0 100644
--- a/src/languageFeatures.ts
+++ b/src/languageFeatures.ts
@@ -76,7 +76,7 @@ export function createDiagnosticsAdapter(
       return;
     }
 
-    let handle: number;
+    let handle: ReturnType<typeof setTimeout>;
     listeners[String(toString)] = model.onDidChangeContent(() => {
       clearTimeout(handle);
       handle = setTimeout(() => doValidate(model.uri, modeId), 500);
diff --git a/src/yamlWorker.ts b/src/yamlWorker.ts
index d308f7d..bc5c6fb 100644
--- a/src/yamlWorker.ts
+++ b/src/yamlWorker.ts
@@ -1,4 +1,5 @@
 import { worker } from 'monaco-editor/esm/vs/editor/editor.api';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 import * as ls from 'vscode-languageserver-types';
 import {
   CustomFormatterOptions,
@@ -6,7 +7,7 @@ import {
   LanguageSettings,
 } from 'yaml-language-server/lib/esm/languageservice/yamlLanguageService';
 
-let defaultSchemaRequestService: (url: string) => PromiseLike<string>;
+let defaultSchemaRequestService: (url: string) => Promise<string>;
 
 if (typeof fetch !== 'undefined') {
   defaultSchemaRequestService = (url) => fetch(url).then((response) => response.text());
@@ -36,20 +37,19 @@ export function createYAMLWorker(
     prefix = '',
   }: ICreateData,
 ): YAMLWorker {
-  const service = (url: string): PromiseLike<string> =>
-    defaultSchemaRequestService(`${prefix}${url}`);
-  const languageService = getLanguageService(enableSchemaRequest && service, null, []);
+  const service = (url: string): Promise<string> => defaultSchemaRequestService(`${prefix}${url}`);
+  const languageService = getLanguageService(enableSchemaRequest && service, null, null, null);
   languageService.configure({
     ...languageSettings,
     hover: true,
     isKubernetes,
   });
 
-  const getTextDocument = (uri: string): ls.TextDocument => {
+  const getTextDocument = (uri: string): TextDocument => {
     const models = ctx.getMirrorModels();
     for (const model of models) {
       if (String(model.uri) === uri) {
-        return ls.TextDocument.create(uri, languageId, model.version, model.getValue());
+        return TextDocument.create(uri, languageId, model.version, model.getValue());
       }
     }
     return null;
@@ -86,7 +86,7 @@ export function createYAMLWorker(
 
     findDocumentSymbols(uri) {
       const document = getTextDocument(uri);
-      const symbols = languageService.findDocumentSymbols2(document);
+      const symbols = languageService.findDocumentSymbols2(document, {});
       return Promise.resolve(symbols);
     },
   };