From 0b15ddf3d0832dee535e744e2ad6cb5603654ab8 Mon Sep 17 00:00:00 2001
From: Marc Dumais <marc.dumais@ericsson.com>
Date: Thu, 23 Feb 2023 15:15:23 -0500
Subject: [PATCH] [builtins] Use vscode builtin extensions v1.70.2

Some time between 1.66.2 and 1.70.2, the references-view extension
"ms-vscode.references-view" has gone from a standalone extension,
that has its own repository, to a vscode built-in extension, that's
part of the vscode repository. With that change, the extension's
publisher has been updated from "ms-vscode" to "vscode". As of
1.70.2, this extension is referenced in the builtins extension pack
and no longer needs to be specifically referenced in `package.json`.

This PR contains the following:

Example application:
- update the builtin extension pack to v1.70.2
- remove entry for old `references-view` extension
- remove pinning for typescript extensions.

typescript browser tests:
- use new publisher when referencing `references-view` builtin
- re-try sending "Escape" to close the peek widget if it remains opened

Signed-off-by: Marc Dumais <marc.dumais@ericsson.com>
---
 examples/api-tests/src/typescript.spec.js | 18 ++++++++++++++++--
 package.json                              |  5 ++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/examples/api-tests/src/typescript.spec.js b/examples/api-tests/src/typescript.spec.js
index de17449796150..967a3cb7a7610 100644
--- a/examples/api-tests/src/typescript.spec.js
+++ b/examples/api-tests/src/typescript.spec.js
@@ -57,7 +57,7 @@ describe('TypeScript', function () {
     const pluginViewRegistry = container.get(PluginViewRegistry);
 
     const typescriptPluginId = 'vscode.typescript-language-features';
-    const referencesPluginId = 'ms-vscode.references-view';
+    const referencesPluginId = 'vscode.references-view';
     const eslintPluginId = 'dbaeumer.vscode-eslint';
     /** @type Uri.URI */
     const rootUri = workspaceService.tryGetRoots()[0].resource;
@@ -199,8 +199,17 @@ describe('TypeScript', function () {
     async function closePeek(editor) {
         await assertPeekOpened(editor);
 
+        console.log('closePeek() - Attempt to close by sending "Escape"');
         keybindings.dispatchKeyDown('Escape');
-        await waitForAnimation(() => !contextKeyService.match('listFocus'));
+        await waitForAnimation(() => {
+            const isClosed = !contextKeyService.match('listFocus');
+            if (!isClosed) {
+                console.log('...');
+                keybindings.dispatchKeyDown('Escape');
+                return false;
+            }
+            return true;
+        });
         assert.isTrue(contextKeyService.match('editorTextFocus'));
         assert.isFalse(contextKeyService.match('referenceSearchVisible'));
         assert.isFalse(contextKeyService.match('listFocus'));
@@ -295,8 +304,11 @@ describe('TypeScript', function () {
                 editor.getControl().setPosition({ lineNumber: 24, column: 30 });
                 assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'DemoClass');
 
+                console.log('************** 1');
                 await openPeek(editor);
+                console.log('************** 2');
                 await openReference();
+                console.log('************** 3');
 
                 const activeEditor = /** @type {MonacoEditor} */ MonacoEditor.get(editorManager.activeEditor);
                 assert.equal(editorManager.activeEditor.isPreview, preview);
@@ -306,7 +318,9 @@ describe('TypeScript', function () {
                 assert.deepEqual({ lineNumber, column }, { lineNumber: 11, column: 5 });
                 assert.equal(activeEditor.getControl().getModel().getWordAtPosition({ lineNumber, column }).word, 'constructor');
 
+                console.log('************** 4');
                 await closePeek(activeEditor);
+                console.log('************** 5');
             });
 
             // Note: this test generate annoying but apparently harmless error traces, during cleanup:
diff --git a/package.json b/package.json
index ac9a632d8f02b..7f499f08789b8 100644
--- a/package.json
+++ b/package.json
@@ -100,10 +100,9 @@
   "theiaPluginsDir": "plugins",
   "theiaPlugins": {
     "vscode.markdown-language-features": "https://open-vsx.org/api/vscode/markdown-language-features/1.64.2/file/vscode.markdown-language-features-1.64.2.vsix",
-    "eclipse-theia.builtin-extension-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.66.2/file/eclipse-theia.builtin-extension-pack-1.66.2.vsix",
+    "eclipse-theia.builtin-extension-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.70.2/file/eclipse-theia.builtin-extension-pack-1.70.2.vsix",
     "EditorConfig.EditorConfig": "https://open-vsx.org/api/EditorConfig/EditorConfig/0.14.4/file/EditorConfig.EditorConfig-0.14.4.vsix",
-    "dbaeumer.vscode-eslint": "https://open-vsx.org/api/dbaeumer/vscode-eslint/2.1.20/file/dbaeumer.vscode-eslint-2.1.20.vsix",
-    "ms-vscode.references-view": "https://open-vsx.org/api/ms-vscode/references-view/0.0.89/file/ms-vscode.references-view-0.0.89.vsix"
+    "dbaeumer.vscode-eslint": "https://open-vsx.org/api/dbaeumer/vscode-eslint/2.1.20/file/dbaeumer.vscode-eslint-2.1.20.vsix"
   },
   "theiaPluginsExcludeIds": [
     "ms-vscode.js-debug-companion",