From b445fa011e9a233fc94e8091054e8344cf2bdcfb Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Fri, 13 Dec 2019 10:57:49 +0100
Subject: [PATCH] update css-lsservice

---
 package-lock.json       | 44 ++++++++++++++++++++++++++++++-----------
 package.json            |  5 +++--
 scripts/bundle.js       |  4 ++++
 src/languageFeatures.ts |  4 ++--
 src/workerManager.ts    |  2 +-
 5 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 59a7094e..c4242faf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -68,25 +68,47 @@
       }
     },
     "vscode-css-languageservice": {
-      "version": "4.0.0-next.3",
-      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.0.0-next.3.tgz",
-      "integrity": "sha512-/xmbWpIQLw+HZ/3LsaE2drHFSNJbM9mZ8bKR5NUiu2ZUr10WbGxX0j/GDZB3LlMmdSHQGgRQ5hTM/Ic2PuBDRw==",
+      "version": "4.0.3-next.25",
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.0.3-next.25.tgz",
+      "integrity": "sha512-c6qoSiYUJUDYizqQRZw5tb7n3IjCgGeFg74aWV0IsihrLWKPmMwDdRDzIDohWwlOf5myrEvuHmbPo7wTaspG+w==",
       "dev": true,
       "requires": {
-        "vscode-languageserver-types": "^3.14.0",
-        "vscode-nls": "^4.0.0"
+        "vscode-languageserver-textdocument": "^1.0.0-next.4",
+        "vscode-languageserver-types": "^3.15.0-next.6",
+        "vscode-nls": "^4.1.1",
+        "vscode-uri": "^2.1.1"
+      },
+      "dependencies": {
+        "vscode-languageserver-textdocument": {
+          "version": "1.0.0-next.5",
+          "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.0-next.5.tgz",
+          "integrity": "sha512-1jp/zAidN/bF/sqPimhBX1orH5G4rzRw63k75TesukJDuxm8yW79ECStWbDSy41BHGOwSGN4M69QFvhancSr5A==",
+          "dev": true
+        }
       }
     },
+    "vscode-languageserver-textdocument": {
+      "version": "1.0.0-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.0-next.4.tgz",
+      "integrity": "sha512-LJ5WfoBO54nqinjlLJKnjoo2Im4bIvPJ8bFT7R0C84ZI36iK8M29ddslfe5jUeWNSTtCda7YuKdKsDIq38HpgA==",
+      "dev": true
+    },
     "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==",
+      "version": "3.15.0-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.6.tgz",
+      "integrity": "sha512-+4jfvmZ26oFMSX6EgPRB75PWHoT8pzyWuSSWk0erC4hTzmJq2gWxVLh20bZutZjMmiivawvPshtM3XZhX2SttA==",
       "dev": true
     },
     "vscode-nls": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.0.0.tgz",
-      "integrity": "sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.1.tgz",
+      "integrity": "sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==",
+      "dev": true
+    },
+    "vscode-uri": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.1.tgz",
+      "integrity": "sha512-eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A==",
       "dev": true
     }
   }
diff --git a/package.json b/package.json
index 6f717545..f881b332 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,8 @@
     "requirejs": "^2.3.6",
     "typescript": "3.3.3333",
     "uglify-js": "3.4.9",
-    "vscode-css-languageservice": "4.0.0-next.3",
-    "vscode-languageserver-types": "3.14.0"
+    "vscode-css-languageservice": "4.0.3-next.25",
+    "vscode-languageserver-types": "3.15.0-next.6",
+    "vscode-languageserver-textdocument": "^1.0.0-next.4"
   }
 }
diff --git a/scripts/bundle.js b/scripts/bundle.js
index ea4b444b..1f48b37c 100644
--- a/scripts/bundle.js
+++ b/scripts/bundle.js
@@ -42,6 +42,10 @@ function bundleOne(moduleId, exclude) {
 			name: 'vscode-languageserver-types',
 			location: path.join(REPO_ROOT, 'node_modules/vscode-languageserver-types/lib/umd'),
 			main: 'main'
+		}, {
+			name: 'vscode-languageserver-textdocument',
+			location: path.join(REPO_ROOT, 'node_modules/vscode-languageserver-textdocument/lib/umd'),
+			main: 'main'
 		}, {
 			name: 'vscode-uri',
 			location: path.join(REPO_ROOT, 'node_modules/vscode-uri/lib/umd'),
diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts
index 891575b3..a3f09781 100644
--- a/src/languageFeatures.ts
+++ b/src/languageFeatures.ts
@@ -38,8 +38,8 @@ export class DiagnosticsAdapter {
 
 			let handle: number;
 			this._listener[model.uri.toString()] = model.onDidChangeContent(() => {
-				clearTimeout(handle);
-				handle = setTimeout(() => this._doValidate(model.uri, modeId), 500);
+				window.clearTimeout(handle);
+				handle = window.setTimeout(() => this._doValidate(model.uri, modeId), 500);
 			});
 
 			this._doValidate(model.uri, modeId);
diff --git a/src/workerManager.ts b/src/workerManager.ts
index 87fc0b1f..f6af3efd 100644
--- a/src/workerManager.ts
+++ b/src/workerManager.ts
@@ -25,7 +25,7 @@ export class WorkerManager {
 	constructor(defaults: LanguageServiceDefaultsImpl) {
 		this._defaults = defaults;
 		this._worker = null;
-		this._idleCheckInterval = setInterval(() => this._checkIfIdle(), 30 * 1000);
+		this._idleCheckInterval = window.setInterval(() => this._checkIfIdle(), 30 * 1000);
 		this._lastUsedTime = 0;
 		this._configChangeListener = this._defaults.onDidChange(() => this._stopWorker());
 	}