Merge vscode source through 1.62 release (#19981)

* Build breaks 1

* Build breaks

* Build breaks

* Build breaks

* More build breaks

* Build breaks (#2512)

* Runtime breaks

* Build breaks

* Fix dialog location break

* Update typescript

* Fix ASAR break issue

* Unit test breaks

* Update distro

* Fix breaks in ADO builds (#2513)

* Bump to node 16

* Fix hygiene errors

* Bump distro

* Remove reference to node type

* Delete vscode specific extension

* Bump to node 16 in CI yaml

* Skip integration tests in CI builds (while fixing)

* yarn.lock update

* Bump moment dependency in remote yarn

* Fix drop-down chevron style

* Bump to node 16

* Remove playwrite from ci.yaml

* Skip building build scripts in hygine check

extensions/json-language-features/client/src/jsonClient.ts

@@ -220,7 +220,9 @@ export function startClient(context: ExtensionContext, newLanguageClient: Langua
 					 */
 					runtime.telemetry.sendTelemetryEvent('json.schema', { schemaURL: uriPath });
 				}
-				return runtime.http.getContent(uriPath);
+				return runtime.http.getContent(uriPath).catch(e => {
+					return Promise.reject(new ResponseError(4, e.toString()));
+				});
 			} else {
 				return Promise.reject(new ResponseError(1, localize('schemaDownloadDisabled', 'Downloading schemas is disabled through setting \'{0}\'', SettingIds.enableSchemaDownload)));
 			}
@@ -233,7 +235,6 @@ export function startClient(context: ExtensionContext, newLanguageClient: Langua
 			}
 			return false;
 		};
-
 		const handleActiveEditorChange = (activeEditor?: TextEditor) => {
 			if (!activeEditor) {
 				return;

extensions/json-language-features/client/src/node/jsonClientMain.ts

@@ -64,12 +64,19 @@ function getPackageInfo(context: ExtensionContext): IPackageInfo {
 
 function getHTTPRequestService(): RequestService {
 	return {
-		getContent(uri: string, _encoding?: string) {
+		getContent(uri: string, _encoding?: string): Promise<string> {
 			const headers = { 'Accept-Encoding': 'gzip, deflate' };
 			return xhr({ url: uri, followRedirects: 5, headers }).then(response => {
 				return response.responseText;
 			}, (error: XHRResponse) => {
-				return Promise.reject(error.responseText || getErrorStatusDescription(error.status) || error.toString());
+				let status = getErrorStatusDescription(error.status);
+				if (status && error.responseText) {
+					status = `${status}\n${error.responseText.substring(0, 200)}`;
+				}
+				if (!status) {
+					status = error.toString();
+				}
+				return Promise.reject(status);
 			});
 		}
 	};

extensions/json-language-features/client/src/requests.ts

@@ -6,7 +6,7 @@
 import { Uri } from 'vscode';
 
 export interface RequestService {
-	getContent(uri: string, encoding?: string): Thenable<string>;
+	getContent(uri: string, encoding?: string): Promise<string>;
 }
 
 export function getScheme(uri: string) {

extensions/json-language-features/package.json

@@ -135,7 +135,7 @@
   },
   "dependencies": {
     "request-light": "^0.5.4",
-    "vscode-extension-telemetry": "0.2.8",
+    "vscode-extension-telemetry": "0.4.2",
     "vscode-languageclient": "^7.0.0",
     "vscode-nls": "^5.0.0"
   },

extensions/json-language-features/server/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "jsonc-parser": "^3.0.0",
     "request-light": "^0.5.4",
-    "vscode-json-languageservice": "^4.1.6",
+    "vscode-json-languageservice": "^4.1.9",
     "vscode-languageserver": "^7.0.0",
     "vscode-uri": "^3.0.2"
   },

extensions/json-language-features/server/src/utils/runner.ts

@@ -23,6 +23,7 @@ export function runSafeAsync<T>(runtime: RuntimeEnvironment, func: () => Thenabl
 		runtime.timer.setImmediate(() => {
 			if (token.isCancellationRequested) {
 				resolve(cancelValue());
+				return;
 			}
 			return func().then(result => {
 				if (token.isCancellationRequested) {

extensions/json-language-features/server/yarn.lock

@@ -22,10 +22,10 @@ request-light@^0.5.4:
   resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.5.4.tgz#497a98c6d8ae49536417a5e2d7f383b934f3e38c"
   integrity sha512-t3566CMweOFlUk7Y1DJMu5OrtpoZEb6aSTsLQVT3wtrIEJ5NhcY9G/Oqxvjllzl4a15zXfFlcr9q40LbLVQJqw==
 
-vscode-json-languageservice@^4.1.6:
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-4.1.6.tgz#4275e8daf1cba80273c318f33fbf7a2ede307053"
-  integrity sha512-DIKb3tcfRtb3tIE6g9SLOl5E9tNSt6kljH08Wa5RwFlVshtXGrDDzttchze4CYy9pJpE9mBtCbRHmLvY1Z1ZXA==
+vscode-json-languageservice@^4.1.9:
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-4.1.9.tgz#fb48edc69e37167c3cafd447c3fa898052d87b61"
+  integrity sha512-kxNHitUy2fCxmP6vAp0SRLrUSuecUYzzxlC+85cC3jJlFHWmvtCJOzikC+kcUnIdls9fQSB8n0yHs8Sl6taxJw==
   dependencies:
     jsonc-parser "^3.0.0"
     vscode-languageserver-textdocument "^1.0.1"

extensions/json-language-features/yarn.lock

@@ -51,10 +51,10 @@ semver@^7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
-vscode-extension-telemetry@0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.2.8.tgz#670c625c44791237c040cee2cb9f567ca34784ac"
-  integrity sha512-Vf52im5qzORRD2K5Ryp8PXo31YXVcJAYRSDDZGegWlt0OATOd83DYabS1U/WIq9nR5g80UQKH3+BsenhpQHUaA==
+vscode-extension-telemetry@0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.4.2.tgz#6ef847a80c9cfc207eb15e3a254f235acebb65a5"
+  integrity sha512-y0f51mVoFxHIzULQNCC26TBFIKdEC7uckS3tFoK++OOOl8mU2LlOxgmbd52T/SXoXNg5aI7xqs+4V2ug5ITvKw==
 
 vscode-jsonrpc@6.0.0:
   version "6.0.0"